Added some more networking features