Add support for autocomplete