Additional changes to support CORS.