Add autocompletion of keywords