Updated the return of the AnswerAPI methods and minor improvements