NOREF: Trying calling_module/calling_class for a new hierarchy in module_data