Fix UNSTABLE build - remove inheritence of unit from ModuleType.