Changed partial design of the client and the example class.