Added autocomplete code