Added CORS modification