small refactor of ResponseBuilder to handle 'original' structures