Making the proxy a little bit more efficient