diff --git a/reclass/files/reclass-config.yml b/reclass/files/reclass-config.yml
index 26ff0e2..20713d2 100644
--- a/reclass/files/reclass-config.yml
+++ b/reclass/files/reclass-config.yml
@@ -6,9 +6,16 @@
 {%- if storage.nodes_uri is defined %}
 nodes_uri: {{ storage.nodes_uri }}
 {%- endif %}
-{%- if storage.class_mappings is defined %}
+{%- if storage.class_mappings|length > 0 %}
 class_mappings:
 {%- for mapping in storage.class_mappings %}
 - {{ mapping.target }} {{ mapping.class }}
 {%- endfor %}
 {%- endif %}
+{% if storage.propagate_pillar_data_to_reclass == True %}
+propagate_pillar_data_to_reclass: {{ storage.propagate_pillar_data_to_reclass }}
+{%- endif %}
+{% if storage.ignore_class_notfound == True %}
+# Below option is not available in upstream reclass, and require fork https://github.com/salt-formulas/reclass
+ignore_class_notfound: {{ storage.ignore_class_notfound }}
+{%- endif %}
diff --git a/reclass/map.jinja b/reclass/map.jinja
index 4514c80..5891a1e 100644
--- a/reclass/map.jinja
+++ b/reclass/map.jinja
@@ -8,6 +8,9 @@
         'storage_type': 'yaml_fs',
         'repeat_replace_symbol': '<<count>>',
         'version': '1.4.1',
+        'class_mappings':  {},
+        'ignore_class_notfound': False,
+        'propagate_pillar_data_to_reclass': False
     },
     'RedHat': {
         'base_dir': '/etc/reclass/base',
@@ -18,5 +21,8 @@
         'storage_type': 'yaml_fs',
         'repeat_replace_symbol': '<<count>>',
         'version': '1.4.1',
+        'class_mappings':  {},
+        'ignore_class_notfound': False,
+        'propagate_pillar_data_to_reclass': False
     },
 }, grain='os_family', merge=salt['pillar.get']('reclass:storage')) %}
diff --git a/tests/pillar/class_mapping.sls b/tests/pillar/class_mapping.sls
index 05d74d5..cfecfb9 100644
--- a/tests/pillar/class_mapping.sls
+++ b/tests/pillar/class_mapping.sls
@@ -4,3 +4,4 @@
     class_mappings:
     - target: '\*'
       class: default
+    ignore_class_notfound: true