Add AnswerService
Minor refactors.