diff --git a/README.md b/README.md
index 3257254..ea45767 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,6 @@ NRPE allows monitoring tools like NAGIOS or ICINGA to connect to clients for mon
 
 `cd_nrpe` is a fully parameterized Puppet module to automate NRPE installation and configuration.
 
-
 ### WARNING
 `**__!!! Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previuos configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production!!! __**`
 
@@ -39,6 +38,7 @@ CONFIGURATION
 * manage configuration files through parameters:
   * nrpe.conf
   * nrpe.cfg
+  * commands.cfg (optional)
 * manage iptables (optionals )
 
 SERVICE
@@ -74,11 +74,10 @@ See [more details about class deployment on Confdroid.com](https://confdroid.com
 
 
 ### Parameters
-The following parameters are editable via params.pp or through ENC (**__recommended__**). Values changed will take immediate effect at next puppet run. Services will be restarted where neccessary.
+The following parameters are editable via params.pp or through ENC (**__recommended__**). Values changed will take immediate effect at next puppet run. Services will be restarted where neccessary. If you want to override parameters, the [module must be specifically declared to hosts when using ENC](#through-foreman).
 
 
 ### Mandatory Parameters
-
 There are currently no mandatory parameters, i.e. the module will function right out of box as is.
 
 ### Optional Parameters
diff --git a/manifests/commands/definition_rules.pp b/manifests/commands/definition_rules.pp
index c8767f5..108462b 100644
--- a/manifests/commands/definition_rules.pp
+++ b/manifests/commands/definition_rules.pp
@@ -20,7 +20,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # @summary manage command definitions via define and Puppet rules.
 ###############################################################################
-class cd_nrpe::commands::definitions (
+class cd_nrpe::commands::definition_rules (
 
 ) inherits cd_nrpe::params {
 
diff --git a/manifests/commands/definitions.pp b/manifests/commands/definitions.pp
index 0a0ba4e..0d5856c 100644
--- a/manifests/commands/definitions.pp
+++ b/manifests/commands/definitions.pp
@@ -38,10 +38,13 @@ $ne_cmd_argstring = undef,
 
 $ne_cmd_file      = $::cd_nrpe::params::ne_cmd_file
 $ne_cmd_rule_erb  = $::cd_nrpe::params::ne_cmd_rule_erb
+$ne_manage_cmds   = $::cd_nrpe::params::ne_manage_cmds
 
+  if $ne_manage_cmds == true {
 
-  concat::fragment { $name:
-    target    =>  $ne_cmd_file,
-    content   =>  template($ne_cmd_rule_erb),
+    concat::fragment { $name:
+      target    =>  $ne_cmd_file,
+      content   =>  template($ne_cmd_rule_erb),
+    }
   }
 }