Ah, yeah that’s sort of along the lines of what I was referring to by the “swappable singleton” pattern— although usually I’ve done such with a setInstance() rather than that sort of boolean flag. I can see the flag being better if you only ever need two kinds of modules.