Improved auto completion.