Moved ProxyCreation into ctor