SecurityLayer Proxy refactoring