Use TOPOLOGY-ID instead of STORM-ID