Made changes to ClientProxy and ClientModel