Refactored out some objects from the responses