ES6 collections and other updates