Adding support to CORS