Added more of the AutoComplete