Added CORS mechanism