Cleanup params
diff --git a/keepalived/init.sls b/keepalived/init.sls
index b06c1e1..0ec754a 100644
--- a/keepalived/init.sls
+++ b/keepalived/init.sls
@@ -1,5 +1,7 @@
 
+{%- if pillar.keepalived is defined %}
 include:
-{% if pillar.keepalived.cluster is defined %}
+{%- if pillar.keepalived.cluster is defined %}
 - keepalived.cluster
-{% endif %}
+{%- endif %}
+{%- endif %}
diff --git a/keepalived/meta/sensu.yml b/keepalived/meta/sensu.yml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/keepalived/meta/sensu.yml
diff --git a/keepalived/meta/sphinx.yml b/keepalived/meta/sphinx.yml
index 848ed2d..6686bd2 100644
--- a/keepalived/meta/sphinx.yml
+++ b/keepalived/meta/sphinx.yml
@@ -1,9 +1,12 @@
+{%- from "keepalived/map.jinja" import cluster with context %}
 doc:
   name: Keepalived
   description: The main goal of this project is to provide simple and robust facilities for loadbalancing and high-availability to Linux system and Linux based infrastructures.
   role:
-  {%- if pillar.keepalived.cluster is defined %}
     cluster:
       name: cluster
-      param: {}
-  {%- endif %}
+      param:
+        virtual_router_id:
+          value: {{ cluster.instance.VIP.virtual_router_id }}
+        priority:
+          value: {{ cluster.instance.VIP.priority }}
diff --git a/metadata/service/cluster/single.yml b/metadata/service/cluster/single.yml
index 16a02e5..aa5098b 100644
--- a/metadata/service/cluster/single.yml
+++ b/metadata/service/cluster/single.yml
@@ -1,5 +1,7 @@
 applications:
 - keepalived
+classes:
+- service.keepalived.support
 parameters:
   _param:
     keepalived_vip_priority: 100