Improved auto completion