Add of advanced autocompletion