Proxy functionality adapted.