Updated more networking code