Finished refactoring with %ZEN.proxyObject