Network layer refactoring