Improving the underlying HTTP logic