Client class change to Object