Add a couple ES6 features