ProxyFactory revision