Add ES6 support