Moved hashses into their own object in responses