diff --git a/computer_names.json b/computer_names.json
index 3cfd977..84550e3 100644
--- a/computer_names.json
+++ b/computer_names.json
@@ -1,10 +1,28 @@
-{
-    "1" : [
-        "IT01",
-        "IT02"
-    ],
-    "2" : [
-        "PIS09",
-        "PIS10"
-    ]
+{
+    "expr_list" : [
+        [
+            "^[a-zA-Z]+\\d+$",
+            "R54-630300"
+        ],
+        [
+            "^\\d+[a-zA-Z]+\\d+$",
+            "R54-"
+        ],
+        [
+            "^[rR]\\d*[-]\\d+[a-zA-Z]+\\d+$",
+            ""
+        ]
+    ],
+    "comp" : {
+        "2" : [
+            "IT01",
+            "IT02",
+			"630870MMP01",
+			"R54-630870MMP02"
+        ],
+        "7" : [
+            "PIS09",
+            "PIS10"
+        ]
+    }
 }
\ No newline at end of file