Initial Source commit
Fix ClientProxy setup