diff --git a/uml/network.pu b/uml/network.pu
index 5c63ccd..dbf1d8c 100644
--- a/uml/network.pu
+++ b/uml/network.pu
@@ -1,7 +1,13 @@
 @startuml
+!define osaPuml https://raw.githubusercontent.com/Crashedmind/PlantUML-opensecurityarchitecture2-icons/master
+!include osaPuml/Common.puml
+!include osaPuml/Hardware/all.puml
+!include osaPuml/Misc/all.puml
+!include osaPuml/Server/all.puml
+!include osaPuml/Site/all.puml
 nwdiag {
   internet [shape = cloud];
-  router [address = "surveyor.mydns.jp", shape = node];
+  router [address = "surveyor.mydns.jp", description="<$osa_device_wireless_router>\nrouter"];
   internet -- router;
 
   group {
@@ -13,24 +19,24 @@
 
   network DMZ {
     address = "192.168.0.0/24";
-    router [address = ".1", shape = node];
-    raspi2 [address = ".200", shape=node];
-  }
-  network proxy {
-    raspi2;
-    macmini [address = ".202", shape=node];
+    router [address = ".1"];
+    raspi2 [address = ".200", description="<$osa_server_proxy>\nraspi2"];
     raspi3 [address = ".201", shape=node];
     t3400 [address = ".203", shape=node];
     ark-a [address = ".204", shape=node];
     ark-b [address = ".205", shape=node];
-    ark-c [address = ".206", shape=node];
+  }
+  network {
+    raspi2;
+    macmini [address = ".202", description="<$osa_server_application>\nmacmini"];
+    ark-c [address = ".206", description="<$osa_server_database>\nark-c"];
   }
   network DHCP {
     address = "192.168.0.0/24";
-    router [shape = node];
-    versapro [shape=node];
-    gigabyte [shape=node];
-    printer [shape=node];
+    router;
+    versapro [description="<$osa_laptop>\nversapro"];
+    gigabyte [description="<$osa_desktop>\ngigabyte"];
+    printer [description="<$osa_printer>\nprinter/scanner"];
   }
 }
 @enduml