Updated with CORS by default