Split/add and fixes

Should this be `endswith('.DraftVersioningModuleStore')` just to make sure it's actually a class, not just the end of class name?