Updated to use autocompletion.