Refactored ITopology away