Make the common module responsibility clear