Adding support for CORS