Modifications in client.pp