Added factory class autocomplete