Network.h refactoring