Now using more flexible way of managing commonjs globals.