Update up to changes in es6-map