CMS-2191 Design for Module system