Addressing defect D2525: replacing the class instances with modules