Add handling for CORS