Change to work with strong-types autocomplete plugin