diff --git a/includes/discovery/cisco-entity-sensor.inc.php b/includes/discovery/cisco-entity-sensor.inc.php
index a686c28ab3..05329c3807 100644
--- a/includes/discovery/cisco-entity-sensor.inc.php
+++ b/includes/discovery/cisco-entity-sensor.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "ios" || $device['os_group'] == "ios")
 {
@@ -141,8 +141,8 @@ if ($device['os'] == "ios" || $device['os_group'] == "ios")
 	if ($descr == "") { $ok = FALSE; }				## Invalid description. Lots of these on Nexus
 
         if ($ok) {
-#          echo("\n$valid_sensor, $type, $device, $oid, $index, 'cisco-entity-sensor', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $limit, $warn_limit, $current");
-          discover_sensor($valid_sensor, $type, $device, $oid, $index, 'cisco-entity-sensor', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $limit, $warn_limit, $current);
+#          echo("\n".$valid['sensor'].", $type, $device, $oid, $index, 'cisco-entity-sensor', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $limit, $warn_limit, $current");
+          discover_sensor($valid['sensor'], $type, $device, $oid, $index, 'cisco-entity-sensor', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $limit, $warn_limit, $current);
         }
         $cisco_entity_temperature = 1;
         unset($limit, $limit_low, $warn_limit, $warn_limit_low);
diff --git a/includes/discovery/current.inc.php b/includes/discovery/current.inc.php
index 9c1161c1ad..e1a071bfb0 100644
--- a/includes/discovery/current.inc.php
+++ b/includes/discovery/current.inc.php
@@ -3,10 +3,10 @@ echo("Current: ");
 
 include_dir("includes/discovery/current");
 
-if ($debug) { print_r($valid['current']); }
+if ($debug) { print_r($valid['sensor']['current']); }
 
-check_valid_sensors($device, 'current', $valid_sensor);
+check_valid_sensors($device, 'current', $valid['sensor']);
 
 echo("\n");
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/current/apc.inc.php b/includes/discovery/current/apc.inc.php
index f8526e3680..ed2e37a4f5 100644
--- a/includes/discovery/current/apc.inc.php
+++ b/includes/discovery/current/apc.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## APC
 if ($device['os'] == "apc")
@@ -42,7 +42,7 @@ if ($device['os'] == "apc")
         {
           $descr     = "Output";
         }
-        discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, NULL, $warnlimit, $limit, $current);
+        discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, NULL, $warnlimit, $limit, $current);
       }
     }
   }
@@ -97,7 +97,7 @@ if ($device['os'] == "apc")
         $lowlimit  = snmp_get($device, $lowlimit_oid, "-Oqv", "");
         $warnlimit = snmp_get($device, $warnlimit_oid, "-Oqv", "");
 
-        discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, NULL, $warnlimit, $limit, $current);
+        discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, NULL, $warnlimit, $limit, $current);
       }
     }
 
@@ -126,7 +126,7 @@ if ($device['os'] == "apc")
     $warnlimit = snmp_get($device, $warnlimit_oid, "-Oqv", "");	# No / $precision here! Nice, APC!
     $descr     = "Output Feed";
 
-    discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, NULL, $warnlimit, $limit, $current);
+    discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, NULL, $warnlimit, $limit, $current);
   }
 
   unset($oids);
diff --git a/includes/discovery/current/gamatronicups.inc.php b/includes/discovery/current/gamatronicups.inc.php
index 058ecffd33..9861e54f5d 100644
--- a/includes/discovery/current/gamatronicups.inc.php
+++ b/includes/discovery/current/gamatronicups.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "gamatronicups")
 {
@@ -16,7 +16,7 @@ if ($device['os'] == "gamatronicups")
     $warnlimit = NULL;
     $limit = NULL;
 
-    discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '1', '1', $lowlimit, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '1', '1', $lowlimit, NULL, NULL, NULL, $current);
   }
 
   for ($i = 1; $i <= 3; $i++)
@@ -31,7 +31,7 @@ if ($device['os'] == "gamatronicups")
     $warnlimit = NULL;
     $limit = NULL;
 
-    discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '1', '1', $lowlimit, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '1', '1', $lowlimit, NULL, NULL, NULL, $current);
   }
 }
 
diff --git a/includes/discovery/current/ipoman.inc.php b/includes/discovery/current/ipoman.inc.php
index 9cf1ae1d17..85f4571802 100644
--- a/includes/discovery/current/ipoman.inc.php
+++ b/includes/discovery/current/ipoman.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor, $cache;
+
 
 ## IPOMANII-MIB
 if ($device['os'] == "ipoman")
@@ -39,7 +39,7 @@ if ($device['os'] == "ipoman")
       $current = $entry['inletStatusCurrent'] / $divisor;
       $high_limit = $entry['inletConfigCurrentHigh'] / 10;
 
-      discover_sensor($valid_sensor, 'current', $device, $cur_oid, '1.3.1.3.'.$index, 'ipoman', $descr, $divisor, '1', NULL, NULL, NULL, $high_limit, $current);
+      discover_sensor($valid['sensor'], 'current', $device, $cur_oid, '1.3.1.3.'.$index, 'ipoman', $descr, $divisor, '1', NULL, NULL, NULL, $high_limit, $current);
       # FIXME: iPoMan 1201 also says it has 2 inlets, at least until firmware 1.06 - wtf?
     }
   }
@@ -54,7 +54,7 @@ if ($device['os'] == "ipoman")
       $current = $entry['outletStatusCurrent'] / $divisor;
       $high_limit = $entry['outletConfigCurrentHigh'] / 10;
 
-      discover_sensor($valid_sensor, 'current', $device, $cur_oid, '2.3.1.3.'.$index, 'ipoman', $descr, $divisor, '1', NULL, NULL, NULL, $high_limit, $current);
+      discover_sensor($valid['sensor'], 'current', $device, $cur_oid, '2.3.1.3.'.$index, 'ipoman', $descr, $divisor, '1', NULL, NULL, NULL, $high_limit, $current);
     }
   }
 }
diff --git a/includes/discovery/current/mgeups.inc.php b/includes/discovery/current/mgeups.inc.php
index 5e3377b550..c9c59ed501 100644
--- a/includes/discovery/current/mgeups.inc.php
+++ b/includes/discovery/current/mgeups.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## MGE UPS
 if ($device['os'] == "mgeups")
@@ -29,7 +29,7 @@ if ($device['os'] == "mgeups")
     $limit      = NULL;
     $lowwarnlimit = NULL;
 
-    discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $current);
+    discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $current);
   }
 
   $oids = trim(snmp_walk($device, "1.3.6.1.4.1.705.1.6.1", "-OsqnU"));
@@ -55,7 +55,7 @@ if ($device['os'] == "mgeups")
     $limit      = NULL;
     $lowwarnlimit = NULL;
 
-    discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $current);
+    discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $current);
   }
 }
 
diff --git a/includes/discovery/current/netvision.inc.php b/includes/discovery/current/netvision.inc.php
index 890f6d035a..13a7ba8962 100644
--- a/includes/discovery/current/netvision.inc.php
+++ b/includes/discovery/current/netvision.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "netvision")
 {
@@ -16,7 +16,7 @@ if ($device['os'] == "netvision")
     $warnlimit = NULL;
     $limit = NULL;
 
-    discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, NULL, NULL, NULL, $current);
   }
 
   for ($i = 1; $i <= 3; $i++)
@@ -31,7 +31,7 @@ if ($device['os'] == "netvision")
     $warnlimit = NULL;
     $limit = NULL;
 
-    discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, NULL, NULL, NULL, $current);
   }
 }
 
diff --git a/includes/discovery/current/rfc1628.inc.php b/includes/discovery/current/rfc1628.inc.php
index 32af33618f..ede465dce7 100644
--- a/includes/discovery/current/rfc1628.inc.php
+++ b/includes/discovery/current/rfc1628.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## RFC1628 UPS
 if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'] == "poweralert")
@@ -25,7 +25,7 @@ if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'
       $type = "rfc1628";
       $index = 500+$current_id;
 
-      discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', NULL, NULL, NULL, NULL, $current);
+      discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', NULL, NULL, NULL, NULL, $current);
     }
   }
 
