Made ModuleRegistry a real Registry.