Refactored answer model