Updated to add CORS by default