diff --git a/Monitoring Server Influx V1/module.php b/Monitoring Server Influx V1/module.php
index e24a5f0..7b938a8 100644
--- a/Monitoring Server Influx V1/module.php	
+++ b/Monitoring Server Influx V1/module.php	
@@ -238,7 +238,7 @@ class MonitoringServer extends IPSModule {
 
 
                             $system = "P".$projectnumber."_ISP".$ispnumber;
-                            $category = "Analog";
+                            $category =  $system."_Analog";
                             $valuename = $parname."".$varname;
                             //IPS_LogMessage ("Analog Var-Logger", "Ready: ".$system."/".$category."/".$valuename." with Value: ".$payload);
 
@@ -284,7 +284,7 @@ class MonitoringServer extends IPSModule {
                             $varname = str_replace(" ","", $varname);
                             
                         $system = "P".$projectnumber."_ISP".$ispnumber;
-                        $category = "Digital";
+                        $category = $system."_Digital";
                         $valuename = $parname."_".$varname;
 
                             if($this->checkInfluxState() > -1){ 
diff --git a/library.json b/library.json
index 2d3158e..b136f14 100644
--- a/library.json
+++ b/library.json
@@ -8,6 +8,6 @@
         "date": 1491343200
     },
     "version": "1.7",
-    "build": 2,
+    "build": 3,
     "date": 0
 }
\ No newline at end of file