Update topology info to match current v2.6 capabilties