Updated to classes for modules.