master: Updated to add AutoComplete