@@ -41,7 +41,7 @@ if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'
     $precision  = 1;
     $index      = $i;
 
-    discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
   }
 
   $oids = trim(snmp_walk($device, "1.3.6.1.2.1.33.1.3.2.0", "-OsqnU"));
@@ -56,7 +56,7 @@ if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'
     $precision  = 1;
     $index      = 100+$i;
 
-    discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
   }
 
   $oids = trim(snmp_walk($device, "1.3.6.1.2.1.33.1.5.2.0", "-OsqnU"));
@@ -71,7 +71,7 @@ if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'
     $precision  = 1;
     $index      = 200+$i;
 
-    discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
   }
 }
 
diff --git a/includes/discovery/current/sentry3.inc.php b/includes/discovery/current/sentry3.inc.php
index 93c5d37af8..3a08a7721b 100644
--- a/includes/discovery/current/sentry3.inc.php
+++ b/includes/discovery/current/sentry3.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == 'sentry3')
 {
@@ -41,7 +41,7 @@ if ($device['os'] == 'sentry3')
         $current         = snmp_get($device,"$infeed_oid", "-Ovq", "Sentry3-MIB") / $divisor;
 
         if ($current >= 0) {
-          discover_sensor($valid_sensor, 'current', $device, $infeed_oid, $towers, 'sentry3', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current);
+          discover_sensor($valid['sensor'], 'current', $device, $infeed_oid, $towers, 'sentry3', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current);
         }
 
         #################################
@@ -75,7 +75,7 @@ if ($device['os'] == 'sentry3')
             $outlet_current         = snmp_get($device,"$outlet_oid", "-Ovq", "Sentry3-MIB") / $outlet_divisor;
 
             if ($outlet_current >= 0) {
-              discover_sensor($valid_sensor, 'current', $device, $outlet_oid, $outlet_insert_index, 'sentry3', $outlet_descr, $outlet_divisor, $multiplier, $outlet_low_limit, $outlet_low_warn_limit, $outlet_high_warn_limit, $outlet_high_limit, $outlet_current);
+              discover_sensor($valid['sensor'], 'current', $device, $outlet_oid, $outlet_insert_index, 'sentry3', $outlet_descr, $outlet_divisor, $multiplier, $outlet_low_limit, $outlet_low_warn_limit, $outlet_high_warn_limit, $outlet_high_limit, $outlet_current);
             }
           } // if ($outlet_data)
 
diff --git a/includes/discovery/current/xups.inc.php b/includes/discovery/current/xups.inc.php
index 1d8dfa7275..bee5cfcc37 100644
--- a/includes/discovery/current/xups.inc.php
+++ b/includes/discovery/current/xups.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## XUPS-MIB
 if ($device['os'] == "powerware")
@@ -25,7 +25,7 @@ if ($device['os'] == "powerware")
       $type = "xups";
       $index = "1.2.3.".$current_id;
 
-      discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+      discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
     }
   }
 
@@ -41,7 +41,7 @@ if ($device['os'] == "powerware")
     $divisor    = 1;
     $index      = "4.4.1.3.".$i;
 
-    discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 
   $oids = trim(snmp_walk($device, "xupsInputCurrent", "-OsqnU", "XUPS-MIB"));
@@ -56,7 +56,7 @@ if ($device['os'] == "powerware")
     $divisor    = 1;
     $index      = "3.4.1.3.".$i;
 
-    discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 }
 
diff --git a/includes/discovery/entity-sensor.inc.php b/includes/discovery/entity-sensor.inc.php
index 9e5921ba4f..f2c3648e5f 100644
--- a/includes/discovery/entity-sensor.inc.php
+++ b/includes/discovery/entity-sensor.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 echo(" ENTITY-SENSOR ");
 
@@ -82,7 +82,7 @@ if (is_array($oids))
       if ($valid && mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE `device_id` = '".$device['device_id']."' AND `sensor_class` = '".$type."' AND `sensor_type` = 'cisco-entity-sensor' AND `sensor_index` = '".$index."'"),0) == "0")
       ## Check to make sure we've not already seen this sensor via cisco's entity sensor mib
       {
-        discover_sensor($valid_sensor, $type, $device, $oid, $index, 'entity-sensor', $descr, $divisor, $multiplier, NULL, NULL, NULL, NULL, $current);
+        discover_sensor($valid['sensor'], $type, $device, $oid, $index, 'entity-sensor', $descr, $divisor, $multiplier, NULL, NULL, NULL, NULL, $current);
       }
     }
   }
diff --git a/includes/discovery/fanspeeds.inc.php b/includes/discovery/fanspeeds.inc.php
index 4345f47eb5..fd582f4c5e 100644
--- a/includes/discovery/fanspeeds.inc.php
+++ b/includes/discovery/fanspeeds.inc.php
@@ -3,10 +3,10 @@
 echo("Fanspeeds : ");
 include_dir("includes/discovery/fanspeeds");
 
-if ($debug) { print_r($valid['fanspeed']); }
+if ($debug) { print_r($valid['sensor']['fanspeed']); }
 
-check_valid_sensors($device, 'fanspeed', $valid_sensor);
+check_valid_sensors($device, 'fanspeed', $valid['sensor']);
 
 echo("\n");
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/fanspeeds/areca.inc.php b/includes/discovery/fanspeeds/areca.inc.php
index f29f3f83ca..98864ae387 100644
--- a/includes/discovery/fanspeeds/areca.inc.php
+++ b/includes/discovery/fanspeeds/areca.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## Areca Fanspeeds
 if ($device['os'] == "areca")
@@ -19,7 +19,7 @@ if ($device['os'] == "areca")
       $oid  = "1.3.6.1.4.1.18928.1.2.2.1.9.1.3." . $index;
       $current = snmp_get($device, $oid, "-Oqv", "");
 
-      discover_sensor($valid_sensor, 'fanspeed', $device, $oid, $index, 'areca', trim($descr,'"'), '1', '1', NULL, NULL, NULL, NULL, $current);
+      discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, 'areca', trim($descr,'"'), '1', '1', NULL, NULL, NULL, NULL, $current);
     }
   }
 }
diff --git a/includes/discovery/fanspeeds/lmsensors.inc.php b/includes/discovery/fanspeeds/lmsensors.inc.php
index 0b2891516a..db5f0ee1aa 100644
--- a/includes/discovery/fanspeeds/lmsensors.inc.php
+++ b/includes/discovery/fanspeeds/lmsensors.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## LMSensors Fanspeeds
 if ($device['os'] == "linux")
@@ -22,7 +22,7 @@ if ($device['os'] == "linux")
       $descr = trim(str_ireplace("fan-", "", $descr));
       if ($current > '0')
       {
-        discover_sensor($valid_sensor, 'fanspeed', $device, $oid, $index, 'lmsensors', $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
+        discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, 'lmsensors', $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
       }
     }
   }
diff --git a/includes/discovery/fanspeeds/supermicro.inc.php b/includes/discovery/fanspeeds/supermicro.inc.php
index cf5e800da9..382b052e61 100644
--- a/includes/discovery/fanspeeds/supermicro.inc.php
+++ b/includes/discovery/fanspeeds/supermicro.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## Supermicro Fanspeeds
 if ($device['os'] == "linux")
@@ -35,7 +35,7 @@ if ($device['os'] == "linux")
         $descr         = str_replace(' Speed','',$descr);
         if ($monitor == 'true')
         {
-          discover_sensor($valid_sensor, 'fanspeed', $device, $fan_oid, $index, 'supermicro', $descr, $divisor, '1', $low_limit, NULL, NULL, NULL, $current);
+          discover_sensor($valid['sensor'], 'fanspeed', $device, $fan_oid, $index, 'supermicro', $descr, $divisor, '1', $low_limit, NULL, NULL, NULL, $current);
         }
       }
     }
diff --git a/includes/discovery/frequencies.inc.php b/includes/discovery/frequencies.inc.php
index 6bd02231fa..d40dac0b21 100644
--- a/includes/discovery/frequencies.inc.php
+++ b/includes/discovery/frequencies.inc.php
@@ -4,9 +4,9 @@ echo("Frequencies: ");
 
 include_dir("includes/discovery/frequencies");
 
