Ajay/DC | #2978 | Refactoring - Moved question specific logic to question model