Add better auto-completion.