Refactored the answer and question model