Refactor, individual response objects