diff --git a/data/workflows/Demo.xml b/data/workflows/Demo.xml
index cfe61f6..f482821 100644
--- a/data/workflows/Demo.xml
+++ b/data/workflows/Demo.xml
@@ -33,12 +33,12 @@
 				</report>
 			</success>
 		<failure>
-		<report entity="unit" level="error">
-					<parameter name="id"><select path="id"/></parameter>
-					<parameter name="text">Unable to deploy instance <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="message" default="unknown Heat error"/> </parameter>
-				</report>
-				<stop/>
-			</failure>
+            <report entity="unit" level="error">
+                <parameter name="id"><select path="id"/></parameter>
+                <parameter name="text">Unable to deploy instance <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/> </parameter>
+            </report>
+    		<stop/>
+		</failure>
 		</update-cf-stack>
 	</rule>
 
@@ -66,7 +66,7 @@
 			<failure>
 				<report entity="unit" level="error">
 					<parameter name="id"><select path="id"/></parameter>
-					<parameter name="text">Unable to install demo service on <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter>
+					<parameter name="text">Unable to install demo service on <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
 				</report>
 				<stop/>
 			</failure>
diff --git a/data/workflows/MsSqlCluster.xml b/data/workflows/MsSqlCluster.xml
index e19df5d..014560f 100644
--- a/data/workflows/MsSqlCluster.xml
+++ b/data/workflows/MsSqlCluster.xml
@@ -68,7 +68,7 @@
             <failure>
                 <report entity="unit" level="error">
 					<parameter name="id"><select path="id"/></parameter>
-					<parameter name="text">Unable to assign address pair and open SQL ports on instance <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="message" default="unknown Heat error"/> </parameter>
+					<parameter name="text">Unable to assign address pair and open SQL ports on instance <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
 				</report>
                 <stop/>
             </failure>
diff --git a/data/workflows/MsSqlServer.xml b/data/workflows/MsSqlServer.xml
index 92ee5df..1942e8b 100644
--- a/data/workflows/MsSqlServer.xml
+++ b/data/workflows/MsSqlServer.xml
@@ -66,7 +66,7 @@
             <failure>
                 <report entity="unit" level="error">
 					<parameter name="id"><select path="id"/></parameter>
-					<parameter name="text">Unable to open SQL ports on instance <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="message" default="unknown Heat error"/> </parameter>
+					<parameter name="text">Unable to open SQL ports on instance <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
 				</report>
                 <stop/>
             </failure>
diff --git a/muranoconductor/app.py b/muranoconductor/app.py
index 2757641..90e4d5b 100644
--- a/muranoconductor/app.py
+++ b/muranoconductor/app.py
@@ -29,7 +29,7 @@ from muranocommon.messaging import MqClient, Message
 from muranoconductor import config as cfg
 from muranocommon.helpers.token_sanitizer import TokenSanitizer
 
-import windows_agent
+import vm_agent
 import cloud_formation
 
 log = logging.getLogger(__name__)
diff --git a/muranoconductor/commands/dispatcher.py b/muranoconductor/commands/dispatcher.py
index aa43762..5850f40 100644
--- a/muranoconductor/commands/dispatcher.py
+++ b/muranoconductor/commands/dispatcher.py
@@ -15,7 +15,7 @@
 
 import command
 import cloud_formation
-import windows_agent
+import vm_agent
 
 
 class CommandDispatcher(command.CommandBase):
@@ -23,7 +23,7 @@ class CommandDispatcher(command.CommandBase):
         self._command_map = {
             'cf': cloud_formation.HeatExecutor(environment, token, tenant_id,
                                                reporter),
-            'agent': windows_agent.WindowsAgentExecutor(
+            'agent': vm_agent.VmAgentExecutor(
                 environment, rmqclient, reporter)
         }
 
diff --git a/muranoconductor/commands/windows_agent.py b/muranoconductor/commands/vm_agent.py
similarity index 56%
rename from muranoconductor/commands/windows_agent.py
rename to muranoconductor/commands/vm_agent.py
index 88759ae..13f8164 100644
--- a/muranoconductor/commands/windows_agent.py
+++ b/muranoconductor/commands/vm_agent.py
@@ -1,6 +1,7 @@
-import json
 import uuid
+import yaml
 import os
+import types
 
 from muranoconductor.openstack.common import log as logging
 from muranocommon.messaging import Message
@@ -11,7 +12,7 @@ from muranocommon.helpers.token_sanitizer import TokenSanitizer
 log = logging.getLogger(__name__)
 
 
-class WindowsAgentExecutor(CommandBase):
+class VmAgentExecutor(CommandBase):
     def __init__(self, stack, rmqclient, reporter):
         self._stack = stack
         self._rmqclient = rmqclient
@@ -23,15 +24,16 @@ class WindowsAgentExecutor(CommandBase):
     def execute(self, template, mappings, unit, service, callback,
                 timeout=None):
         template_path = 'data/templates/agent/%s.template' % template
-        with open(template_path) as t_file:
-            template_data = t_file.read()
+        #with open(template_path) as t_file:
+        #    template_data = t_file.read()
+        #
+        #json_template = json.loads(template_data)
+        #json_template = self.encode_scripts(json_template, template_path)
+        template, msg_id = self.build_execution_plan(template_path)
 
-        json_template = json.loads(template_data)
-        json_template = self.encode_scripts(json_template, template_path)
-        template_data = muranoconductor.helpers.transform_json(
-            json_template, mappings)
+        template = muranoconductor.helpers.transform_json(
+            template, mappings)
 
-        msg_id = str(uuid.uuid4()).lower()
         queue = ('%s-%s-%s' % (self._stack, service, unit)).lower()
         self._pending_list.append({
             'id': msg_id,
@@ -40,16 +42,28 @@ class WindowsAgentExecutor(CommandBase):
         })
 
         msg = Message()
-        msg.body = template_data
+        msg.body = template
         msg.id = msg_id
         self._rmqclient.declare(queue)
         self._rmqclient.send(message=msg, key=queue)
         log.info('Sending RMQ message {0} to {1} with id {2}'.format(
-            TokenSanitizer().sanitize(template_data), queue, msg_id))
+            TokenSanitizer().sanitize(template), queue, msg_id))
 
