Added second half of autocompletion