Add autocompletion support