Improve the autocompletion