Adding support for HTTP(S)