Refactor the Topology to work with the different managers