Improved autocompletion