-if ($debug) { print_r($valid['frequency']); }
+if ($debug) { print_r($valid['sensor']['frequency']); }
 
-check_valid_sensors($device, 'frequency', $valid_sensor);
+check_valid_sensors($device, 'frequency', $valid['sensor']);
 
 echo("\n");
 
diff --git a/includes/discovery/frequencies/apc.inc.php b/includes/discovery/frequencies/apc.inc.php
index 3a0e53efae..88977e0be3 100644
--- a/includes/discovery/frequencies/apc.inc.php
+++ b/includes/discovery/frequencies/apc.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## APC
 if ($device['os'] == "apc")
@@ -20,7 +20,7 @@ if ($device['os'] == "apc")
       $index = $split_oid[count($split_oid)-1];
       $oid  = "1.3.6.1.4.1.318.1.1.8.5.3.2.1.4." . $index;
       $descr = "Input Feed " . chr(64+$index);
-      discover_sensor($valid_sensor, 'frequency', $device, $oid, "3.2.1.4.$index", $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+      discover_sensor($valid['sensor'], 'frequency', $device, $oid, "3.2.1.4.$index", $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
     }
   }
 
@@ -39,7 +39,7 @@ if ($device['os'] == "apc")
       $index = $split_oid[count($split_oid)-3];
       $oid  = "1.3.6.1.4.1.318.1.1.8.5.4.2.1.4." . $index;
       $descr = "Output Feed"; if (count(explode("\n", $oids)) > 1) { $descr .= " $index"; }
-      discover_sensor($valid_sensor, 'frequency', $device, $oid, "4.2.1.4.$index", $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+      discover_sensor($valid['sensor'], 'frequency', $device, $oid, "4.2.1.4.$index", $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
     }
   }
 
@@ -53,7 +53,7 @@ if ($device['os'] == "apc")
     $type = "apc";
     $index = "3.2.4.0";
     $descr = "Input";
-    discover_sensor($valid_sensor, 'frequency', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'frequency', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 
   $oids = snmp_get($device, "1.3.6.1.4.1.318.1.1.1.4.2.2.0", "-OsqnU", "");
@@ -66,7 +66,7 @@ if ($device['os'] == "apc")
     $type = "apc";
     $index = "4.2.2.0";
     $descr = "Output";
-    discover_sensor($valid_sensor, 'frequency', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'frequency', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 }
 
diff --git a/includes/discovery/frequencies/ipoman.inc.php b/includes/discovery/frequencies/ipoman.inc.php
index 479699deca..abfadee184 100644
--- a/includes/discovery/frequencies/ipoman.inc.php
+++ b/includes/discovery/frequencies/ipoman.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor, $cache;
+
 
 ## IPOMANII-MIB
 if ($device['os'] == "ipoman")
@@ -36,7 +36,7 @@ if ($device['os'] == "ipoman")
       $current = $entry['inletStatusFrequency'] / 10;
       $low_limit = $entry['inletConfigFrequencyLow'];
       $high_limit = $entry['inletConfigFrequencyHigh'];
-      discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, 'ipoman', $descr, $divisor, '1', $low_limit, NULL, NULL, $high_limit, $current);
+      discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, 'ipoman', $descr, $divisor, '1', $low_limit, NULL, NULL, $high_limit, $current);
       # FIXME: iPoMan 1201 also says it has 2 inlets, at least until firmware 1.06 - wtf?
     }
   }
diff --git a/includes/discovery/frequencies/mgeups.inc.php b/includes/discovery/frequencies/mgeups.inc.php
index 8604f5a177..59d28e2a22 100644
--- a/includes/discovery/frequencies/mgeups.inc.php
+++ b/includes/discovery/frequencies/mgeups.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## MGE UPS Frequencies
 if ($device['os'] == "mgeups")
@@ -23,7 +23,7 @@ if ($device['os'] == "mgeups")
     $type       = "mge-ups";
     $divisor  = 10;
     $index      = $i;
-    discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
   $oids = trim(snmp_walk($device, "1.3.6.1.4.1.705.1.6.1", "-OsqnU"));
   if ($debug) { echo($oids."\n"); }
@@ -42,7 +42,7 @@ if ($device['os'] == "mgeups")
     $type       = "mge-ups";
     $divisor  = 10;
     $index      = 100+$i;
-    discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 }
 
diff --git a/includes/discovery/frequencies/netvision.inc.php b/includes/discovery/frequencies/netvision.inc.php
index 9617392bb5..e21e492874 100644
--- a/includes/discovery/frequencies/netvision.inc.php
+++ b/includes/discovery/frequencies/netvision.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "netvision")
 {
@@ -10,7 +10,7 @@ if ($device['os'] == "netvision")
   $type       = "netvision";
   $divisor  = 10;
   $index      = '3.2.0';
-  discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+  discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
 
   $freq_oid   = "1.3.6.1.4.1.4555.1.1.1.1.4.2.0";
   $descr      = "Output";
@@ -18,7 +18,7 @@ if ($device['os'] == "netvision")
   $type       = "netvision";
   $divisor  = 10;
   $index      = '4.2.0';
-  discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+  discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
 }
 
 ?>
\ No newline at end of file
diff --git a/includes/discovery/frequencies/rfc1628.inc.php b/includes/discovery/frequencies/rfc1628.inc.php
index d5c3df3dd4..c04574eb2c 100644
--- a/includes/discovery/frequencies/rfc1628.inc.php
+++ b/includes/discovery/frequencies/rfc1628.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## RFC1628
 if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'] == "poweralert")
@@ -18,7 +18,7 @@ if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'
     $type       = "rfc1628";
     $divisor  = 10;
     $index      = '3.2.0.'.$i;
-    discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 
   $freq_oid   = "1.3.6.1.2.1.33.1.4.2.0";
@@ -27,7 +27,7 @@ if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'
   $type       = "rfc1628";
   $divisor  = 10;
   $index      = '4.2.0';
-  discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+  discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
 
   $freq_oid   = "1.3.6.1.2.1.33.1.5.1.0";
   $descr      = "Bypass";
@@ -35,7 +35,7 @@ if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'
   $type       = "rfc1628";
   $divisor  = 10;
   $index      = '5.1.0';
-  discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+  discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
 }
 
 ?>
diff --git a/includes/discovery/frequencies/xups.inc.php b/includes/discovery/frequencies/xups.inc.php
index d14c31cfa6..d5f97ea7b5 100644
--- a/includes/discovery/frequencies/xups.inc.php
+++ b/includes/discovery/frequencies/xups.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## XUPS
 if ($device['os'] == "powerware")
@@ -16,7 +16,7 @@ if ($device['os'] == "powerware")
   $current  = snmp_get($device, $freq_oid, "-Oqv") / $divisor;
   $type     = "xups";
   $index    = '3.1.0';
-  discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+  discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
 
   # XUPS-MIB::xupsOutputFrequency.0 = INTEGER: 500
   $freq_oid = "1.3.6.1.4.1.534.1.4.2.0";
@@ -25,7 +25,7 @@ if ($device['os'] == "powerware")
   $current  = snmp_get($device, $freq_oid, "-Oqv") / $divisor;
   $type     = "xups";
   $index    = '4.2.0';
-  discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+  discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
 
   # XUPS-MIB::xupsBypassFrequency.0 = INTEGER: 500
   $freq_oid = "1.3.6.1.4.1.534.1.5.1.0";
@@ -38,7 +38,7 @@ if ($device['os'] == "powerware")
     $current /= $divisor;
     $type     = "xups";
     $index    = '5.1.0';
-    discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 }
 
diff --git a/includes/discovery/humidity.inc.php b/includes/discovery/humidity.inc.php
index 626d95e5ee..228e4afd09 100755
--- a/includes/discovery/humidity.inc.php
+++ b/includes/discovery/humidity.inc.php
@@ -1,18 +1,13 @@
 <?php
-$id = $device['device_id'];
-$hostname = $device['hostname'];
-$community = $device['community'];
-$snmpver = $device['snmpver'];
-$port = $device['port'];
 
 echo("Humidity : ");
 
 include_dir("includes/discovery/humidity");
 
