Add autocompletion on token