Added autocomplete and notify