Updated to use the new HTTP headers.