-if ($debug) { print_r($valid['humidity']); }
+if ($debug) { print_r($valid['sensor']['humidity']); }
 
-check_valid_sensors($device, 'humidity', $valid_sensor);
+check_valid_sensors($device, 'humidity', $valid['sensor']);
 
 echo("\n");
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/humidity/akcp.inc.php b/includes/discovery/humidity/akcp.inc.php
index 3a33ce0297..32973d1b31 100644
--- a/includes/discovery/humidity/akcp.inc.php
+++ b/includes/discovery/humidity/akcp.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == 'akcp' || $device['os'] == 'minkelsrms')
 {
@@ -32,7 +32,7 @@ if ($device['os'] == 'akcp' || $device['os'] == 'minkelsrms')
         $lowlimit = snmp_get($device, $lowlimit_oid, "-Oqv", "");
         $warnlowlimit = snmp_get($device, $warnlowlimit_oid, "-Oqv", "");
 
-        discover_sensor($valid_sensor, 'humidity', $device, $oid, $index, 'akcp', $descr, '1', '1', $lowlimit, $warnlowlimit, $limit, $warnlimit, $humidity);
+        discover_sensor($valid['sensor'], 'humidity', $device, $oid, $index, 'akcp', $descr, '1', '1', $lowlimit, $warnlowlimit, $limit, $warnlimit, $humidity);
       }
     }
   }
diff --git a/includes/discovery/humidity/ipoman.inc.php b/includes/discovery/humidity/ipoman.inc.php
index ef78d857e4..f293b6fcfc 100644
--- a/includes/discovery/humidity/ipoman.inc.php
+++ b/includes/discovery/humidity/ipoman.inc.php
@@ -3,7 +3,7 @@
 # FIXME: EMD "stack" support
 # FIXME: What to do with IPOMANII-MIB::ipmEnvEmdConfigHumiOffset.0 ?
 
-global $valid_sensor;
+
 
 if ($device['os'] == "ipoman")
 {
@@ -22,7 +22,7 @@ if ($device['os'] == "ipoman")
       $current_oid = ".1.3.6.1.4.1.2468.1.4.2.1.5.1.1.3.0";
       $descr = trim(str_replace("\"", "", $descr));
 
-      discover_sensor($valid_sensor, 'humidity', $device, $current_oid, "1", 'ipoman', $descr, '10', '1', $low_limit, NULL, NULL, $high_limit, $current);
+      discover_sensor($valid['sensor'], 'humidity', $device, $current_oid, "1", 'ipoman', $descr, '10', '1', $low_limit, NULL, NULL, $high_limit, $current);
     }
   }
 }
diff --git a/includes/discovery/humidity/sentry3.inc.php b/includes/discovery/humidity/sentry3.inc.php
index b32437c184..cd32b46239 100644
--- a/includes/discovery/humidity/sentry3.inc.php
+++ b/includes/discovery/humidity/sentry3.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == 'sentry3')
 {
@@ -29,7 +29,7 @@ if ($device['os'] == 'sentry3')
       $current         = snmp_get($device,"$humidity_oid", "-Ovq", "Sentry3-MIB");
 
       if ($current >= 0) {
-        discover_sensor($valid_sensor, 'humidity', $device, $humidity_oid, $index, 'sentry3', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current);
+        discover_sensor($valid['sensor'], 'humidity', $device, $humidity_oid, $index, 'sentry3', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current);
       }
     }
     unset($data);
diff --git a/includes/discovery/ipmi.inc.php b/includes/discovery/ipmi.inc.php
index df42b316b9..238128e182 100644
--- a/includes/discovery/ipmi.inc.php
+++ b/includes/discovery/ipmi.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## IPMI
 if ($ipmi['host'] = get_dev_attrib($device,'ipmi_hostname'))
@@ -21,7 +21,7 @@ if ($ipmi['host'] = get_dev_attrib($device,'ipmi_hostname'))
     $index++;
     if (trim($current) != "na" && $ipmi_unit[trim($unit)])
     {
-      discover_sensor($valid_sensor, $ipmi_unit[trim($unit)], $device, trim($desc), $index, 'ipmi', trim($desc), '1', '1',
+      discover_sensor($valid['sensor'], $ipmi_unit[trim($unit)], $device, trim($desc), $index, 'ipmi', trim($desc), '1', '1',
         (trim($low_limit) == 'na' ? NULL : trim($low_limit)), (trim($low_warn) == 'na' ? NULL : trim($low_warn)),
         (trim($high_warn) == 'na' ? NULL : trim($high_warn)), (trim($high_limit) == 'na' ? NULL : trim($high_limit)),
         $current, 'ipmi');
diff --git a/includes/discovery/power.inc.php b/includes/discovery/power.inc.php
index 31c968292d..d1f5390398 100644
--- a/includes/discovery/power.inc.php
+++ b/includes/discovery/power.inc.php
@@ -4,9 +4,9 @@ echo("Power: ");
 
 include_dir("includes/discovery/power");
 
-if ($debug) { print_r($valid['power']); }
+if ($debug) { print_r($valid['sensor']['power']); }
 
-check_valid_sensors($device, 'power', $valid_sensor);
+check_valid_sensors($device, 'power', $valid['sensor']);
 
 echo("\n");
 
diff --git a/includes/discovery/sensors.inc.php b/includes/discovery/sensors.inc.php
index f8f056dede..7cf9fd810b 100644
--- a/includes/discovery/sensors.inc.php
+++ b/includes/discovery/sensors.inc.php
@@ -1,8 +1,6 @@
 <?php
 
-global $valid_sensor;
-
-$valid_sensor = array();
+$valid['sensor'] = array();
 
 echo("Sensors: ");
 
@@ -18,6 +16,4 @@ include("includes/discovery/current.inc.php");
 include("includes/discovery/power.inc.php");
 include("includes/discovery/fanspeeds.inc.php");
 
-unset($valid_sensor);
-
 ?>
diff --git a/includes/discovery/temperatures.inc.php b/includes/discovery/temperatures.inc.php
index 1ff4e80207..183f5b7d15 100755
--- a/includes/discovery/temperatures.inc.php
+++ b/includes/discovery/temperatures.inc.php
@@ -4,10 +4,10 @@ echo("Temperatures: ");
 
 include_dir("includes/discovery/temperatures");
 
-if ($debug) { print_r($valid_sensor['temperature']); }
+if ($debug) { print_r($valid['sensor']['temperature']); }
 
-check_valid_sensors($device, 'temperature', $valid_sensor);
+check_valid_sensors($device, 'temperature', $valid['sensor']);
 
 echo("\n");
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/akcp.inc.php b/includes/discovery/temperatures/akcp.inc.php
index 69284e6f91..860bf13968 100644
--- a/includes/discovery/temperatures/akcp.inc.php
+++ b/includes/discovery/temperatures/akcp.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "akcp" || $device['os'] == "minkelsrms")
 {
@@ -32,7 +32,7 @@ if ($device['os'] == "akcp" || $device['os'] == "minkelsrms")
         $limit        = snmp_get($device, $limit_oid, "-Oqv", "");
         $lowlimit     = snmp_get($device, $lowlimit_oid, "-Oqv", "");
 
-        discover_sensor($valid_sensor, 'temperature', $device, $temperature_oid, $temperature_id, 'akcp', $descr, '1', '1', $lowlimit, $low_warn_limit, $warnlimit, $limit, $temperature);
+        discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $temperature_id, 'akcp', $descr, '1', '1', $lowlimit, $low_warn_limit, $warnlimit, $limit, $temperature);
       }
     }
   }
diff --git a/includes/discovery/temperatures/aos-device.inc.php b/includes/discovery/temperatures/aos-device.inc.php
index c2f0fa043c..b5cb754ac9 100644
--- a/includes/discovery/temperatures/aos-device.inc.php
+++ b/includes/discovery/temperatures/aos-device.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "aos")
 {
@@ -12,7 +12,7 @@ if ($device['os'] == "aos")
   if ($descr != "" && is_numeric($temperature) && $temperature > "0")
   {
     $temperature_oid = ".1.3.6.1.4.1.18248.1.1.1.0";
-    discover_sensor($valid_sensor, 'temperature', $device, ".1.3.6.1.4.1.6486.800.1.2.1.16.1.1.1.17.0", "1", 'alcatel-device', $descr, '1', '1', NULL, NULL, NULL, NULL, $temperature);
+    discover_sensor($valid['sensor'], 'temperature', $device, ".1.3.6.1.4.1.6486.800.1.2.1.16.1.1.1.17.0", "1", 'alcatel-device', $descr, '1', '1', NULL, NULL, NULL, NULL, $temperature);
   }
 }
 
