Upgrade to ecmascript