Added CommonJS/Non CommonJS modules