This is going to be a problem for MixedModuleStore