Updated the question/answer framework