diff --git a/includes/discovery/temperatures/apc.inc.php b/includes/discovery/temperatures/apc.inc.php
index 5a32ac5b57..96b06cf511 100644
--- a/includes/discovery/temperatures/apc.inc.php
+++ b/includes/discovery/temperatures/apc.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "apc")
 {
@@ -15,7 +15,7 @@ if ($device['os'] == "apc")
     $index = 0;
     $descr = "Internal Temperature";
 
-    discover_sensor($valid_sensor, 'temperature', $device, $oid, $index, 'apc', $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'apc', $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
   }
   # InRow Chiller.
   # A silly check to find out if it's the right hardware.
@@ -35,7 +35,7 @@ if ($device['os'] == "apc")
       list($oid,$current) = explode(' ',$oids);
       $divisor = 10;
       $sensorType = substr($descr, 0, 2);
-      echo(discover_sensor($valid_sensor, 'temperature', $device, $oid, '0', $sensorType, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current));
+      echo(discover_sensor($valid['sensor'], 'temperature', $device, $oid, '0', $sensorType, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current));
     }
   }
 }
diff --git a/includes/discovery/temperatures/areca.inc.php b/includes/discovery/temperatures/areca.inc.php
index f97e40f0a9..5f461fe4cb 100644
--- a/includes/discovery/temperatures/areca.inc.php
+++ b/includes/discovery/temperatures/areca.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "areca")
 {
@@ -21,7 +21,7 @@ if ($device['os'] == "areca")
       $descr = "Hard disk $temperature_id";
       if ($temperature != -128) # -128 = not measured/present
       {
-        discover_sensor($valid_sensor, 'temperature', $device, $temperature_oid, zeropad($temperature_id), 'areca', $descr, '1', '1', NULL, NULL, NULL, NULL, $temperature);
+        discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, zeropad($temperature_id), 'areca', $descr, '1', '1', NULL, NULL, NULL, NULL, $temperature);
       }
     }
   }
@@ -42,7 +42,7 @@ if ($device['os'] == "areca")
       $oid  = "1.3.6.1.4.1.18928.1.2.2.1.10.1.3." . $index;
       $current = snmp_get($device, $oid, "-Oqv", "");
 
-      discover_sensor($valid_sensor, 'temperature', $device, $oid, $index, 'areca', trim($descr,'"'), '1', '1', NULL, NULL, NULL, NULL, $current);
+      discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'areca', trim($descr,'"'), '1', '1', NULL, NULL, NULL, NULL, $current);
     }
   }
 }
diff --git a/includes/discovery/temperatures/cisco-envmon.inc.php b/includes/discovery/temperatures/cisco-envmon.inc.php
index 5e73a268be..50b6a4d5bf 100644
--- a/includes/discovery/temperatures/cisco-envmon.inc.php
+++ b/includes/discovery/temperatures/cisco-envmon.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 global $entity_temperature;
 
 if (mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE `device_id` = '".$device['device_id']."' AND `sensor_class` = 'temperature' AND (`sensor_type` = 'cisco-entity-sensor' OR `sensor_type` = 'entity-sensor')"),0) == "0" && ($device['os'] == "ios" || $device['os_group'] == "ios"))
@@ -26,7 +26,7 @@ if (mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE `device_id` =
         $descr = str_replace("temperature", "", $descr);
         $descr = trim($descr);
 
-        discover_sensor($valid_sensor, 'temperature', $device, $oid, $index, 'cisco', $descr, '1', '1', NULL, NULL, NULL, NULL, $temperature);
+        discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'cisco', $descr, '1', '1', NULL, NULL, NULL, NULL, $temperature);
       }
     }
   }
diff --git a/includes/discovery/temperatures/cometsystem-p85xx.inc.php b/includes/discovery/temperatures/cometsystem-p85xx.inc.php
index c44587d4f3..3fb358ab3d 100644
--- a/includes/discovery/temperatures/cometsystem-p85xx.inc.php
+++ b/includes/discovery/temperatures/cometsystem-p85xx.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "cometsystem-p85xx")
 {
@@ -56,7 +56,7 @@ if ($device['os'] == "cometsystem-p85xx")
         $limit = trim($sensor['limit_high'], ' "');
         $temperature = $sensor['temp_intval'];
 
-        discover_sensor($valid_sensor, 'temperature', $device, $temperature_oid, $temperature_id, 'cometsystem-p85xx', $descr, '10', '1', $lowlimit, NULL, NULL, $limit, $temperature);
+        discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $temperature_id, 'cometsystem-p85xx', $descr, '10', '1', $lowlimit, NULL, NULL, $limit, $temperature);
       }
     }
   }
diff --git a/includes/discovery/temperatures/dell.inc.php b/includes/discovery/temperatures/dell.inc.php
index ce74e69fe7..807b1ca2d7 100644
--- a/includes/discovery/temperatures/dell.inc.php
+++ b/includes/discovery/temperatures/dell.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if (strstr($device['hardware'], "dell"))
 {
@@ -18,7 +18,7 @@ if (strstr($device['hardware'], "dell"))
       $fulloid = ".1.3.6.1.4.1.674.10892.1.700.20.1.6.$oid";
       $temp = snmp_get($device, $fulloid, "-Oqv");
 
-      discover_sensor($valid_sensor, 'temperature', $device, $fulloid, $oid, 'dell', $descr, '10', '1', NULL, NULL, NULL, NULL, $temp);
+      discover_sensor($valid['sensor'], 'temperature', $device, $fulloid, $oid, 'dell', $descr, '10', '1', NULL, NULL, NULL, NULL, $temp);
     }
   }
 }
diff --git a/includes/discovery/temperatures/ftos-c-series.inc.php b/includes/discovery/temperatures/ftos-c-series.inc.php
index 6978ac3139..2ddabb43a2 100644
--- a/includes/discovery/temperatures/ftos-c-series.inc.php
+++ b/includes/discovery/temperatures/ftos-c-series.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ### Force10 C-Series
 
@@ -23,7 +23,7 @@ if ($device['os'] == "ftos" || $device['os_group'] == "ftos")
       $entry['oid'] = ".1.3.6.1.4.1.6027.3.8.1.2.1.1.5.".$index;
       $entry['current'] = $entry['chSysCardTemp'];
 
-      discover_sensor($valid_sensor, 'temperature', $device, $entry['oid'], $index, 'ftos-cseries', $entry['descr'], '1', '1', NULL, NULL, NULL, NULL, $entry['current']);
+      discover_sensor($valid['sensor'], 'temperature', $device, $entry['oid'], $index, 'ftos-cseries', $entry['descr'], '1', '1', NULL, NULL, NULL, NULL, $entry['current']);
 
     }
 
diff --git a/includes/discovery/temperatures/ftos-e-series.inc.php b/includes/discovery/temperatures/ftos-e-series.inc.php
index b074bf1139..46308bafdf 100644
--- a/includes/discovery/temperatures/ftos-e-series.inc.php
+++ b/includes/discovery/temperatures/ftos-e-series.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ### Force10 E-Series
 
@@ -25,7 +25,7 @@ if ($device['os'] == "ftos" || $device['os_group'] == "ftos")
       $oid = ".1.3.6.1.4.1.6027.3.1.1.2.3.1.8.".$index;
       $current = $entry['chSysCardUpperTemp'];
 
-      discover_sensor($valid_sensor, 'temperature', $device, $oid, $index, 'ftos-eseries', $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
+      discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'ftos-eseries', $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
     }
   }
 
diff --git a/includes/discovery/temperatures/ftos-s-series.inc.php b/includes/discovery/temperatures/ftos-s-series.inc.php
index bb5c1a6390..4c462cc9b9 100644
--- a/includes/discovery/temperatures/ftos-s-series.inc.php
+++ b/includes/discovery/temperatures/ftos-s-series.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ### Force10 S-Series
 
