More logic around topology changes