Update for autocomplete & token