Added autocomplete support