Topology change identification mech refactored