@@ -22,7 +22,7 @@ if ($device['os'] == "ftos" || $device['os_group'] == "ftos")
       $oid = ".1.3.6.1.4.1.6027.3.10.1.2.2.1.14.".$index;
       $current = $entry['chStackUnitTemp'];
 
-      discover_sensor($valid_sensor, 'temperature', $device, $oid, $index, 'ftos-sseries', $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
+      discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'ftos-sseries', $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
     }
   }
 
diff --git a/includes/discovery/temperatures/ipoman.inc.php b/includes/discovery/temperatures/ipoman.inc.php
index 14739c3fe6..bb2c198f72 100644
--- a/includes/discovery/temperatures/ipoman.inc.php
+++ b/includes/discovery/temperatures/ipoman.inc.php
@@ -3,7 +3,7 @@
 # FIXME: EMD "stack" support?
 # FIXME: What to do with IPOMANII-MIB::ipmEnvEmdConfigTempOffset.0 ?
 
-global $valid_sensor;
+
 
 if ($device['os'] == "ipoman")
 {
@@ -22,7 +22,7 @@ if ($device['os'] == "ipoman")
       $current_oid = ".1.3.6.1.4.1.2468.1.4.2.1.5.1.1.2.0";
       $descr = trim(str_replace("\"", "", $descr));
 
-      discover_sensor($valid_sensor, 'temperature', $device, $current_oid, "1", 'ipoman', $descr, '10', '1', $low_limit, NULL, NULL, $high_limit, $current);
+      discover_sensor($valid['sensor'], 'temperature', $device, $current_oid, "1", 'ipoman', $descr, '10', '1', $low_limit, NULL, NULL, $high_limit, $current);
     }
   }
 }
diff --git a/includes/discovery/temperatures/ironware.inc.php b/includes/discovery/temperatures/ironware.inc.php
index 91151b3951..ecb22429b7 100644
--- a/includes/discovery/temperatures/ironware.inc.php
+++ b/includes/discovery/temperatures/ironware.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "ironware")
 {
@@ -32,7 +32,7 @@ if ($device['os'] == "ironware")
 
         $current = $temperature / 2;
 
-        discover_sensor($valid_sensor, 'temperature', $device, $temperature_oid, $oid, 'ironware', $descr, '2', '1', NULL, NULL, NULL, NULL, $current);
+        discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'ironware', $descr, '2', '1', NULL, NULL, NULL, NULL, $current);
       }
     }
   }
diff --git a/includes/discovery/temperatures/junos.inc.php b/includes/discovery/temperatures/junos.inc.php
index 8c9a1900e5..ba2c252d85 100644
--- a/includes/discovery/temperatures/junos.inc.php
+++ b/includes/discovery/temperatures/junos.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "junos" || $device['os_group'] == "junos")
 {
@@ -26,7 +26,7 @@ if ($device['os'] == "junos" || $device['os_group'] == "junos")
         $descr = str_replace("sensor", "", $descr);
         $descr = trim($descr);
 
-        discover_sensor($valid_sensor, 'temperature', $device, $temperature_oid, $oid, 'junos', $descr, '1', '1', NULL, NULL, NULL, NULL, $temperature);
+        discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'junos', $descr, '1', '1', NULL, NULL, NULL, NULL, $temperature);
       }
     }
   }
diff --git a/includes/discovery/temperatures/junose.inc.php b/includes/discovery/temperatures/junose.inc.php
index ded7ad0b8e..971306754c 100644
--- a/includes/discovery/temperatures/junose.inc.php
+++ b/includes/discovery/temperatures/junose.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## JunOSe Temperatures
 
@@ -21,7 +21,7 @@ if ($device['os'] == "junose")
         $oid = ".1.3.6.1.4.1.4874.2.2.2.1.9.4.1.3.".$index;
         $current = $entry['juniSystemTempValue'];
 
-        discover_sensor($valid_sensor, 'temperature', $device, $oid, $index, 'junose', $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
+        discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'junose', $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
       }
     }
   }
diff --git a/includes/discovery/temperatures/lm-sensors.inc.php b/includes/discovery/temperatures/lm-sensors.inc.php
index 8e13468336..b8d6392d4c 100644
--- a/includes/discovery/temperatures/lm-sensors.inc.php
+++ b/includes/discovery/temperatures/lm-sensors.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "linux")
 {
@@ -23,7 +23,7 @@ if ($device['os'] == "linux")
       $descr = trim($descr);
       if ($temperature != "0" && $temperature <= "1000")
       {
-        discover_sensor($valid_sensor, 'temperature', $device, $temperature_oid, $temperature_id, 'lmsensors', $descr, '1000', '1', NULL, NULL, NULL, NULL, $temperature);
+        discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $temperature_id, 'lmsensors', $descr, '1000', '1', NULL, NULL, NULL, NULL, $temperature);
       }
     }
   }
diff --git a/includes/discovery/temperatures/observernms-custom.inc.php b/includes/discovery/temperatures/observernms-custom.inc.php
index b226bb228f..fd0eb96e34 100644
--- a/includes/discovery/temperatures/observernms-custom.inc.php
+++ b/includes/discovery/temperatures/observernms-custom.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os_group'] == "unix")
 {
@@ -20,7 +20,7 @@ if ($device['os_group'] == "unix")
       $descr_query = $config['snmpget'] . " -M " . $config['mibdir'] . " -".$device['snmpver']." -m SNMPv2-SMI -Osqn -c ".$device['community']." ".$device['transport'].':'.$device['hostname'].":".$device['port']." .1.3.6.1.4.1.2021.7891.$oid.2.1 | sed s/.1.3.6.1.4.1.2021.7891.$oid.2.1\ //";
       $descr = trim(str_replace("\"", "", shell_exec($descr_query)));
       $fulloid = ".1.3.6.1.4.1.2021.7891.$oid.101.1";
-      discover_sensor($valid_sensor, 'temperature', $device, $fulloid, $oid, 'observium', $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
+      discover_sensor($valid['sensor'], 'temperature', $device, $fulloid, $oid, 'observium', $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
     }
   }
 }
diff --git a/includes/discovery/temperatures/papouch-tme.inc.php b/includes/discovery/temperatures/papouch-tme.inc.php
index 249a719a8b..5e363e2d63 100644
--- a/includes/discovery/temperatures/papouch-tme.inc.php
+++ b/includes/discovery/temperatures/papouch-tme.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "papouch-tme")
 {
@@ -13,7 +13,7 @@ if ($device['os'] == "papouch-tme")
   {
     $temperature_oid = ".1.3.6.1.4.1.18248.1.1.1.0";
     $descr = trim(str_replace("\"", "", $descr));
-    discover_sensor($valid_sensor, 'temperature', $device, $temperature_oid, "1", 'papouch-tme', $descr, '10', '1', NULL, NULL, NULL, NULL, $temperature);
+    discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, "1", 'papouch-tme', $descr, '10', '1', NULL, NULL, NULL, NULL, $temperature);
   }
 }
 
diff --git a/includes/discovery/temperatures/powerconnect.inc.php b/includes/discovery/temperatures/powerconnect.inc.php
index 8594f6026d..e3a6c0596a 100644
--- a/includes/discovery/temperatures/powerconnect.inc.php
+++ b/includes/discovery/temperatures/powerconnect.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "powerconnect")
 {
@@ -16,7 +16,7 @@ if ($device['os'] == "powerconnect")
     $index = "0";
     $descr = "Internal Temperature";
 
-    discover_sensor($valid_sensor, 'temperature', $device, $oid, $index, $type, $descr, $divisor, $multiplier, NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $type, $descr, $divisor, $multiplier, NULL, NULL, NULL, NULL, $current);
   }
 }
 
