Network refactor