Started to refactor how the HTTP lower layer is used