Migration to CommonJS