Migrate to new networking code