Adding support for JSONP