Added support for ES6 modules