Return the module_class too