Updated Clients Class