Make completion more intuitive