Fixed to use the newly refactored module_management package