Network implementation refactoring in progress