Cleaned up TopologyReader interface