Improve autocompletion