After some testing, more files turned out to be required (all the menu stuff) to keep the singletons working with plugins. I've pushed updated version, keeping the minimum needed to be required.