Improve auto-completion