Changed internals for http stuff.