diff --git a/cdist/conf/type/__pf_ruleset/man.text b/cdist/conf/type/__pf_ruleset/man.text
index 0dc07f71..29efe065 100644
--- a/cdist/conf/type/__pf_ruleset/man.text
+++ b/cdist/conf/type/__pf_ruleset/man.text
@@ -16,7 +16,7 @@ This type is used on *BSD systems to manage the pf firewall's ruleset.
 REQUIRED PARAMETERS
 -------------------
 state::
-   Either "absent" (no ruleset at all) or "present"
+   Either "absent" (no ruleset at all) or "present", defaults to "present".
 
 
 OPTIONAL PARAMETERS
diff --git a/cdist/conf/type/__pf_ruleset/parameter/default/state b/cdist/conf/type/__pf_ruleset/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__pf_ruleset/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__pf_ruleset/parameter/optional b/cdist/conf/type/__pf_ruleset/parameter/optional
index 5a18cd2f..d77f3048 100644
--- a/cdist/conf/type/__pf_ruleset/parameter/optional
+++ b/cdist/conf/type/__pf_ruleset/parameter/optional
@@ -1 +1,2 @@
 source
+state
diff --git a/cdist/conf/type/__postgres_database/gencode-remote b/cdist/conf/type/__postgres_database/gencode-remote
index 0ffc842a..c097efce 100755
--- a/cdist/conf/type/__postgres_database/gencode-remote
+++ b/cdist/conf/type/__postgres_database/gencode-remote
@@ -19,8 +19,7 @@
 #
 
 name="$__object_id"
-state_should="present"
-[ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")"
+state_should="$(cat "$__object/parameter/state")"
 state_is="$(cat "$__object/explorer/state")"
 
 if [ "$state_should" != "$state_is" ]; then
diff --git a/cdist/conf/type/__postgres_database/man.text b/cdist/conf/type/__postgres_database/man.text
index 88259b6f..c7c0d3cd 100644
--- a/cdist/conf/type/__postgres_database/man.text
+++ b/cdist/conf/type/__postgres_database/man.text
@@ -16,7 +16,7 @@ This cdist type allows you to create or drop postgres databases.
 OPTIONAL PARAMETERS
 -------------------
 state::
-   either 'present' or 'absent'
+   either 'present' or 'absent', defaults to 'present'.
 
 owner::
    the role owning this database
diff --git a/cdist/conf/type/__postgres_database/parameter/default/state b/cdist/conf/type/__postgres_database/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__postgres_database/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__postgres_role/gencode-remote b/cdist/conf/type/__postgres_role/gencode-remote
index 65a9d588..0230e48e 100755
--- a/cdist/conf/type/__postgres_role/gencode-remote
+++ b/cdist/conf/type/__postgres_role/gencode-remote
@@ -20,8 +20,7 @@
 
 name="$__object_id"
 state_is="$(cat "$__object/explorer/state")"
-state_should="present"
-[ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")"
+state_should="$(cat "$__object/parameter/state")"
 
 [ "$state_is" = "$state_should" ] && exit 0
 
diff --git a/cdist/conf/type/__postgres_role/parameter/default/state b/cdist/conf/type/__postgres_role/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__postgres_role/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__rvm/man.text b/cdist/conf/type/__rvm/man.text
index c1f83e60..0408d125 100644
--- a/cdist/conf/type/__rvm/man.text
+++ b/cdist/conf/type/__rvm/man.text
@@ -16,7 +16,7 @@ RVM is the Ruby enVironment Manager for the Ruby programming language.
 REQUIRED PARAMETERS
 -------------------
 state::
-    Either "present" or "absent".
+    Either "present" or "absent", defaults to "present".
 
 
 EXAMPLES
diff --git a/cdist/conf/type/__rvm/parameter/default/state b/cdist/conf/type/__rvm/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__rvm/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__pf_ruleset/parameter/required b/cdist/conf/type/__rvm/parameter/optional
similarity index 100%
rename from cdist/conf/type/__pf_ruleset/parameter/required
rename to cdist/conf/type/__rvm/parameter/optional
diff --git a/cdist/conf/type/__rvm_gemset/man.text b/cdist/conf/type/__rvm_gemset/man.text
index 44c0c555..e85425f3 100644
--- a/cdist/conf/type/__rvm_gemset/man.text
+++ b/cdist/conf/type/__rvm_gemset/man.text
@@ -18,7 +18,7 @@ REQUIRED PARAMETERS
 user::
     The remote user account to use
 state::
-    Either "present" or "absent".
+    Either "present" or "absent", defaults to "present".
 
 BOOLEAN PARAMETERS
 -------------------
diff --git a/cdist/conf/type/__rvm_gemset/parameter/default/state b/cdist/conf/type/__rvm_gemset/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__rvm_gemset/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__rvm/parameter/required b/cdist/conf/type/__rvm_gemset/parameter/optional
similarity index 100%
rename from cdist/conf/type/__rvm/parameter/required
rename to cdist/conf/type/__rvm_gemset/parameter/optional
diff --git a/cdist/conf/type/__rvm_gemset/parameter/required b/cdist/conf/type/__rvm_gemset/parameter/required
index 5aea6f1e..4eb8387f 100644
--- a/cdist/conf/type/__rvm_gemset/parameter/required
+++ b/cdist/conf/type/__rvm_gemset/parameter/required
@@ -1,2 +1 @@
-state
 user
diff --git a/cdist/conf/type/__rvm_ruby/man.text b/cdist/conf/type/__rvm_ruby/man.text
index dbbab85e..6419a4d4 100644
--- a/cdist/conf/type/__rvm_ruby/man.text
+++ b/cdist/conf/type/__rvm_ruby/man.text
@@ -18,7 +18,7 @@ REQUIRED PARAMETERS
 user::
     The remote user account to use
 state::
-    Either "present" or "absent".
+    Either "present" or "absent", defaults to "present".
 
 BOOLEAN PARAMETERS
 ------------------
diff --git a/cdist/conf/type/__rvm_ruby/parameter/default/state b/cdist/conf/type/__rvm_ruby/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__rvm_ruby/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__rvm_ruby/parameter/optional b/cdist/conf/type/__rvm_ruby/parameter/optional
new file mode 100644
index 00000000..ff72b5c7
--- /dev/null
+++ b/cdist/conf/type/__rvm_ruby/parameter/optional
@@ -0,0 +1 @@
+state
diff --git a/cdist/conf/type/__rvm_ruby/parameter/required b/cdist/conf/type/__rvm_ruby/parameter/required
index 5aea6f1e..4eb8387f 100644
--- a/cdist/conf/type/__rvm_ruby/parameter/required
+++ b/cdist/conf/type/__rvm_ruby/parameter/required
@@ -1,2 +1 @@
-state
 user