Adding wrapper for autocomplete