Enhancements to proxy class