diff --git a/cookiecutter.json b/cookiecutter.json
index 113796f..7e65fdf 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -1,8 +1,8 @@
 {
-    "project_name": "salt-formula",
-    "repo_name": "{{ cookiecutter.project_name|replace('-', '_') }}",
-    "service_name": "{{ cookiecutter.project_name.split('-')[0] }}",
+    "service_name": "some_service",
     "role_name": "server",
+    "project_name": "{{ cookiecutter.service_name }}-formula",
+    "repo_name": "{{ cookiecutter.service_name|replace('_', '-') }}-formula",
     "license_holder": "tcp cloud a.s.",
     "author_contact": "Ales Komarek <ales.komarek@tcpcloud.eu>"
 }
diff --git "a/\173\173cookiecutter.project_name\175\175/metadata/service/support.yml" "b/\173\173cookiecutter.project_name\175\175/metadata/service/support.yml"
new file mode 100644
index 0000000..3e15623
--- /dev/null
+++ "b/\173\173cookiecutter.project_name\175\175/metadata/service/support.yml"
@@ -0,0 +1,11 @@
+parameters:
+  {{ cookiecutter.service_name }}:
+    _support:
+      collectd:
+        enabled: false
+      heka:
+        enabled: false
+      sensu:
+        enabled: false
+      sphinx:
+        enabled: true
diff --git "a/\173\173cookiecutter.project_name\175\175/metadata/service/\173\173cookiecutter.role_name\175\175/cluster.yml" "b/\173\173cookiecutter.project_name\175\175/metadata/service/\173\173cookiecutter.role_name\175\175/cluster.yml"
index c9dc550..08c4097 100644
--- "a/\173\173cookiecutter.project_name\175\175/metadata/service/\173\173cookiecutter.role_name\175\175/cluster.yml"
+++ "b/\173\173cookiecutter.project_name\175\175/metadata/service/\173\173cookiecutter.role_name\175\175/cluster.yml"
@@ -1,45 +1,10 @@
 applications:
-- heat
+- {{cookiecutter.service_name}}
+classes:
+- service.{{cookiecutter.service_name}}.support
 parameters:
-  heat:
-    server:
+  {{cookiecutter.service_name}}:
+    {{cookiecutter.role_name}}:
       enabled: true
-      version: ${_param:heat_version}
       bind:
-        api_cfn:
-          address: ${_param:cluster_local_address}
-        api_cloudwatch:
-          address: ${_param:cluster_local_address}
-        api:
-          address: ${_param:cluster_local_address}
-      database:
-        engine: mysql
-        host: ${_param:cluster_vip_address}
-        port: 3306
-        name: heat
-        user: heat
-        password: ${_param:mysql_heat_password}
-      metadata:
-        host: ${_param:cluster_vip_address}
-        port: 8000
-      waitcondition:
-        host: ${_param:cluster_vip_address}
-        port: 8000
-      watch:
-        host: ${_param:cluster_vip_address}
-        port: 8003
-      identity:
-        engine: keystone
-        host: ${_param:cluster_vip_address}
-        port: 35357
-        tenant: service
-        user: heat
-        password: ${_param:keystone_heat_password}
-      message_queue:
-        engine: rabbitmq
-        host: ${_param:cluster_vip_address}
-        port: 5672
-        user: openstack
-        password: ${_param:rabbitmq_openstack_password}
-        virtual_host: '/openstack'
-        ha_queues: true
+        address: 0.0.0.0
diff --git "a/\173\173cookiecutter.project_name\175\175/metadata/service/\173\173cookiecutter.role_name\175\175/single.yml" "b/\173\173cookiecutter.project_name\175\175/metadata/service/\173\173cookiecutter.role_name\175\175/single.yml"
index 8853853..08c4097 100644
--- "a/\173\173cookiecutter.project_name\175\175/metadata/service/\173\173cookiecutter.role_name\175\175/single.yml"
+++ "b/\173\173cookiecutter.project_name\175\175/metadata/service/\173\173cookiecutter.role_name\175\175/single.yml"
@@ -1,6 +1,10 @@
 applications:
 - {{cookiecutter.service_name}}
+classes:
+- service.{{cookiecutter.service_name}}.support
 parameters:
   {{cookiecutter.service_name}}:
     {{cookiecutter.role_name}}:
       enabled: true
+      bind:
+        address: 0.0.0.0
diff --git "a/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/files/sensu.conf" "b/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/files/sensu.conf"
deleted file mode 100644
index 903e2f2..0000000
--- "a/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/files/sensu.conf"
+++ /dev/null
@@ -1,6 +0,0 @@
-local_{{cookiecutter.service_name}}_proc:
-  command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C {{cookiecutter.service_name}} -u {{cookiecutter.service_name}} -c 1:1"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - local-{{cookiecutter.service_name}}-{{cookiecutter.role_name}}
diff --git "a/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/files/\173\173cookiecutter.service_name\175\175.conf" "b/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/files/\173\173cookiecutter.service_name\175\175.conf"
new file mode 100644
index 0000000..44e3449
--- /dev/null
+++ "b/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/files/\173\173cookiecutter.service_name\175\175.conf"
@@ -0,0 +1 @@
+# Service config file
\ No newline at end of file
diff --git "a/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/meta/sensu.yml" "b/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/meta/sensu.yml"
new file mode 100644
index 0000000..ec71914
--- /dev/null
+++ "b/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/meta/sensu.yml"
@@ -0,0 +1,8 @@
+# Sample check
+check:
+  local_{{cookiecutter.service_name}}_proc:
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C {{cookiecutter.service_name}} -u {{cookiecutter.service_name}} -c 1:1"
+    interval: 60
+    occurrences: 1
+    subscribers:
+    - local-{{cookiecutter.service_name}}-{{cookiecutter.role_name}}
diff --git "a/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/meta/sphinx.yml" "b/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/meta/sphinx.yml"
new file mode 100644
index 0000000..06cee59
--- /dev/null
+++ "b/\173\173cookiecutter.project_name\175\175/\173\173cookiecutter.service_name\175\175/meta/sphinx.yml"
@@ -0,0 +1,12 @@
+{{ '{%-' }} from "{{cookiecutter.service_name}}/map.jinja" import {{cookiecutter.role_name}} with context {{ '%}' }}
+# Fill in documentation details
+doc:
+  name: {{cookiecutter.service_name}}
+  description: Some service info
+  role:
+    {{cookiecutter.role_name}}:
+      name: {{cookiecutter.role_name}}
+      param:
+        some_param:
+          name: "Some name"
+          value: "some value"