refactor: move answers inside AdditionalQuestion