Adding support for CommonJs.