Added Answer and answerchoice models