Before switching to commonjs