Changes for typeahead support