Refactored Proxy classes