diff --git a/includes/discovery/processors-hrdevice.inc.php b/includes/discovery/processors-hrdevice.inc.php
index 2e7018cd2..1ba04ef65 100755
--- a/includes/discovery/processors-hrdevice.inc.php
+++ b/includes/discovery/processors-hrdevice.inc.php
@@ -25,23 +25,9 @@
           rename($old_rrd,$new_rrd);
           echo("Moved RRD ");
         }
-
         if(!strstr($descr, "No") && !strstr($usage, "No") && $descr != "" && $descr != "An electronic chip that makes the computer work.") 
         {
-          if(mysql_result(mysql_query("SELECT count(processor_id) FROM `processors` WHERE `processor_index` = '$index' AND `device_id` = '".$device['device_id']."' AND `processor_type` = 'hr'"),0) == '0') {
-            $query = "INSERT INTO processors (`hrDeviceIndex`, `device_id`, `processor_descr`, `processor_index`, `processor_oid`, `processor_usage`, `processor_type`)
-                      values ('$hrDeviceIndex', '".$device['device_id']."', '$descr', '$index', '$usage_oid', '".$usage."', 'hr')";
-            mysql_query($query);
-            if($debug) { print $query . "\n"; }
-            echo("+");
-          } else {
-            echo(".");
-            $query = "UPDATE `processors` SET `processor_descr` = '".$descr."', `processor_oid` = '".$usage_oid."', `processor_usage` = '".$usage."'
-                      WHERE `device_id` = '".$device['device_id']."' AND `processor_index` = '".$index."' AND `processor_type` = 'hr'";
-            mysql_query($query);
-            if($debug) { print $query . "\n"; }
-          }
-          $valid_processor['hr'][$index] = 1;
+          discover_processor($valid_processor, $device, $usage_oid, $index, "hr", $descr, "1", $usage, NULL, $hrDeviceIndex);
         }
       }
     }
diff --git a/includes/discovery/processors-ios.inc.php b/includes/discovery/processors-ios.inc.php
index 3254dd7f5..d07f8f95a 100755
--- a/includes/discovery/processors-ios.inc.php
+++ b/includes/discovery/processors-ios.inc.php
@@ -33,7 +33,7 @@
 
         if(!strstr($descr, "No") && !strstr($usage, "No") && $descr != "" ) 
         {
-          discover_processor($valid_processor, $device, $oid, $index, "cpm", $descr, "1", $entry['juniSystemModuleCpuUtilPct'], $entPhysicalIndex, NULL);
+          discover_processor($valid_processor, $device, $usage_oid, $index, "cpm", $descr, "1", $entry['juniSystemModuleCpuUtilPct'], $entPhysicalIndex, NULL);
         }
       }
     }
diff --git a/includes/discovery/processors-ironware.inc.php b/includes/discovery/processors-ironware.inc.php
index 82ae04ed1..8cd3a7dcc 100755
--- a/includes/discovery/processors-ironware.inc.php
+++ b/includes/discovery/processors-ironware.inc.php
@@ -33,20 +33,7 @@
 
         if(!strstr($descr, "No") && !strstr($usage, "No") && $descr != "" ) 
         {
-          if(mysql_result(mysql_query("SELECT count(processor_id) FROM `processors` WHERE `processor_index` = '$index' AND `device_id` = '".$device['device_id']."' AND `processor_type` = 'ironware'"),0) == '0') {
-            $query = "INSERT INTO processors (`entPhysicalIndex`, `device_id`, `processor_descr`, `processor_index`, `processor_oid`, `processor_usage`, `processor_type`, `processor_precision`)
-                      values ('$entPhysicalIndex', '".$device['device_id']."', '$descr', '$index', '$usage_oid', '".$usage."', 'ironware', '$precision')";
-            mysql_query($query);
-            if($debug) { print $query . "\n"; }
-            echo("+");
-          } else {
-            echo(".");
-            $query = "UPDATE `processors` SET `processor_descr` = '".$descr."', `processor_oid` = '".$usage_oid."', `processor_usage` = '".$usage."'
-                      WHERE `device_id` = '".$device['device_id']."' AND `processor_index` = '".$index."' AND `processor_type` = 'ironware'";
-            mysql_query($query);
-            if($debug) { print $query . "\n"; }
-          }
-          $valid_processor['ironware'][$index] = 1;
+          discover_processor($valid_processor, $device, $usage_oid, $index, "ironware", $descr, $precision, $usage, $entPhysicalIndex, NULL);
         }
       }
     }
diff --git a/includes/discovery/processors-junose.inc.php b/includes/discovery/processors-junose.inc.php
index 397d39cb7..153d65303 100755
--- a/includes/discovery/processors-junose.inc.php
+++ b/includes/discovery/processors-junose.inc.php
@@ -14,21 +14,9 @@
         $descr_oid = ".1.3.6.1.4.1.4874.2.2.2.1.3.5.1.6." . $index;
         $descr = $entry['juniSystemModuleDescr'];
         $usage = $entry['juniSystemModuleCpuFiveMinAvgPct'];
+
         if(!strstr($descr, "No") && !strstr($usage, "No") && $descr != "" ) {
-          if(mysql_result(mysql_query("SELECT count(processor_id) FROM `processors` WHERE `processor_index` = '$index' AND `device_id` = '".$device['device_id']."' AND `processor_type` = 'junose'"),0) == '0') {
-            $query = "INSERT INTO processors (`entPhysicalIndex`, `device_id`, `processor_descr`, `processor_index`, `processor_oid`, `processor_usage`, `processor_type`) 
-                      values ('$entPhysicalIndex', '".$device['device_id']."', '$descr', '$index', '$usage_oid', '".$entry['juniSystemModuleCpuUtilPct']."', 'junose')";
-            mysql_query($query);
-	    if($debug) { print $query . "\n"; }
-            echo("+");
-          }   else { 
-            echo("."); 
-            $query = "UPDATE `processors` SET `processor_descr` = '".$descr."', `processor_oid` = '".$usage_oid."', `processor_usage` = '".$usage."' 
-                      WHERE `device_id` = '".$device['device_id']."' AND `processor_index` = '".$index."' AND `processor_type` = 'junose'";
-            mysql_query($query);
-            if($debug) { print $query . "\n"; }
-          }
-          $valid_processor['junose'][$index] = 1;
+          discover_processor($valid_processor, $device, $usage_oid, $index, "junose", $descr, "1", $usage, $entPhysicalIndex, NULL);
         }
       }
     }