Added support for es6 and source-map flags.