Added Network support to client and server