Update CORS implementation