Added support for autocomplete