Removed SocketComponent, added Network Class