Further work and refactoring in NetworkForwarderTopology