Improve CORS support