Additions to ModuleStorage