Modifying the client classes