Use new common module.