added autocomplete tokens