Conform to ES6