-    def encode_scripts(self, json_data, template_path):
-        scripts_folder = 'data/templates/agent/scripts'
-        script_files = json_data.get("Scripts", [])
+    def build_execution_plan(self, path):
+        with open(path) as stream:
+            template = yaml.load(stream)
+        if not isinstance(template, types.DictionaryType):
+            raise ValueError('Incorrect execution plan ' + path)
+        format_version = template.get('FormatVersion')
+        if not format_version or format_version.startswith('1.'):
+            return self._build_v1_execution_plan(template, path)
+        else:
+            return self._build_v2_execution_plan(template, path)
+
+    def _build_v1_execution_plan(self, template, path):
+        scripts_folder = os.path.join(
+            os.path.dirname(path), 'scripts')
+        script_files = template.get('Scripts', [])
         scripts = []
         for script in script_files:
             script_path = os.path.join(scripts_folder, script)
@@ -57,8 +71,56 @@ class WindowsAgentExecutor(CommandBase):
             with open(script_path) as script_file:
                 script_data = script_file.read()
                 scripts.append(script_data.encode('base64'))
-        json_data["Scripts"] = scripts
-        return json_data
+        template['Scripts'] = scripts
+        return template, uuid.uuid4().hex
+
+    def _build_v2_execution_plan(self, template, path):
+        scripts_folder = os.path.join(
+            os.path.dirname(path), 'scripts')
+        plan_id = uuid.uuid4().hex
+        template['ID'] = plan_id
+        if 'Action' not in template:
+            template['Action'] = 'Execute'
+        if 'Files' not in template:
+            template['Files'] = {}
+
+        files = {}
+        for file_id, file_descr in template['Files'].items():
+            files[file_descr['Name']] = file_id
+        for name, script in template.get('Scripts', {}).items():
+            if 'EntryPoint' not in script:
+                raise ValueError('No entry point in script ' + name)
+            script['EntryPoint'] = self._place_file(
+                scripts_folder, script['EntryPoint'], template, files)
+            if 'Files' in script:
+                for i in range(0, len(script['Files'])):
+                    script['Files'][i] = self._place_file(
+                        scripts_folder, script['Files'][i], template, files)
+
+        return template, plan_id
+
+    def _place_file(self, folder, name, template, files):
+        use_base64 = False
+        if name.startswith('<') and name.endswith('>'):
+            use_base64 = True
+            name = name[1:len(name) - 1]
+        if name in files:
+            return files[name]
+
+        file_id = uuid.uuid4().hex
+        body_type = 'Base64' if use_base64 else 'Text'
+        with open(os.path.join(folder, name)) as stream:
+            body = stream.read()
+        if use_base64:
+            body = body.encode('base64')
+
+        template['Files'][file_id] = {
+            'Name': name,
+            'BodyType': body_type,
+            'Body': body
+        }
+        files[name] = file_id
+        return file_id
 
     def has_pending_commands(self):
         return len(self._pending_list) > 0
@@ -86,7 +148,7 @@ class WindowsAgentExecutor(CommandBase):
                 msg = subscription.get_message(timeout=timeout)
                 if msg:
                     msg.ack()
-                    msg_id = msg.id.lower()
+                    msg_id = msg.body.get('SourceID', msg.id)
                     item, index = muranoconductor.helpers.find(
                         lambda t: t['id'] == msg_id, self._pending_list)
                     if item:
diff --git a/muranoconductor/windows_agent.py b/muranoconductor/vm_agent.py
similarity index 60%
rename from muranoconductor/windows_agent.py
rename to muranoconductor/vm_agent.py
index 46fba6f..d4d4755 100644
--- a/muranoconductor/windows_agent.py
+++ b/muranoconductor/vm_agent.py
@@ -14,8 +14,8 @@
 # limitations under the License.
 import os.path
 import datetime
