Improves design of the proxy a bit