Refactored the topology provider.
4 files changed