Updates to module to handle CJS format