diff --git a/discovery.php b/discovery.php
index ee9e545f7..3108fed34 100755
--- a/discovery.php
+++ b/discovery.php
@@ -174,30 +174,15 @@ while ($device = mysql_fetch_assoc($device_query))
       include("includes/discovery/".$options['m'].".inc.php");
     }
   } else {
-    include("includes/discovery/ports.inc.php");
-    include("includes/discovery/ports-stack.inc.php");
-    include("includes/discovery/entity-physical.inc.php");
-    include("includes/discovery/processors.inc.php");
-    include("includes/discovery/mempools.inc.php");
-    include("includes/discovery/ipv4-addresses.inc.php");
-    include("includes/discovery/ipv6-addresses.inc.php");
-    include("includes/discovery/sensors.inc.php");
-    include("includes/discovery/storage.inc.php");
-    include("includes/discovery/hr-device.inc.php");
-    include("includes/discovery/discovery-protocols.inc.php");
-    include("includes/discovery/arp-table.inc.php");
-    include("includes/discovery/junose-atm-vp.inc.php");
-    include("includes/discovery/bgp-peers.inc.php");
-    include("includes/discovery/q-bridge-mib.inc.php");
-    include("includes/discovery/cisco-vlans.inc.php");
-    include("includes/discovery/cisco-mac-accounting.inc.php");
-    include("includes/discovery/cisco-pw.inc.php");
-    include("includes/discovery/cisco-vrf.inc.php");
-    include("includes/discovery/vmware-vminfo.inc.php");
-    include("includes/discovery/libvirt-vminfo.inc.php");
-    include("includes/discovery/toner.inc.php");
-    include("includes/discovery/ucd-diskio.inc.php");
-    include("includes/discovery/services.inc.php");
+
+    foreach($config['discovery_modules'] as $module => $module_status)
+    {
+      if($module_status || $device_attribs['discovery_module'][$module])
+      {
+        include('includes/discovery/'.$module.'.inc.php');
+      }
+    }
+
   }
   if ($device['type'] == "unknown" || $device['type'] == "")
   {
diff --git a/includes/static-config.php b/includes/static-config.php
index 9aba90101..4d85d1972 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -6,6 +6,56 @@
 #                 YES, THAT MEANS YOU                   #
 #########################################################
 
+
+$config['poller_modules']['ipmi']                         = 1;
+$config['poller_modules']['sensors']                      = 1;
+$config['poller_modules']['processors']                   = 1;
+$config['poller_modules']['mempools']                     = 1;
+$config['poller_modules']['storage']                      = 1;
+$config['poller_modules']['netstats']                     = 1;
+$config['poller_modules']['hr-mib']                       = 1;
+$config['poller_modules']['ucd-mib']                      = 1;
+$config['poller_modules']['ipSystemStats.inc.php']        = 1;
+$config['poller_modules']['ports']                        = 1;
+$config['poller_modules']['bgp-peers.inc.php']            = 1;
+$config['poller_modules']['junose-atm-vp.inc.php']        = 1;
+$config['poller_modules']['toner.inc.php']                = 1;
+$config['poller_modules']['ucd-diskio']                   = 1;
+$config['poller_modules']['applications']                 = 1;
+$config['poller_modules']['wifi']                         = 1;
+$config['poller_modules']['ospf']                         = 1;
+$config['poller_modules']['cisco-ipsec-flow-monitor']     = 1;
+$config['poller_modules']['cisco-remote-access-monitor']  = 1;
+$config['poller_modules']['cisco-cef']                    = 1;
+$config['poller_modules']['cisco-mac-accounting.inc.php'] = 1;
+
+      #include("includes/polling/altiga-ssl.inc.php");
+
+$config['discovery_modules']['ports']                     = 1;
+$config['discovery_modules']['ports-stack']               = 1;
+$config['discovery_modules']['entity-physical']           = 1;
+$config['discovery_modules']['processors']                = 1;
+$config['discovery_modules']['mempools']                  = 1;
+$config['discovery_modules']['ipv4-addresses']            = 1;
+$config['discovery_modules']['ipv6-addresses']            = 1;
+$config['discovery_modules']['sensors']                   = 1;
+$config['discovery_modules']['storage']                   = 1;
+$config['discovery_modules']['hr-device']                 = 1;
+$config['discovery_modules']['discovery-protocols']       = 1;
+$config['discovery_modules']['arp-table']                 = 1;
+$config['discovery_modules']['junose-atm-vp']             = 1;
+$config['discovery_modules']['bgp-peers']                 = 1;
+$config['discovery_modules']['q-bridge-mib']              = 1;
+$config['discovery_modules']['cisco-vlans']               = 1;
+$config['discovery_modules']['cisco-mac-accounting']      = 1;
+$config['discovery_modules']['cisco-pw']                  = 1;
+$config['discovery_modules']['cisco-vrf']                 = 1;
+$config['discovery_modules']['vmware-vminfo']             = 1;
+$config['discovery_modules']['libvirt-vminfo']            = 1;
+$config['discovery_modules']['toner']                     = 1;
+$config['discovery_modules']['ucd-diskio']                = 1;
+$config['discovery_modules']['services']                  = 1;
+
 $config['os']['default']['over'][0]['graph']	= "device_processor";
 $config['os']['default']['over'][0]['text']	= "Processor Usage";
 $config['os']['default']['over'][1]['graph'] 	= "device_mempool";
diff --git a/poller.php b/poller.php
index 82d1254cd..3bd5c8426 100755
--- a/poller.php
+++ b/poller.php
@@ -236,28 +236,13 @@ while ($device = mysql_fetch_assoc($device_query))
         include("includes/polling/".$options['m'].".inc.php");
       }
     } else {
-      include("includes/polling/ipmi.inc.php");
-      include("includes/polling/sensors.inc.php");
-      include("includes/polling/processors.inc.php");
-      include("includes/polling/mempools.inc.php");
-      include("includes/polling/storage.inc.php");
-      include("includes/polling/netstats.inc.php");
-      include("includes/polling/hr-mib.inc.php");
-      include("includes/polling/ucd-mib.inc.php");
-      include("includes/polling/ipSystemStats.inc.php");
-      include("includes/polling/ports.inc.php");
-      include("includes/polling/cisco-mac-accounting.inc.php");
-      include("includes/polling/bgp-peers.inc.php");
-      include("includes/polling/junose-atm-vp.inc.php");
-      include("includes/polling/toner.inc.php");
-      include("includes/polling/ucd-diskio.inc.php");
-      include("includes/polling/applications.inc.php");
-      include("includes/polling/wifi.inc.php");
-      include("includes/polling/ospf.inc.php");
-      #include("includes/polling/altiga-ssl.inc.php");
-      include("includes/polling/cisco-ipsec-flow-monitor.inc.php");
-      include("includes/polling/cisco-remote-access-monitor.inc.php");
-      include("includes/polling/cisco-cef.inc.php");
+      foreach($config['poller_modules'] as $module => $module_status)
+      {
+        if($module_status || $device_attribs['poller_module'][$module])
+        {
+          include('includes/polling/'.$module.'.inc.php');
+        }
+      }
     }
 
     unset($update);