Systems should now manage the different entity constellations correctly