Updated to 0.24-compatible ModuleManager.