Refactored Clients and Users objects (passing by reference)