Big refactoring continues
Network properties are now computed on demand