refactored to Proxy static class