Modified KeyMapper and QuestionMapper

Answers for questions are now added via Question model.
Changed wrong naming.