Just a bit of tweaking to ModuleRegistry