Added typeahead support