Network update

Refactoring made