In process of refactoring network logic