Changed to use new common module