-from muranoconductor.commands.windows_agent import AgentTimeoutException
-from muranoconductor.commands.windows_agent import UnhandledAgentException
+from muranoconductor.commands.vm_agent import AgentTimeoutException
+from muranoconductor.commands.vm_agent import UnhandledAgentException
 
 import xml_code_engine
 
@@ -24,6 +24,53 @@ from openstack.common import log as logging
 log = logging.getLogger(__name__)
 
 
+def _extract_results(result_value, ok, errors):
+    if isinstance(result_value, AgentTimeoutException):
+        errors.append({
+            'source': 'timeout',
+            'message': result_value.message,
+            'timeout': result_value.timeout,
+            'timestamp': datetime.datetime.now().isoformat()
+        })
+    elif isinstance(result_value, dict):
+        if result_value.get('FormatVersion', '1.0.0').startswith('1.'):
+            _extract_v1_results(result_value, ok, errors)
+        else:
+            _extract_v2_results(result_value, ok, errors)
+
+
+def _extract_v1_results(result_value, ok, errors):
+        if result_value['IsException']:
+            errors.append(dict(_get_exception_info(
+                result_value.get('Result', [])), source='execution_plan'))
+        else:
+            for res in result_value.get('Result', []):
+                if res['IsException']:
+                    errors.append(dict(_get_exception_info(
+                        res.get('Result', [])), source='command'))
+                else:
+                    ok.append(res)
+
+
+def _extract_v2_results(result_value, ok, errors):
+    error_code = result_value.get('ErrorCode', 0)
+    if not error_code:
+        ok.append(result_value.get('Body'))
+    else:
+        body = result_value.get('Body') or {}
+        err = {
+            'message': body.get('Message'),
+            'details': body.get('AdditionalInfo'),
+            'errorCode': error_code,
+            'time': result_value.get('Time')
+        }
+        for attr in ('Message', 'AdditionalInfo'):
+            if attr in body:
+                del attr[body]
+        err['extra'] = body if body else None
+        errors.append(err)
+
+
 def send_command(engine, context, body, template, service, unit,
                  mappings=None, result=None, error=None, timeout=None,
                  osVersion=None, **kwargs):
@@ -41,24 +88,7 @@ def send_command(engine, context, body, template, service, unit,
                 template, result_value, unit))
         ok = []
         errors = []
-        if isinstance(result_value, AgentTimeoutException):
-            errors.append({
-                'source': 'timeout',
-                'message': result_value.message,
-                'timeout': result_value.timeout,
-                'timestamp': datetime.datetime.now().isoformat()
-            })
-        else:
-            if result_value['IsException']:
-                errors.append(dict(_get_exception_info(
-                    result_value.get('Result', [])), source='execution_plan'))
-            else:
-                for res in result_value.get('Result', []):
-                    if res['IsException']:
-                        errors.append(dict(_get_exception_info(
-                            res.get('Result', [])), source='command'))
-                    else:
-                        ok.append(res)
+        _extract_results(result_value, ok, errors)
 
         if ok:
             if result is not None:
diff --git a/requirements.txt b/requirements.txt
index e170316..6b31c0f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,3 +12,4 @@ netaddr
 oslo.config
 deep
 murano-common>=0.2.2
+PyYAML>=3.1.0
\ No newline at end of file
diff --git a/tests/conductor/test_windows_agent.py b/tests/conductor/test_vm_agent.py
similarity index 88%
rename from tests/conductor/test_windows_agent.py
rename to tests/conductor/test_vm_agent.py
index 73cb9f4..05eb69f 100644
--- a/tests/conductor/test_windows_agent.py
+++ b/tests/conductor/test_vm_agent.py
@@ -18,10 +18,10 @@ import mock
 import mockfs
 import json
 
-from muranoconductor.commands.windows_agent import WindowsAgentExecutor
+from muranoconductor.commands.vm_agent import VmAgentExecutor
 
 
-class TestWindowsAgent(unittest.TestCase):
+class TestVmAgent(unittest.TestCase):
     def setUp(self):
         self.mfs = mockfs.replace_builtins()
         self.template = {
@@ -53,8 +53,9 @@ class TestWindowsAgent(unittest.TestCase):
         reporter = mock.MagicMock()
         rmqclient.declare = mock.Mock()
 
-        executor = WindowsAgentExecutor(stack, rmqclient, reporter)
-        result = executor.encode_scripts(self.template, self.template_path)
+        executor = VmAgentExecutor(stack, rmqclient, reporter)
+        result, plan_id = executor.build_execution_plan(
+            self.template_path)
         encoded = [
             'ZnVuY3Rpb24gR2V0RE5TaXAoKXsKdGVzdAp9Cg==\n',
             'ZnVuY3Rpb24gSm9pbkRvbWFpbigpewp0ZXN0Cn0K\n'