updated to classes for modules.