Changed from custom proxy type to Data.Proxy.