Changed to typeahead class