More map es6 stuff