Advanced auto-completion