Enhancements to ClientProxy

Author: Maulik Patel