Upgrade to ecamscript