Feature: Additions to CommonJS PR 

Continuation of PR #1300 
See comment above.