Updated CORS support