Added new features for Answer and Question