Split model on per source basis, make all ids positive everywhere. Requires more cleanup, still has temporary plugs