Add better menu completion.