Updated ClientProxy and Command hierarchy