Update to version with autocomplete