Added more es6