Added client implementation