diff --git a/README.rst b/README.rst
index 2c48994..bfc5299 100644
--- a/README.rst
+++ b/README.rst
@@ -61,6 +61,26 @@
         enabled: true
         ...
 
+Collecting the SNMP metrics
+
+.. code-block:: yaml
+
+    collectd:
+      client:
+        data:
+          connected_devices:
+            type: devices
+            values:
+            - IF-MIB::ifNumber.0
+        host:
+          ubiquity:
+            address: 10.0.0.1
+            community: public
+            version: 2
+            data:
+            - connected_devices
+
+
 Read more
 =========
 
diff --git a/collectd/files/collectd_snmp.conf b/collectd/files/collectd_snmp.conf
index 8436469..6856317 100644
--- a/collectd/files/collectd_snmp.conf
+++ b/collectd/files/collectd_snmp.conf
@@ -3,8 +3,14 @@
   {%- for data_name, data in plugin.data.iteritems() %}
   <Data "{{ data_name }}">
     Type "{{ data.type }}"
-    Table true
-    Instance "{{ data.instance }}"
+    Instance "{{ data.get(instance, "") }}"
+    Table "{{ data.get(table, "false") }}"
+    {%- if data.scale is defined %}
+    Scale "{{ data.scale }}"
+    {%- endif %}
+    {%- if data.shift is defined %}
+    Shift "{{ data.shift }}"
+    {%- endif %}
     Values{%- for value in data.values %} "{{ value }}"{% endfor %}
   </Data>
   {%- endfor %}
@@ -13,7 +19,10 @@
     Address "{{ host.address }}"
     Version {{ host.get('version', '2') }}
     Community "{{ host.community }}"
-    Collect{% for data_name, data in plugin.data.iteritems() %} "{{ data_name }}"{% endfor %}
+    {%- if data.interval is defined %}
+    Interval "{{ data.interval }}"
+    {%- endif %}
+    Collect{% for datum in host.data %} "{{ datum }}"{% endfor %}
   </Host>
   {%- endfor %}
 </Plugin>