Refactoring to to that objects are returned from Client instead of a hash of variables
Refactoring

Want to have objects returned instead of a hash of variables.