diff --git a/includes/discovery/temperatures/rfc1628.inc.php b/includes/discovery/temperatures/rfc1628.inc.php
index 06325c83b9..7b3fb0e428 100644
--- a/includes/discovery/temperatures/rfc1628.inc.php
+++ b/includes/discovery/temperatures/rfc1628.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'] == "poweralert")
 {
@@ -20,7 +20,7 @@ if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'
       $temperature = snmp_get($device, $temperature_oid, "-Ovq");
       $descr = "Battery" . (count(explode("\n",$oids)) == 1 ? '' : ' ' . ($temperature_id+1));
 
-      discover_sensor($valid_sensor, 'temperature', $device, $temperature_oid, $temperature_id, 'rfc1628', $descr, '1', '1', NULL, NULL, NULL, NULL, $temperature);
+      discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $temperature_id, 'rfc1628', $descr, '1', '1', NULL, NULL, NULL, NULL, $temperature);
     }
   }
 }
diff --git a/includes/discovery/temperatures/sentry3.inc.php b/includes/discovery/temperatures/sentry3.inc.php
index 3d43dca2a1..b31727d89a 100644
--- a/includes/discovery/temperatures/sentry3.inc.php
+++ b/includes/discovery/temperatures/sentry3.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "sentry3")
 {
@@ -29,7 +29,7 @@ if ($device['os'] == "sentry3")
       $current         = snmp_get($device,"$temperature_oid", "-Ovq", "Sentry3-MIB") / $divisor;
 
       if ($current >= 0) {
-        discover_sensor($valid_sensor, 'temperature', $device, $temperature_oid, $index, 'sentry3', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current);
+        discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $index, 'sentry3', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current);
       }
     }
     unset($data);
diff --git a/includes/discovery/temperatures/supermicro.inc.php b/includes/discovery/temperatures/supermicro.inc.php
index 96481d2d85..e37803557c 100644
--- a/includes/discovery/temperatures/supermicro.inc.php
+++ b/includes/discovery/temperatures/supermicro.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "linux")
 {
@@ -31,7 +31,7 @@ if ($device['os'] == "linux")
         if ($monitor == 'true')
         {
           $descr = trim(str_ireplace("temperature", "", $descr));
-          discover_sensor($valid_sensor, 'temperature', $device, $temperature_oid, trim($index,'.'), 'supermicro', $descr, $divisor, '1', NULL, NULL, NULL, $limit, $temperature);
+          discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, trim($index,'.'), 'supermicro', $descr, $divisor, '1', NULL, NULL, NULL, $limit, $temperature);
         }
       }
     }
diff --git a/includes/discovery/temperatures/xups.inc.php b/includes/discovery/temperatures/xups.inc.php
index 041612419a..fc99fd1c81 100644
--- a/includes/discovery/temperatures/xups.inc.php
+++ b/includes/discovery/temperatures/xups.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "powerware")
 {
@@ -25,7 +25,7 @@ if ($device['os'] == "powerware")
       $temperature = snmp_get($device, $temperature_oid, "-Ovq");
       $descr = "Ambient" . (count(explode("\n",$oids)) == 1 ? '' : ' ' . ($temperature_id+1));
 
-      discover_sensor($valid_sensor, 'temperature', $device, $temperature_oid, '1.6.1.'.$temperature_id, 'powerware', $descr, '1', '1', $lowlimit, NULL, NULL, $highlimit, $temperature);
+      discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, '1.6.1.'.$temperature_id, 'powerware', $descr, '1', '1', $lowlimit, NULL, NULL, $highlimit, $temperature);
     }
   }
 }
diff --git a/includes/discovery/temperatures/zyxel-ies.inc.php b/includes/discovery/temperatures/zyxel-ies.inc.php
index 2a0e33dfc0..8552f7adca 100644
--- a/includes/discovery/temperatures/zyxel-ies.inc.php
+++ b/includes/discovery/temperatures/zyxel-ies.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == 'ies')
 {
@@ -20,7 +20,7 @@ if ($device['os'] == 'ies')
       $oid = ".1.3.6.1.4.1.890.1.5.1.1.6.1.2.".$index;
       $current = $entry['accessSwitchSysTempCurValue'];
       $divisor = '1';
-      discover_sensor($valid_sensor, 'temperature', $device, $oid, $index, 'zyxel-ies', $descr, '1', '1', NULL, $entry['accessSwitchSysTempHighThresh'], NULL, NULL, $current);
+      discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'zyxel-ies', $descr, '1', '1', NULL, $entry['accessSwitchSysTempHighThresh'], NULL, NULL, $current);
     }
   }
 }
diff --git a/includes/discovery/voltages.inc.php b/includes/discovery/voltages.inc.php
index fa3611ed64..31968aa956 100755
--- a/includes/discovery/voltages.inc.php
+++ b/includes/discovery/voltages.inc.php
@@ -4,10 +4,10 @@ echo("Voltages: ");
 
 include_dir("includes/discovery/voltages");
 
-if ($debug) { print_r($valid['voltage']); }
+if ($debug) { print_r($valid['sensor']['voltage']); }
 
-check_valid_sensors($device, 'voltage', $valid_sensor);
+check_valid_sensors($device, 'voltage', $valid['sensor']);
 
 echo("\n");
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/voltages/apc.inc.php b/includes/discovery/voltages/apc.inc.php
index 635748a237..63ee632674 100644
--- a/includes/discovery/voltages/apc.inc.php
+++ b/includes/discovery/voltages/apc.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## APC Voltages
 if ($device['os'] == "apc")
@@ -21,7 +21,7 @@ if ($device['os'] == "apc")
       $oid  = "1.3.6.1.4.1.318.1.1.8.5.3.3.1.3." . $index . ".1.1";
       $descr = "Input Feed " . chr(64+$index);
 
-      discover_sensor($valid_sensor, 'voltage', $device, $oid, "3.3.1.3.$index", $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+      discover_sensor($valid['sensor'], 'voltage', $device, $oid, "3.3.1.3.$index", $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
     }
   }
 
@@ -41,7 +41,7 @@ if ($device['os'] == "apc")
       $oid  = "1.3.6.1.4.1.318.1.1.8.5.4.3.1.3." . $index . ".1.1";
       $descr = "Output Feed"; if (count(explode("\n", $oids)) > 1) { $descr .= " $index"; }
 
-      discover_sensor($valid_sensor, 'voltage', $device, $oid, "4.3.1.3.$index", $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+      discover_sensor($valid['sensor'], 'voltage', $device, $oid, "4.3.1.3.$index", $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
     }
   }
 
@@ -56,7 +56,7 @@ if ($device['os'] == "apc")
     $index = "3.2.1.0";
     $descr = "Input";
 
-    discover_sensor($valid_sensor, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 
   $oids = snmp_get($device, "1.3.6.1.4.1.318.1.1.1.4.2.1.0", "-OsqnU", "");
@@ -70,7 +70,7 @@ if ($device['os'] == "apc")
     $index = "4.2.1.0";
     $descr = "Output";
 
-    discover_sensor($valid_sensor, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 
   #PDU
@@ -86,7 +86,7 @@ if ($device['os'] == "apc")
     $index = "1";
     $descr = "Input";
 
-    discover_sensor($valid_sensor, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 }
 
diff --git a/includes/discovery/voltages/areca.inc.php b/includes/discovery/voltages/areca.inc.php
index e111496530..df86c7b20c 100644
--- a/includes/discovery/voltages/areca.inc.php
+++ b/includes/discovery/voltages/areca.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## Areca Voltages
 if ($device['os'] == "areca")
@@ -22,7 +22,7 @@ if ($device['os'] == "areca")
       $current = snmp_get($device, $oid, "-Oqv", "") / $divisor;
       if ($descr != '"Battery Status"' || $current != 0.255) # FIXME not sure if this is supposed to be a voltage, but without BBU it's 225, then ignore.
       {
-        discover_sensor($valid_sensor, 'voltage', $device, $oid, $index, $type, trim($descr,'"'), $divisor, '1', NULL, NULL, NULL, NULL, $current);
+        discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, trim($descr,'"'), $divisor, '1', NULL, NULL, NULL, NULL, $current);
       }
     }
   }
diff --git a/includes/discovery/voltages/gamatronicups.inc.php b/includes/discovery/voltages/gamatronicups.inc.php
index 37215a6ee5..9b338c58b8 100644
--- a/includes/discovery/voltages/gamatronicups.inc.php
+++ b/includes/discovery/voltages/gamatronicups.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "gamatronicups")
 {
@@ -15,7 +15,7 @@ if ($device['os'] == "gamatronicups")
     $lowlimit = 0;
     $limit = NULL;
 
-    discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $volt);
+    discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $volt);
   }
 
   for($i = 1; $i <= 3 ;$i++)
