Add CORS support again