Networking and global refactoring