Added support for http context