Adding support for ES2