@@ -29,7 +29,7 @@ if ($device['os'] == "gamatronicups")
     $lowlimit = 0;
     $limit = NULL;
 
-    discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $volt);
+    discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $volt);
   }
 }
 
diff --git a/includes/discovery/voltages/ipoman.inc.php b/includes/discovery/voltages/ipoman.inc.php
index 1954d00f64..48b80eeb45 100644
--- a/includes/discovery/voltages/ipoman.inc.php
+++ b/includes/discovery/voltages/ipoman.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor, $cache;
+
 
 ## IPOMANII-MIB
 if ($device['os'] == "ipoman")
@@ -37,7 +37,7 @@ if ($device['os'] == "ipoman")
       $low_limit = $entry['inletConfigVoltageLow'];
       $high_limit = $entry['inletConfigVoltageHigh'];
 
-      discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, 'ipoman', $descr, $divisor, '1', $low_limit, NULL, NULL, $high_limit, $current);
+      discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, 'ipoman', $descr, $divisor, '1', $low_limit, NULL, NULL, $high_limit, $current);
       # FIXME: iPoMan 1201 also says it has 2 inlets, at least until firmware 1.06 - wtf?
     }
   }
diff --git a/includes/discovery/voltages/linux.inc.php b/includes/discovery/voltages/linux.inc.php
index ac361383ec..6e75a106b4 100644
--- a/includes/discovery/voltages/linux.inc.php
+++ b/includes/discovery/voltages/linux.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-global $valid_sensor;
-
 ## LMSensors Voltages
 if ($device['os'] == "linux")
 {
@@ -22,9 +20,9 @@ if ($device['os'] == "linux")
       $oid  = "1.3.6.1.4.1.2021.13.16.4.1.3." . $index;
       $current = snmp_get($device, $oid, "-Oqv", "LM-SENSORS-MIB") / $divisor;
 
-      discover_sensor($valid_sensor, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+      discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
     }
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/voltages/mgeups.inc.php b/includes/discovery/voltages/mgeups.inc.php
index bd7aa6f5ef..2888a140dd 100644
--- a/includes/discovery/voltages/mgeups.inc.php
+++ b/includes/discovery/voltages/mgeups.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## MGE UPS Voltages
 if ($device['os'] == "mgeups")
@@ -24,7 +24,7 @@ if ($device['os'] == "mgeups")
     $divisor    = 10;
     $index      = $i;
 
-    discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 
   $oids = trim(snmp_walk($device, "mgeinputVoltage", "-OsqnU", "MG-SNMP-UPS-MIB"));
@@ -45,7 +45,7 @@ if ($device['os'] == "mgeups")
     $divisor    = 10;
     $index      = 100+$i;
 
-    discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 }
 
diff --git a/includes/discovery/voltages/netvision.inc.php b/includes/discovery/voltages/netvision.inc.php
index 933719e9c9..2766c07be2 100644
--- a/includes/discovery/voltages/netvision.inc.php
+++ b/includes/discovery/voltages/netvision.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "netvision")
 {
@@ -15,7 +15,7 @@ if ($device['os'] == "netvision")
   $lowlimit = 0;
   $limit = NULL;
 
-  discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $volt);
+  discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $volt);
 
   for($i = 1; $i <= 3 ;$i++)
   {
@@ -28,7 +28,7 @@ if ($device['os'] == "netvision")
     $lowlimit = 0;
     $limit = NULL;
 
-    discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $volt);
+    discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $volt);
   }
 
   for($i = 1; $i <= 3 ;$i++)
@@ -42,7 +42,7 @@ if ($device['os'] == "netvision")
     $lowlimit = 0;
     $limit = NULL;
 
-    discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $volt);
+    discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $volt);
   }
 }
 
diff --git a/includes/discovery/voltages/rfc1628.inc.php b/includes/discovery/voltages/rfc1628.inc.php
index 773b0120e0..1acb4388cc 100644
--- a/includes/discovery/voltages/rfc1628.inc.php
+++ b/includes/discovery/voltages/rfc1628.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## RFC1628 UPS Voltages
 #if ($device['os'] == "netmanplus" || $device['os'] == "deltaups")
@@ -27,7 +27,7 @@ if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'
       $type = "rfc1628";
       $index = "1.2.5.".$volt_id;
 
-      discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $volt);
+      discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $volt);
     }
   }
 
@@ -43,7 +43,7 @@ if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'
     $current  = snmp_get($device, $volt_oid, "-Oqv") / $divisor;
     $index    = $i;
 
-    discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 
   $oids = trim(snmp_walk($device, "1.3.6.1.2.1.33.1.3.2.0", "-OsqnU"));
@@ -59,7 +59,7 @@ if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'
     $current  = snmp_get($device, $volt_oid, "-Oqv") / $divisor;
     $index    = 100+$i;
 
-    discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 
   $oids = trim(snmp_walk($device, "1.3.6.1.2.1.33.1.5.2.0", "-OsqnU"));
@@ -75,7 +75,7 @@ if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'
     $current  = snmp_get($device, $volt_oid, "-Oqv") / $divisor;
     $index    = 200+$i;
 
-    discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 }
 
diff --git a/includes/discovery/voltages/sentry3.inc.php b/includes/discovery/voltages/sentry3.inc.php
index 75fa2aa45f..def42bdc6a 100644
--- a/includes/discovery/voltages/sentry3.inc.php
+++ b/includes/discovery/voltages/sentry3.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 if ($device['os'] == "sentry3")
 {
@@ -22,7 +22,7 @@ if ($device['os'] == "sentry3")
       $oid  = "1.3.6.1.4.1.1718.3.2.2.1.11.1." . $index;
       $current = snmp_get($device, $oid, "-Oqv") / $divisor;
 
-      discover_sensor($valid_sensor, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+      discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
     }
   }
 }
diff --git a/includes/discovery/voltages/supermicro.inc.php b/includes/discovery/voltages/supermicro.inc.php
index f5bf88f881..ef556e109d 100644
--- a/includes/discovery/voltages/supermicro.inc.php
+++ b/includes/discovery/voltages/supermicro.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## Supermicro Voltages
 if ($device['os'] == "linux")
@@ -36,7 +36,7 @@ if ($device['os'] == "linux")
 
         if ($monitor == 'true')
         {
-          discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', $lowlimit, NULL, NULL, $limit, $current);
+          discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', $lowlimit, NULL, NULL, $limit, $current);
         }
       }
     }
diff --git a/includes/discovery/voltages/xups.inc.php b/includes/discovery/voltages/xups.inc.php
index f88b605826..b49a837c44 100644
--- a/includes/discovery/voltages/xups.inc.php
+++ b/includes/discovery/voltages/xups.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $valid_sensor;
+
 
 ## XUPS-MIB
 if ($device['os'] == "powerware")
@@ -26,7 +26,7 @@ if ($device['os'] == "powerware")
       $type = "xups";
       $index = '1.2.5.'.$volt_id;
 
-      discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $volt);
+      discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $volt);
     }
   }
 
@@ -44,7 +44,7 @@ if ($device['os'] == "powerware")
     $current  = snmp_get($device, $volt_oid, "-Oqv") / $divisor;
     $index    = '3.4.1.2.'.$i;
 
-    discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 
   # XUPS-MIB::xupsOutputNumPhases.0 = INTEGER: 1
@@ -61,7 +61,7 @@ if ($device['os'] == "powerware")
     $current  = snmp_get($device, $volt_oid, "-Oqv") / $divisor;
     $index    = '4.4.1.2.'.$i;
 
-    discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 
   # XUPS-MIB::xupsBypassNumPhases.0 = INTEGER: 1
@@ -77,7 +77,7 @@ if ($device['os'] == "powerware")
     $current  = snmp_get($device, $volt_oid, "-Oqv") / $divisor;
     $index    = '5.3.1.2.'.$i;
 
-    discover_sensor($valid_sensor, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
+    discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current);
   }
 }