From 91ce7626bcdc519eff90731fa723a7ccbb029d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Fri, 5 Dec 2025 18:12:41 +0100
Subject: [PATCH 01/28] Added Template Instantiator

---
 Makefile                                  |   2 +-
 templateprocessor/templateinstantiator.py |  36 ++++
 tests/Makefile                            |   3 +-
 tests/test_templateinstantiator.py        | 234 ++++++++++++++++++++++
 4 files changed, 273 insertions(+), 2 deletions(-)
 create mode 100644 templateprocessor/templateinstantiator.py
 create mode 100644 tests/test_templateinstantiator.py

diff --git a/Makefile b/Makefile
index 640171b..b3cf4ce 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ PYTHON ?= python3
 all: check-format check
 
 install:
-	pipx install .
+	pipx install --force .
 
 check:
 	$(MAKE) -C tests check
diff --git a/templateprocessor/templateinstantiator.py b/templateprocessor/templateinstantiator.py
new file mode 100644
index 0000000..e8e02d1
--- /dev/null
+++ b/templateprocessor/templateinstantiator.py
@@ -0,0 +1,36 @@
+"""
+Template Instantiator.
+
+This module is responsible for instantiating Mako templates using the provided data.
+"""
+
+from templateprocessor.iv import InterfaceView
+from templateprocessor.so import SystemObjectType, SystemObject
+from typing import List
+from mako.template import Template
+
+
+class TemplateInstantiator:
+    """
+    Instantiator of Mako templates
+    """
+
+    system_object_types: List[SystemObjectType] = list()
+    interface_view: InterfaceView
+
+    def __init__(
+        self, interface_view: InterfaceView, system_object_types: List[SystemObjectType]
+    ):
+        self.system_object_types = system_object_types
+        self.interface_view = interface_view
+
+    def instantiate(self, template: str, context_directory: str) -> str:
+        mako_template = Template(text=template, module_directory=context_directory)
+
+        context = {
+            "system_object_types": self.system_object_types,
+            "interface_view": self.interface_view,
+        }
+
+        instantiated_text = str(mako_template.render(**context))
+        return instantiated_text
diff --git a/tests/Makefile b/tests/Makefile
index f599055..f405cbc 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -3,7 +3,8 @@ PYTHON ?= python3
 
 TESTS = \
 	test_ivreader.py \
-	test_soreader.py
+	test_soreader.py \
+	test_templateinstantiator.py
 
 .PHONY: \
 	check
diff --git a/tests/test_templateinstantiator.py b/tests/test_templateinstantiator.py
new file mode 100644
index 0000000..648028f
--- /dev/null
+++ b/tests/test_templateinstantiator.py
@@ -0,0 +1,234 @@
+"""
+Tests for TemplateInstantiator class
+"""
+
+import pytest
+import tempfile
+from pathlib import Path
+from typing import List
+from templateprocessor.templateinstantiator import TemplateInstantiator
+from templateprocessor.iv import (
+    InterfaceView,
+    Function,
+    Language,
+    ProvidedInterface,
+    RequiredInterface,
+    InterfaceKind,
+    InputParameter,
+    OutputParameter,
+    Encoding,
+)
+from templateprocessor.so import SystemObjectType, SystemObject
+
+
+class TestTemplateInstantiator:
+    """Test cases for TemplateInstantiator class."""
+
+    @staticmethod
+    def create_sample_interface_view() -> InterfaceView:
+        """Create a sample InterfaceView for testing."""
+        iv = InterfaceView(
+            version="1.3",
+            asn1file="test.acn",
+            uiFile="test.ui.xml",
+            modifierHash="test_hash",
+        )
+
+        # Create a sample function
+        func = Function(
+            id="func_1", name="TestFunction", is_type=False, language=Language.C
+        )
+
+        # Add a provided interface
+        pi = ProvidedInterface(
+            id="pi_1",
+            name="test_pi",
+            kind=InterfaceKind.SPORADIC,
+        )
+        pi.input_parameters = [
+            InputParameter(name="input1", type="MyInt", encoding=Encoding.NATIVE)
+        ]
+        func.provided_interfaces = [pi]
+
+        # Add a required interface
+        ri = RequiredInterface(
+            id="ri_1",
+            name="test_ri",
+            kind=InterfaceKind.CYCLIC,
+        )
+        ri.output_parameters = [
+            OutputParameter(name="output1", type="MyFloat", encoding=Encoding.UPER)
+        ]
+        func.required_interfaces = [ri]
+
+        iv.functions = [func]
+        return iv
+
+    @staticmethod
+    def create_sample_system_object_types() -> List[SystemObjectType]:
+        """Create sample SystemObjectTypes for testing."""
+        # Create events system object type
+        events = SystemObjectType()
+        events.property_names = ["ID", "Name", "Severity"]
+
+        event1 = SystemObject()
+        event1.values = {"ID": "1", "Name": "Error Event", "Severity": "high"}
+        event2 = SystemObject()
+        event2.values = {"ID": "2", "Name": "Info Event", "Severity": "low"}
+
+        events.instances = [event1, event2]
+
+        # Create parameters system object type
+        params = SystemObjectType()
+        params.property_names = ["ID", "Name", "Default"]
+
+        param1 = SystemObject()
+        param1.values = {"ID": "1", "Name": "Timeout", "Default": "100"}
+        param2 = SystemObject()
+        param2.values = {"ID": "2", "Name": "MaxRetries", "Default": "3"}
+
+        params.instances = [param1, param2]
+
+        return [events, params]
+
+    def test_instantiator_initialization(self):
+        """Test TemplateInstantiator initialization."""
+        iv = self.create_sample_interface_view()
+        so_types = self.create_sample_system_object_types()
+
+        instantiator = TemplateInstantiator(iv, so_types)
+
+        assert instantiator.interface_view == iv
+        assert instantiator.system_object_types == so_types
+        assert len(instantiator.system_object_types) == 2
+
+    def test_instantiate_simple_template(self):
+        """Test instantiating a simple template."""
+        iv = self.create_sample_interface_view()
+        so_types = self.create_sample_system_object_types()
+        instantiator = TemplateInstantiator(iv, so_types)
+
+        template = "Hello World!"
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            result = instantiator.instantiate(template, tmpdir)
+
+        assert result == "Hello World!"
+
+    def test_instantiate_template_with_interface_view(self):
+        """Test instantiating a template that uses Interface View."""
+        iv = self.create_sample_interface_view()
+        so_types = self.create_sample_system_object_types()
+        instantiator = TemplateInstantiator(iv, so_types)
+
+        template = """Interface View version: ${interface_view.version}
+ASN1 file: ${interface_view.asn1file}
+Number of functions: ${len(interface_view.functions)}"""
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            result = instantiator.instantiate(template, tmpdir)
+
+        assert "Interface View version: 1.3" in result
+        assert "ASN1 file: test.acn" in result
+        assert "Number of functions: 1" in result
+
+    def test_instantiate_template_with_function_details(self):
+        """Test instantiating a template that accesses Function details."""
+        iv = self.create_sample_interface_view()
+        so_types = self.create_sample_system_object_types()
+        instantiator = TemplateInstantiator(iv, so_types)
+
+        template = """% for func in interface_view.functions:
+Function: ${func.name}
+Language: ${func.language.value}
+Provided Interfaces: ${len(func.provided_interfaces)}
+Required Interfaces: ${len(func.required_interfaces)}
+% endfor"""
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            result = instantiator.instantiate(template, tmpdir)
+
+        assert "Function: TestFunction" in result
+        assert "Language: C" in result
+        assert "Provided Interfaces: 1" in result
+        assert "Required Interfaces: 1" in result
+
+    def test_instantiate_template_with_system_object_types(self):
+        """Test instantiating a template that uses System Object Types."""
+        iv = self.create_sample_interface_view()
+        so_types = self.create_sample_system_object_types()
+        instantiator = TemplateInstantiator(iv, so_types)
+
+        template = """Number of System Object Types: ${len(system_object_types)}
+% for so_type in system_object_types:
+  Properties: ${', '.join(so_type.property_names)}
+  Instances: ${len(so_type.instances)}
+% endfor"""
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            result = instantiator.instantiate(template, tmpdir)
+
+        assert "Number of System Object Types: 2" in result
+        assert "Properties: ID, Name, Severity" in result
+        assert "Properties: ID, Name, Default" in result
+        assert "Instances: 2" in result
+
+    def test_instantiate_template_with_system_object_instances(self):
+        """Test instantiating a template that accesses System Object Type instances."""
+        iv = self.create_sample_interface_view()
+        so_types = self.create_sample_system_object_types()
+        instantiator = TemplateInstantiator(iv, so_types)
+
+        template = """% for so_type in system_object_types:
+% for instance in so_type.instances:
+% if 'Name' in instance.values:
+  - ID: ${instance.values['ID']} - ${instance.values['Name']}} 
+% endif
+% endfor
+% endfor"""
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            result = instantiator.instantiate(template, tmpdir)
+
+        assert " ID: 1 - Error Event" in result
+        assert " ID: 2 - Info Event" in result
+        assert " ID: 1 - Timeout" in result
+        assert " ID: 2 - MaxRetries" in result
+
+    def test_instantiate_template_with_empty_data(self):
+        """Test instantiating a template with empty Interface View and no System Objects."""
+        iv = InterfaceView(version="1.0", asn1file="", uiFile="", modifierHash="")
+
+        so_types = []
+
+        instantiator = TemplateInstantiator(iv, so_types)
+
+        template = """Version: ${interface_view.version}
+Functions: ${len(interface_view.functions)}
+System Object Types: ${len(system_object_types)}"""
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            result = instantiator.instantiate(template, tmpdir)
+
+        assert "Version: 1.0" in result
+        assert "Functions: 0" in result
+        assert "System Object Types: 0" in result
+
+    def test_instantiate_template_with_python_expressions(self):
+        """Test instantiating a template with Python expressions."""
+        iv = self.create_sample_interface_view()
+        so_types = self.create_sample_system_object_types()
+        instantiator = TemplateInstantiator(iv, so_types)
+
+        template = """<%
+total_interfaces = sum(len(f.provided_interfaces) + len(f.required_interfaces) for f in interface_view.functions)
+total_instances = sum(len(so.instances) for so in system_object_types)
+%>
+Total Interfaces: ${total_interfaces}
+Total System Object Instances: ${total_instances}"""
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            result = instantiator.instantiate(template, tmpdir)
+
+        assert "Total Interfaces: 2" in result
+        assert "Total System Object Instances: 4" in result

From 88edd66fd51e78a899855813aa856e7876b86566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Fri, 5 Dec 2025 18:32:46 +0100
Subject: [PATCH 02/28] Added names to SystemObjectTypes

---
 templateprocessor/templateinstantiator.py |  8 +++--
 tests/test_templateinstantiator.py        | 44 ++++++++++++++---------
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/templateprocessor/templateinstantiator.py b/templateprocessor/templateinstantiator.py
index e8e02d1..8883eb9 100644
--- a/templateprocessor/templateinstantiator.py
+++ b/templateprocessor/templateinstantiator.py
@@ -6,7 +6,7 @@
 
 from templateprocessor.iv import InterfaceView
 from templateprocessor.so import SystemObjectType, SystemObject
-from typing import List
+from typing import List, Dict
 from mako.template import Template
 
 
@@ -15,11 +15,13 @@ class TemplateInstantiator:
     Instantiator of Mako templates
     """
 
-    system_object_types: List[SystemObjectType] = list()
+    system_object_types: Dict[str, SystemObjectType] = dict()
     interface_view: InterfaceView
 
     def __init__(
-        self, interface_view: InterfaceView, system_object_types: List[SystemObjectType]
+        self,
+        interface_view: InterfaceView,
+        system_object_types: Dict[str, SystemObjectType],
     ):
         self.system_object_types = system_object_types
         self.interface_view = interface_view
diff --git a/tests/test_templateinstantiator.py b/tests/test_templateinstantiator.py
index 648028f..d25c572 100644
--- a/tests/test_templateinstantiator.py
+++ b/tests/test_templateinstantiator.py
@@ -5,7 +5,7 @@
 import pytest
 import tempfile
 from pathlib import Path
-from typing import List
+from typing import Dict, List
 from templateprocessor.templateinstantiator import TemplateInstantiator
 from templateprocessor.iv import (
     InterfaceView,
@@ -65,7 +65,7 @@ def create_sample_interface_view() -> InterfaceView:
         return iv
 
     @staticmethod
-    def create_sample_system_object_types() -> List[SystemObjectType]:
+    def create_sample_system_object_types() -> Dict[str, SystemObjectType]:
         """Create sample SystemObjectTypes for testing."""
         # Create events system object type
         events = SystemObjectType()
@@ -89,7 +89,11 @@ def create_sample_system_object_types() -> List[SystemObjectType]:
 
         params.instances = [param1, param2]
 
-        return [events, params]
+        sots = dict()
+        sots["events"] = events
+        sots["params"] = params
+
+        return sots
 
     def test_instantiator_initialization(self):
         """Test TemplateInstantiator initialization."""
@@ -160,17 +164,17 @@ def test_instantiate_template_with_system_object_types(self):
         instantiator = TemplateInstantiator(iv, so_types)
 
         template = """Number of System Object Types: ${len(system_object_types)}
-% for so_type in system_object_types:
-  Properties: ${', '.join(so_type.property_names)}
-  Instances: ${len(so_type.instances)}
+% for name, so_type in system_object_types.items():
+  [${name}] Properties: ${', '.join(so_type.property_names)}
+  [${name}] Instances: ${len(so_type.instances)}
 % endfor"""
 
         with tempfile.TemporaryDirectory() as tmpdir:
             result = instantiator.instantiate(template, tmpdir)
 
         assert "Number of System Object Types: 2" in result
-        assert "Properties: ID, Name, Severity" in result
-        assert "Properties: ID, Name, Default" in result
+        assert "[events] Properties: ID, Name, Severity" in result
+        assert "[params] Properties: ID, Name, Default" in result
         assert "Instances: 2" in result
 
     def test_instantiate_template_with_system_object_instances(self):
@@ -179,27 +183,33 @@ def test_instantiate_template_with_system_object_instances(self):
         so_types = self.create_sample_system_object_types()
         instantiator = TemplateInstantiator(iv, so_types)
 
-        template = """% for so_type in system_object_types:
+        template = """% for name, so_type in system_object_types.items():
+[${name}]
 % for instance in so_type.instances:
 % if 'Name' in instance.values:
-  - ID: ${instance.values['ID']} - ${instance.values['Name']}} 
+ - ID: ${instance.values['ID']} - ${instance.values['Name']}
 % endif
 % endfor
 % endfor"""
 
         with tempfile.TemporaryDirectory() as tmpdir:
             result = instantiator.instantiate(template, tmpdir)
-
-        assert " ID: 1 - Error Event" in result
-        assert " ID: 2 - Info Event" in result
-        assert " ID: 1 - Timeout" in result
-        assert " ID: 2 - MaxRetries" in result
+        assert (
+            """[events]
+ - ID: 1 - Error Event
+ - ID: 2 - Info Event
+[params]
+ - ID: 1 - Timeout
+ - ID: 2 - MaxRetries
+"""
+            == result
+        )
 
     def test_instantiate_template_with_empty_data(self):
         """Test instantiating a template with empty Interface View and no System Objects."""
         iv = InterfaceView(version="1.0", asn1file="", uiFile="", modifierHash="")
 
-        so_types = []
+        so_types = {}
 
         instantiator = TemplateInstantiator(iv, so_types)
 
@@ -222,7 +232,7 @@ def test_instantiate_template_with_python_expressions(self):
 
         template = """<%
 total_interfaces = sum(len(f.provided_interfaces) + len(f.required_interfaces) for f in interface_view.functions)
-total_instances = sum(len(so.instances) for so in system_object_types)
+total_instances = sum(len(so.instances) for so in system_object_types.values())
 %>
 Total Interfaces: ${total_interfaces}
 Total System Object Instances: ${total_instances}"""

From 9e741d9b857b4255da6553bef8d66b2ea7a59595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Fri, 5 Dec 2025 19:40:12 +0100
Subject: [PATCH 03/28] Working proof of concept

---
 examples/generate_so_list.sh |   3 +
 examples/so_list.tmplt       |   8 +++
 setup.py                     |   2 +-
 templateprocessor/cli.py     | 104 +++++++++++++++++++++++++++++++----
 templateprocessor/iv.py      |   8 +--
 5 files changed, 110 insertions(+), 15 deletions(-)
 create mode 100755 examples/generate_so_list.sh
 create mode 100644 examples/so_list.tmplt

diff --git a/examples/generate_so_list.sh b/examples/generate_so_list.sh
new file mode 100755
index 0000000..298f8bb
--- /dev/null
+++ b/examples/generate_so_list.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+mkdir -p output
+template-processor --verbosity info --sos ../data/events.csv -o output -t so_list.tmplt
\ No newline at end of file
diff --git a/examples/so_list.tmplt b/examples/so_list.tmplt
new file mode 100644
index 0000000..2260540
--- /dev/null
+++ b/examples/so_list.tmplt
@@ -0,0 +1,8 @@
+### List of all System Objects
+% for name, so_type in system_object_types.items():
+[${name}]
+Properties: ${', '.join(so_type.property_names)}
+% for idx, instance in enumerate(so_type.instances):
+Instance ${idx}: ${', '.join(instance.values.values())}
+% endfor
+% endfor
\ No newline at end of file
diff --git a/setup.py b/setup.py
index ec90987..55d60ff 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@
     include_package_data=True,
     python_requires='>=3.8',
     install_requires=[
-        # Add project dependencies here
+        "mako==1.3.10"
     ],
     extras_require={
         'dev': [
diff --git a/templateprocessor/cli.py b/templateprocessor/cli.py
index 6884b35..0c43c53 100644
--- a/templateprocessor/cli.py
+++ b/templateprocessor/cli.py
@@ -2,13 +2,19 @@
 Command Line Interface for Template Processor
 """
 
+import logging
 import argparse
+import os
+from pathlib import Path
 import sys
 from templateprocessor import __version__
+from templateprocessor.iv import InterfaceView
+from templateprocessor.templateinstantiator import TemplateInstantiator
+from templateprocessor.ivreader import IVReader
+from templateprocessor.soreader import SOReader
 
 
-def main():
-    """Main entry point for the Template Processor CLI."""
+def parse_arguments() -> argparse.Namespace:
     parser = argparse.ArgumentParser(
         description="Template Processor - Template processing engine for TASTE Document Generator",
         formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -19,24 +25,102 @@ def main():
     )
 
     parser.add_argument(
-        "-i",
-        "--input",
-        help="Input data file (e.g., TASTE Interface View data)",
+        "-i", "--iv", help="Input Interface View", metavar="FILE",
+    )
+
+    parser.add_argument(
+        "-s",
+        "--sos",
+        help="Input System Objects provided as CSV files (each as a separate argument)",
+        metavar="FILE",
+        action="append",
+    )
+
+    parser.add_argument(
+        "-t",
+        "--template",
+        help="Template file to process (each as a separate argument)",
         metavar="FILE",
+        action="append",
+    )
+
+    parser.add_argument(
+        "-o",
+        "--output",
+        help="Output directory for processed templates",
+        metavar="DIR",
+        required=True,
     )
 
     parser.add_argument(
-        "-t", "--template", help="Template file to process", metavar="FILE"
+        "--verbosity",
+        choices=["info", "debug", "warning", "error"],
+        default="warning",
+        help="Logging verbosity",
     )
 
     parser.add_argument(
-        "-o", "--output", help="Output file for processed template", metavar="FILE"
+        "-p",
+        "--postprocess",
+        choices=["none", "md2docx"],
+        help="Output postprocessing",
+        default="none",
     )
 
-    args = parser.parse_args()
+    return parser.parse_args()
+
+
+def get_log_level(level_str: str) -> int:
+    log_levels = {
+        "info": logging.INFO,
+        "debug": logging.DEBUG,
+        "warning": logging.WARNING,
+        "error": logging.ERROR,
+    }
+
+    return log_levels.get(level_str.lower(), logging.WARNING)
+
+
+def main():
+    """Main entry point for the Template Processor CLI."""
+
+    args = parse_arguments()
+    logging_level = get_log_level(args.verbosity)
+    logging.basicConfig(level=logging_level)
+
+    logging.info("Template Processor")
+    logging.debug(f"Interface View: {args.iv}")
+    logging.debug(f"System Objects: {args.sos}")
+    logging.debug(f"Templates: {args.template}")
+    logging.debug(f"Output Directory: {args.output}")
+
+    logging.info(f"Reading Interface View from {args.iv}")
+    iv = IVReader().read(args.iv) if args.iv else InterfaceView()
+    sots = {}
+    so_reader = SOReader()
+    for sot_file in args.sos:
+        logging.info(f"Reading System Objects from {sot_file}")
+        name = Path(sot_file).stem
+        logging.debug(f"-SOT name: {name}")
+        sos = so_reader.read(sot_file)
+        sots[name] = sos
+
+    instantiator = TemplateInstantiator(iv, sots)
 
-    print("Template Processor - Not yet implemented")
-    print(f"Version: {__version__}")
+    for template_file in args.template:
+        logging.info(f"Processing template {template_file}")
+        name = Path(template_file).stem
+        logging.debug(f"Base name: {name}")
+        logging.debug(f"Reading template {template_file}")
+        with open(template_file, "r") as f:
+            template = f.read()
+        logging.debug(f"Instantiating template:\n {template}")
+        instantiated_template = instantiator.instantiate(template, "")
+        logging.debug(f"Instantiation:\n {instantiated_template}")
+        output = Path(args.output) / f"{name}.md"
+        logging.debug(f"Saving to {output}")
+        with open(output, "w") as f:
+            f.write(instantiated_template)
 
     return 0
 
diff --git a/templateprocessor/iv.py b/templateprocessor/iv.py
index 734e9a1..6b486d4 100644
--- a/templateprocessor/iv.py
+++ b/templateprocessor/iv.py
@@ -200,10 +200,10 @@ class InterfaceView:
     and other elements that define a TASTE system's interface architecture.
     """
 
-    version: str
-    asn1file: str
-    uiFile: str
-    modifierHash: str
+    version: str = ""
+    asn1file: str = ""
+    uiFile: str = ""
+    modifierHash: str = ""
     functions: List[Function] = field(default_factory=list)
     connections: List[Connection] = field(default_factory=list)
     comments: List[Comment] = field(default_factory=list)

From 9e663c076d312fa47114b3ae109d5a236f947274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Mon, 8 Dec 2025 13:51:20 +0100
Subject: [PATCH 04/28] Added parsing of requirement IDs

---
 data/requirements.iv.xml      | 37 +++++++++++++++++++++++++++++++++++
 templateprocessor/cli.py      |  5 ++++-
 templateprocessor/iv.py       |  2 ++
 templateprocessor/ivreader.py |  2 ++
 tests/test_ivreader.py        | 30 ++++++++++++++++++++++++++++
 5 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 data/requirements.iv.xml

diff --git a/data/requirements.iv.xml b/data/requirements.iv.xml
new file mode 100644
index 0000000..43f932e
--- /dev/null
+++ b/data/requirements.iv.xml
@@ -0,0 +1,37 @@
+<InterfaceView version="1.3" asn1file="demo-req.acn" UiFile="interfaceview.ui.xml" modifierHash="383508e">
+<Function id="{b817e542-68fe-4c61-8a6c-e0d6686a74b8}" name="Function_1" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="r2,r1" startup_priority="1" instances_max="1" instances_min="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{9277a50e-a317-4598-8f7e-e9f7fbed3929}" name="trigger" kind="Cyclic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" stack_size="1024" period="1000" dispatch_offset="0" priority="1" wcet="0">
+</Provided_Interface>
+
+<Required_Interface id="{ab166713-8312-475c-aba1-f525ec5c820e}" name="do_smth" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" requirement_ids="r5" stack_size="1024" miat="0" priority="1" wcet="0" queue_size="1">
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="SDL"/>
+    </Implementations>
+</Function>
+
+<Function id="{2f99fc8c-2153-4b71-91c8-e4782e96c809}" name="Function_2" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" startup_priority="1" instances_max="1" instances_min="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{cdef6ab0-7130-45d5-91e4-76f84eb245e1}" name="do_smth" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" requirement_ids="r5" stack_size="1024" miat="0" priority="1" wcet="0" queue_size="1">
+</Provided_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="SDL"/>
+    </Implementations>
+</Function>
+
+<Connection id="{b0e235f5-2ba1-47a1-abfe-e0cb228a1545}" name="Function_1_do_smth____Function_2_do_smth" required_system_element="NO">
+    <Source iface_id="{ab166713-8312-475c-aba1-f525ec5c820e}" func_name="Function_1" ri_name="do_smth" />
+    <Target iface_id="{cdef6ab0-7130-45d5-91e4-76f84eb245e1}" func_name="Function_2" pi_name="do_smth" />
+</Connection>
+
+<Comment id="{93e3be3f-e5b2-46b7-8ac6-98faccdb2f1d}" name="Welcome to TASTE!\n============\n\nRight click to add a function, and use Ctrl-Click to connect functions together.\n\nYou can split the screen in multiple windows using Ctrl-E-3" required_system_element="NO">
+</Comment>
+
+<Layer name="default" is_visible="true"/>
+
+</InterfaceView>
\ No newline at end of file
diff --git a/templateprocessor/cli.py b/templateprocessor/cli.py
index 0c43c53..ea945e9 100644
--- a/templateprocessor/cli.py
+++ b/templateprocessor/cli.py
@@ -25,7 +25,10 @@ def parse_arguments() -> argparse.Namespace:
     )
 
     parser.add_argument(
-        "-i", "--iv", help="Input Interface View", metavar="FILE",
+        "-i",
+        "--iv",
+        help="Input Interface View",
+        metavar="FILE",
     )
 
     parser.add_argument(
diff --git a/templateprocessor/iv.py b/templateprocessor/iv.py
index 6b486d4..e67865f 100644
--- a/templateprocessor/iv.py
+++ b/templateprocessor/iv.py
@@ -92,6 +92,7 @@ class FunctionInterface:
     input_parameters: List[InputParameter] = field(default_factory=list)
     output_parameters: List[OutputParameter] = field(default_factory=list)
     properties: List[Property] = field(default_factory=list)
+    requirement_ids: List[str] = field(default_factory=list)
 
 
 @dataclass
@@ -138,6 +139,7 @@ class Function:
     properties: List[Property] = field(default_factory=list)
     nested_functions: List["Function"] = field(default_factory=list)
     nested_connections: List["Connection"] = field(default_factory=list)
+    requirement_ids: List[str] = field(default_factory=list)
 
 
 @dataclass
diff --git a/templateprocessor/ivreader.py b/templateprocessor/ivreader.py
index 493cda7..3557eec 100644
--- a/templateprocessor/ivreader.py
+++ b/templateprocessor/ivreader.py
@@ -134,6 +134,7 @@ def _parse_function(self, elem: ET.Element) -> Function:
                 if elem.get("type_language")
                 else None
             ),
+            requirement_ids=elem.get("requirement_ids", "").split(","),
         )
 
         # Parse properties
@@ -192,6 +193,7 @@ def _parse_interface(self, elem: ET.Element) -> FunctionInterface:
                 else None
             ),
             priority=int(elem.get("priority")) if elem.get("priority") else None,
+            requirement_ids=elem.get("requirement_ids", "").split(","),
         )
 
         # Parse input parameters
diff --git a/tests/test_ivreader.py b/tests/test_ivreader.py
index 4377a16..dd33d4d 100644
--- a/tests/test_ivreader.py
+++ b/tests/test_ivreader.py
@@ -249,3 +249,33 @@ def test_read_string(self):
         assert len(iv.functions) == 1
         assert iv.functions[0].name == "test_func"
         assert len(iv.layers) == 1
+
+    def test_read_requirements(self):
+        """Test parsing interface with requirement IDs."""
+        # Prepare
+        reader = IVReader()
+        iv_file = self.get_test_data_file("requirements.iv.xml")
+        assert iv_file.exists()
+
+        # Read
+        iv = reader.read(iv_file)
+
+        # Find Function_1 function
+        function1 = next((f for f in iv.functions if f.name == "Function_1"), None)
+        assert function1 is not None
+
+        assert len(function1.requirement_ids) == 2
+        assert "r1" in function1.requirement_ids
+        assert "r2" in function1.requirement_ids
+
+        # Find Function_2 function
+        function2 = next((f for f in iv.functions if f.name == "Function_2"), None)
+        assert function2 is not None
+
+        # Find do_smth interface
+        do_smth = next(
+            (pi for pi in function2.provided_interfaces if pi.name == "do_smth"), None
+        )
+        assert do_smth is not None
+        assert len(do_smth.requirement_ids) == 1
+        assert "r5" in do_smth.requirement_ids

From aa3f4c9ffab39509afaaee065fe9a8243cb48680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Mon, 8 Dec 2025 14:24:32 +0100
Subject: [PATCH 05/28] Ignore output of examples

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index b7faf40..4aef921 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# Output in examples
+examples/output/
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[codz]

From d271cc81a3503b0767d45f276ee0de14a9fe2038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Mon, 8 Dec 2025 14:57:01 +0100
Subject: [PATCH 06/28] Added example of generating traces

---
 examples/generate_traces_list.sh |  4 ++
 examples/requirements.tmplt      | 69 ++++++++++++++++++++++++++++++++
 templateprocessor/cli.py         | 44 ++++++++++----------
 3 files changed, 96 insertions(+), 21 deletions(-)
 create mode 100755 examples/generate_traces_list.sh
 create mode 100644 examples/requirements.tmplt

diff --git a/examples/generate_traces_list.sh b/examples/generate_traces_list.sh
new file mode 100755
index 0000000..eac76be
--- /dev/null
+++ b/examples/generate_traces_list.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+mkdir -p output
+template-processor --verbosity info --iv ../data/requirements.iv.xml -o output -t requirements.tmplt
+pandoc --pdf-engine=pdfroff --output=output/requirements.pdf output/requirements.md
\ No newline at end of file
diff --git a/examples/requirements.tmplt b/examples/requirements.tmplt
new file mode 100644
index 0000000..fc90a2b
--- /dev/null
+++ b/examples/requirements.tmplt
@@ -0,0 +1,69 @@
+<%
+# Build requirement ID to component mapping
+req_to_comp = {}
+for func in interface_view.functions:
+    # Add function-level requirements
+    for req_id in func.requirement_ids:
+        if req_id not in req_to_comp:
+            req_to_comp[req_id] = []
+        req_to_comp[req_id].append((func.name, None))
+    
+    # Add provided interface requirements
+    for pi in func.provided_interfaces:
+        for req_id in pi.requirement_ids:
+            if req_id not in req_to_comp:
+                req_to_comp[req_id] = []
+            req_to_comp[req_id].append((func.name, f"{pi.name} (PI)"))
+    
+    # Add required interface requirements
+    for ri in func.required_interfaces:
+        for req_id in ri.requirement_ids:
+            if req_id not in req_to_comp:
+                req_to_comp[req_id] = []
+            req_to_comp[req_id].append((func.name, f"{ri.name} (RI)"))
+
+# Sort by requirement ID
+sorted_req_ids = sorted(req_to_comp.keys())
+%>
+
+## Forward trace ##
+
+### Requirement to Component Traces
+
+| Requirement ID | Component | Interface |
+|----------------|----------------------|-----------|
+% for req_id in sorted_req_ids:
+<%
+if not req_id:
+    continue
+%> \
+% for comp_name, iface_name in req_to_comp[req_id]: 
+<% 
+iface_display = iface_name if iface_name else "-"
+%> \
+| ${req_id or "-"} | ${comp_name} | ${iface_display} |
+% endfor
+% endfor
+
+## Backward trace ##
+
+### Component to Requirement Traces
+
+| Component | Interface | Requirement IDs |
+|----------------------|-----------|-----------------|
+% for func in interface_view.functions:
+<%
+    # Collect function-level requirements
+    func_reqs = ', '.join(sorted(func.requirement_ids)) if func.requirement_ids else "-"
+%>| ${func.name} | - | ${func_reqs} |
+% for pi in func.provided_interfaces:
+<%
+    pi_reqs = ', '.join(sorted(pi.requirement_ids)) if pi.requirement_ids else "-"
+%>| ${func.name} | ${pi.name} (PI) | ${pi_reqs} |
+% endfor
+% for ri in func.required_interfaces:
+<%
+    ri_reqs = ', '.join(sorted(ri.requirement_ids)) if ri.requirement_ids else "-"
+%>| ${func.name} | ${ri.name} (RI) | ${ri_reqs} |
+% endfor
+% endfor
\ No newline at end of file
diff --git a/templateprocessor/cli.py b/templateprocessor/cli.py
index ea945e9..fadb10b 100644
--- a/templateprocessor/cli.py
+++ b/templateprocessor/cli.py
@@ -100,30 +100,32 @@ def main():
     logging.info(f"Reading Interface View from {args.iv}")
     iv = IVReader().read(args.iv) if args.iv else InterfaceView()
     sots = {}
-    so_reader = SOReader()
-    for sot_file in args.sos:
-        logging.info(f"Reading System Objects from {sot_file}")
-        name = Path(sot_file).stem
-        logging.debug(f"-SOT name: {name}")
-        sos = so_reader.read(sot_file)
-        sots[name] = sos
+    if args.sos:
+        so_reader = SOReader()
+        for sot_file in args.sos:
+            logging.info(f"Reading System Objects from {sot_file}")
+            name = Path(sot_file).stem
+            logging.debug(f"-SOT name: {name}")
+            sos = so_reader.read(sot_file)
+            sots[name] = sos
 
     instantiator = TemplateInstantiator(iv, sots)
 
-    for template_file in args.template:
-        logging.info(f"Processing template {template_file}")
-        name = Path(template_file).stem
-        logging.debug(f"Base name: {name}")
-        logging.debug(f"Reading template {template_file}")
-        with open(template_file, "r") as f:
-            template = f.read()
-        logging.debug(f"Instantiating template:\n {template}")
-        instantiated_template = instantiator.instantiate(template, "")
-        logging.debug(f"Instantiation:\n {instantiated_template}")
-        output = Path(args.output) / f"{name}.md"
-        logging.debug(f"Saving to {output}")
-        with open(output, "w") as f:
-            f.write(instantiated_template)
+    if args.template:
+        for template_file in args.template:
+            logging.info(f"Processing template {template_file}")
+            name = Path(template_file).stem
+            logging.debug(f"Base name: {name}")
+            logging.debug(f"Reading template {template_file}")
+            with open(template_file, "r") as f:
+                template = f.read()
+            logging.debug(f"Instantiating template:\n {template}")
+            instantiated_template = instantiator.instantiate(template, "")
+            logging.debug(f"Instantiation:\n {instantiated_template}")
+            output = Path(args.output) / f"{name}.md"
+            logging.debug(f"Saving to {output}")
+            with open(output, "w") as f:
+                f.write(instantiated_template)
 
     return 0
 

From 4de0a3f5d87f194ce9f6b942941e82929a7257af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Mon, 8 Dec 2025 15:55:33 +0100
Subject: [PATCH 07/28] Improved trace example

---
 examples/requirements.tmplt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/requirements.tmplt b/examples/requirements.tmplt
index fc90a2b..d51881a 100644
--- a/examples/requirements.tmplt
+++ b/examples/requirements.tmplt
@@ -26,9 +26,9 @@ for func in interface_view.functions:
 sorted_req_ids = sorted(req_to_comp.keys())
 %>
 
-## Forward trace ##
+${'##'} Forward trace ${'##'}
 
-### Requirement to Component Traces
+${'###'} Requirement to Component Traces
 
 | Requirement ID | Component | Interface |
 |----------------|----------------------|-----------|
@@ -45,9 +45,9 @@ iface_display = iface_name if iface_name else "-"
 % endfor
 % endfor
 
-## Backward trace ##
+${'##'} Backward trace ${'##'}
 
-### Component to Requirement Traces
+${'###'} Component to Requirement Traces
 
 | Component | Interface | Requirement IDs |
 |----------------------|-----------|-----------------|

From f5ef5f87bdf14713917c10b4f8b4e439d69b84e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Mon, 8 Dec 2025 15:55:56 +0100
Subject: [PATCH 08/28] Added placeholders for the templates

---
 .../ecss-e-st-40c_4_1_software_static_architecture.tmplt         | 1 +
 .../ecss-e-st-40c_4_2_software_dynamic_architecture.tmplt        | 1 +
 data/ecss-template/ecss-e-st-40c_4_4_interfaces_context.tmplt    | 0
 data/ecss-template/ecss-e-st-40c_5_1_software_design.tmplt       | 0
 data/ecss-template/ecss-e-st-40c_5_2_overall_architecture.tmplt  | 0
 .../ecss-e-st-40c_5_3_software_copmponents_design.tmplt          | 0
 .../ecss-e-st-40c_5_4_aspects_of_each_component.tmplt            | 1 +
 .../ecss-e-st-40c_5_5_internal_interface_design.tmplt            | 1 +
 .../ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt | 1 +
 9 files changed, 5 insertions(+)
 create mode 100644 data/ecss-template/ecss-e-st-40c_4_1_software_static_architecture.tmplt
 create mode 100644 data/ecss-template/ecss-e-st-40c_4_2_software_dynamic_architecture.tmplt
 create mode 100644 data/ecss-template/ecss-e-st-40c_4_4_interfaces_context.tmplt
 create mode 100644 data/ecss-template/ecss-e-st-40c_5_1_software_design.tmplt
 create mode 100644 data/ecss-template/ecss-e-st-40c_5_2_overall_architecture.tmplt
 create mode 100644 data/ecss-template/ecss-e-st-40c_5_3_software_copmponents_design.tmplt
 create mode 100644 data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
 create mode 100644 data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
 create mode 100644 data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt

diff --git a/data/ecss-template/ecss-e-st-40c_4_1_software_static_architecture.tmplt b/data/ecss-template/ecss-e-st-40c_4_1_software_static_architecture.tmplt
new file mode 100644
index 0000000..1ec43e0
--- /dev/null
+++ b/data/ecss-template/ecss-e-st-40c_4_1_software_static_architecture.tmplt
@@ -0,0 +1 @@
+TODO architecture of the software item, including relationship between its major components
\ No newline at end of file
diff --git a/data/ecss-template/ecss-e-st-40c_4_2_software_dynamic_architecture.tmplt b/data/ecss-template/ecss-e-st-40c_4_2_software_dynamic_architecture.tmplt
new file mode 100644
index 0000000..41e7ba6
--- /dev/null
+++ b/data/ecss-template/ecss-e-st-40c_4_2_software_dynamic_architecture.tmplt
@@ -0,0 +1 @@
+TODO real-time constraints
\ No newline at end of file
diff --git a/data/ecss-template/ecss-e-st-40c_4_4_interfaces_context.tmplt b/data/ecss-template/ecss-e-st-40c_4_4_interfaces_context.tmplt
new file mode 100644
index 0000000..e69de29
diff --git a/data/ecss-template/ecss-e-st-40c_5_1_software_design.tmplt b/data/ecss-template/ecss-e-st-40c_5_1_software_design.tmplt
new file mode 100644
index 0000000..e69de29
diff --git a/data/ecss-template/ecss-e-st-40c_5_2_overall_architecture.tmplt b/data/ecss-template/ecss-e-st-40c_5_2_overall_architecture.tmplt
new file mode 100644
index 0000000..e69de29
diff --git a/data/ecss-template/ecss-e-st-40c_5_3_software_copmponents_design.tmplt b/data/ecss-template/ecss-e-st-40c_5_3_software_copmponents_design.tmplt
new file mode 100644
index 0000000..e69de29
diff --git a/data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt b/data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
new file mode 100644
index 0000000..c316449
--- /dev/null
+++ b/data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
@@ -0,0 +1 @@
+TODO detailed description of each component
\ No newline at end of file
diff --git a/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt b/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
new file mode 100644
index 0000000..e89bed5
--- /dev/null
+++ b/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
@@ -0,0 +1 @@
+TODO internal interfaces, including data
\ No newline at end of file
diff --git a/data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt b/data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
new file mode 100644
index 0000000..797287b
--- /dev/null
+++ b/data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
@@ -0,0 +1 @@
+TODO forward and backward traceability
\ No newline at end of file

From 384b7ca0907b1947772edecc3d7594334da016f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Mon, 8 Dec 2025 17:47:27 +0100
Subject: [PATCH 09/28] Added DV example

---
 examples/dv.tmplt                         | 20 ++++++++++++++++++++
 examples/generate_dv.sh                   |  4 ++++
 templateprocessor/cli.py                  | 14 +++++++++++++-
 templateprocessor/templateinstantiator.py |  5 +++++
 4 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 examples/dv.tmplt
 create mode 100755 examples/generate_dv.sh

diff --git a/examples/dv.tmplt b/examples/dv.tmplt
new file mode 100644
index 0000000..fe01d50
--- /dev/null
+++ b/examples/dv.tmplt
@@ -0,0 +1,20 @@
+${"#"} Deployment View
+% for node in deployment_view.nodes:
+% for partition in node.partitions:
+
+${"##"} ${partition.name}:
+% for func in partition.functions:
+- ${func.name}
+% endfor 
+% endfor
+% endfor
+
+${"##"} Connections:
+
+% for connection in deployment_view.connections:
+${connection.from_node} <-> ${connection.to_node}
+% for message in connection.messages:
+
+- ${message.from_function}.${message.from_interface} -> ${message.to_function}.${message.to_interface}
+% endfor
+% endfor
diff --git a/examples/generate_dv.sh b/examples/generate_dv.sh
new file mode 100755
index 0000000..f61098d
--- /dev/null
+++ b/examples/generate_dv.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+mkdir -p output
+template-processor --verbosity info --dv ../data/deploymentview.dv.xml -o output -t dv.tmplt
+pandoc --pdf-engine=pdfroff --output=output/dv.pdf output/dv.md
\ No newline at end of file
diff --git a/templateprocessor/cli.py b/templateprocessor/cli.py
index fadb10b..45d2ffa 100644
--- a/templateprocessor/cli.py
+++ b/templateprocessor/cli.py
@@ -9,9 +9,11 @@
 import sys
 from templateprocessor import __version__
 from templateprocessor.iv import InterfaceView
+from templateprocessor.dv import DeploymentView
 from templateprocessor.templateinstantiator import TemplateInstantiator
 from templateprocessor.ivreader import IVReader
 from templateprocessor.soreader import SOReader
+from templateprocessor.dvreader import DVReader
 
 
 def parse_arguments() -> argparse.Namespace:
@@ -31,6 +33,13 @@ def parse_arguments() -> argparse.Namespace:
         metavar="FILE",
     )
 
+    parser.add_argument(
+        "-d",
+        "--dv",
+        help="Input Deployment View",
+        metavar="FILE",
+    )
+
     parser.add_argument(
         "-s",
         "--sos",
@@ -93,12 +102,15 @@ def main():
 
     logging.info("Template Processor")
     logging.debug(f"Interface View: {args.iv}")
+    logging.debug(f"Deployment View: {args.dv}")
     logging.debug(f"System Objects: {args.sos}")
     logging.debug(f"Templates: {args.template}")
     logging.debug(f"Output Directory: {args.output}")
 
     logging.info(f"Reading Interface View from {args.iv}")
     iv = IVReader().read(args.iv) if args.iv else InterfaceView()
+    logging.info(f"Reading Deployment View from {args.dv}")
+    dv = DVReader().read(args.dv) if args.dv else DeploymentView()
     sots = {}
     if args.sos:
         so_reader = SOReader()
@@ -109,7 +121,7 @@ def main():
             sos = so_reader.read(sot_file)
             sots[name] = sos
 
-    instantiator = TemplateInstantiator(iv, sots)
+    instantiator = TemplateInstantiator(iv, dv, sots)
 
     if args.template:
         for template_file in args.template:
diff --git a/templateprocessor/templateinstantiator.py b/templateprocessor/templateinstantiator.py
index 8883eb9..60bfb9f 100644
--- a/templateprocessor/templateinstantiator.py
+++ b/templateprocessor/templateinstantiator.py
@@ -5,6 +5,7 @@
 """
 
 from templateprocessor.iv import InterfaceView
+from templateprocessor.dv import DeploymentView
 from templateprocessor.so import SystemObjectType, SystemObject
 from typing import List, Dict
 from mako.template import Template
@@ -17,14 +18,17 @@ class TemplateInstantiator:
 
     system_object_types: Dict[str, SystemObjectType] = dict()
     interface_view: InterfaceView
+    deployment_view: DeploymentView
 
     def __init__(
         self,
         interface_view: InterfaceView,
+        deployment_view: DeploymentView,
         system_object_types: Dict[str, SystemObjectType],
     ):
         self.system_object_types = system_object_types
         self.interface_view = interface_view
+        self.deployment_view = deployment_view
 
     def instantiate(self, template: str, context_directory: str) -> str:
         mako_template = Template(text=template, module_directory=context_directory)
@@ -32,6 +36,7 @@ def instantiate(self, template: str, context_directory: str) -> str:
         context = {
             "system_object_types": self.system_object_types,
             "interface_view": self.interface_view,
+            "deployment_view": self.deployment_view,
         }
 
         instantiated_text = str(mako_template.render(**context))

From 59166c0d55a89c98bda909a8c4f51715a35adbf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Mon, 8 Dec 2025 18:19:58 +0100
Subject: [PATCH 10/28] Added ECSS-like requirement trace matrices

---
 ...-e-st-40c_6_requirement_traceability.tmplt | 48 ++++++++++++++++++-
 examples/generate_ecss_demo.sh                |  4 ++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100755 examples/generate_ecss_demo.sh

diff --git a/data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt b/data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
index 797287b..6d63c33 100644
--- a/data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
+++ b/data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
@@ -1 +1,47 @@
-TODO forward and backward traceability
\ No newline at end of file
+<%
+## Data Initialization
+# Get all functions
+
+funcs = []
+def get_function_children(func):
+    result = []
+    if func.nested_functions:
+        for nested in func.nested_functions:
+            result.append(nested)
+            result.extend(get_function_children(nested))
+    return result
+
+for func in interface_view.functions:
+    funcs.append(func)
+    funcs.extend(get_function_children(func))
+
+# Get all requirements
+req_map = {}
+for func in funcs:
+    for req_id in func.requirement_ids:
+        if not req_id in req_map:
+            req_map[req_id] = []
+        req_map[req_id].append(func)
+
+req_ids = sorted(req_map.keys()) # This can be sourced from an external (e.g., JSON) file, if needed
+%>
+
+${"#"} Forward traceability matrix
+
+| Requirement ID | Components |
+| - | - |
+% for id in req_ids:
+<% 
+if not id:
+    continue
+%> \
+| ${id} | ${",".join([func.name for func in req_map[id]])} |
+% endfor
+
+${"#"} Backward traceability matrix
+
+| Component | Requirement IDs |
+| - | - |
+% for func in funcs:
+| ${func.name} | ${",".join(func.requirement_ids)} |
+% endfor
diff --git a/examples/generate_ecss_demo.sh b/examples/generate_ecss_demo.sh
new file mode 100755
index 0000000..e130807
--- /dev/null
+++ b/examples/generate_ecss_demo.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+mkdir -p output
+template-processor --verbosity info --iv ../data/requirements.iv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
+pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_6_requirement_traceability.pdf output/ecss-e-st-40c_6_requirement_traceability.md

From 01a440d0c71176e1d2259a89125216257b6dc05a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Mon, 8 Dec 2025 18:49:11 +0100
Subject: [PATCH 11/28] Aspects of each component POC

---
 ...st-40c_5_4_aspects_of_each_component.tmplt | 62 ++++++++++++++++++-
 examples/generate_ecss_demo.sh                |  2 +
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt b/data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
index c316449..04da6d9 100644
--- a/data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
+++ b/data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
@@ -1 +1,61 @@
-TODO detailed description of each component
\ No newline at end of file
+<%
+## Data Initialization
+# Get all functions
+
+funcs = []
+def get_function_children(func):
+    result = []
+    if func.nested_functions:
+        for nested in func.nested_functions:
+            result.append(nested)
+            result.extend(get_function_children(nested))
+    return result
+
+for func in interface_view.functions:
+    funcs.append(func)
+    funcs.extend(get_function_children(func))
+
+funcs.sort(key=lambda f: f.name.lower())
+
+%>
+
+The below chapters summarize aspects of each component.
+
+% for func in funcs:
+
+${"#"} ${func.name}
+
+Component Identifier: ${func.name}
+
+Type: TASTE Function
+
+Purpose: N/A
+
+Subordinates: ${",".join([child.name for child in func.nested_functions])}
+
+Dependencies: N/A
+
+Required Interfaces:
+
+% for ri in func.required_interfaces:
+
+- [${str(ri.kind.value).lower()}] ${ri.name}
+% endfor
+
+Provided Interfaces:
+% for pi in func.provided_interfaces:
+
+- [${str(pi.kind.value).lower()}] ${pi.name}
+% endfor
+
+Resources: N/A
+
+References: N/A
+
+Data: N/A
+
+Backward Requirement Trace: ${", ".join(func.requirement_ids) }
+
+Forward Requirement Trace: Described in Chapter 6
+
+% endfor
diff --git a/examples/generate_ecss_demo.sh b/examples/generate_ecss_demo.sh
index e130807..b168264 100755
--- a/examples/generate_ecss_demo.sh
+++ b/examples/generate_ecss_demo.sh
@@ -2,3 +2,5 @@
 mkdir -p output
 template-processor --verbosity info --iv ../data/requirements.iv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_6_requirement_traceability.pdf output/ecss-e-st-40c_6_requirement_traceability.md
+template-processor --verbosity info --iv ../data/simple.iv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
+pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_4_aspects_of_each_component.pdf output/ecss-e-st-40c_5_4_aspects_of_each_component.md

From dd826ce1c6eac16137ef99efe4051846da2ffa3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Tue, 9 Dec 2025 15:29:24 +0100
Subject: [PATCH 12/28] Updated template instantiation tests with DV

---
 tests/test_templateinstantiator.py | 295 ++++++++++++++++++++++++++++-
 1 file changed, 287 insertions(+), 8 deletions(-)

diff --git a/tests/test_templateinstantiator.py b/tests/test_templateinstantiator.py
index d25c572..b82d0ec 100644
--- a/tests/test_templateinstantiator.py
+++ b/tests/test_templateinstantiator.py
@@ -19,6 +19,15 @@
     Encoding,
 )
 from templateprocessor.so import SystemObjectType, SystemObject
+from templateprocessor.dv import (
+    DeploymentView,
+    Node,
+    Partition,
+    DeploymentFunction,
+    Device,
+    Connection,
+    Message,
+)
 
 
 class TestTemplateInstantiator:
@@ -95,12 +104,117 @@ def create_sample_system_object_types() -> Dict[str, SystemObjectType]:
 
         return sots
 
+    @staticmethod
+    def create_sample_deployment_view() -> DeploymentView:
+        """Create a sample DeploymentView for testing."""
+        dv = DeploymentView(
+            version="1.2",
+            ui_file="test_deployment.ui.xml",
+            creator_hash="test_creator",
+            modifier_hash="test_modifier",
+        )
+
+        # Create first node (x86 Linux)
+        node1 = Node(
+            id="n1",
+            name="x86 Linux C++_1",
+            type="ocarina_processors_x86::x86.generic_linux",
+            node_label="Node_1",
+            namespace="ocarina_processors_x86",
+            requirement_ids=["r20", "r21"],
+        )
+
+        # Add partition to node1
+        partition1 = Partition(
+            id="p1",
+            name="test_partition_1",
+        )
+
+        # Add functions to partition
+        func1 = DeploymentFunction(
+            id="f1",
+            name="TestFunction",
+            path="/test/path/function1",
+        )
+        partition1.functions.append(func1)
+        node1.partitions.append(partition1)
+
+        # Add device to node1
+        device1 = Device(
+            id="d1",
+            name="uart0",
+            requires_bus_access="UART",
+            port="uart0",
+            asn1file="test.asn",
+            asn1type="TestType",
+            asn1module="TestModule",
+            namespace="test_namespace",
+            extends="BaseDevice",
+            impl_extends="BaseImpl",
+            bus_namespace="uart_namespace",
+        )
+        node1.devices.append(device1)
+
+        # Create second node (ARM RTEMS)
+        node2 = Node(
+            id="n2",
+            name="SAM V71 RTEMS N7S_1",
+            type="ocarina_processors_arm::samv71.rtems",
+            node_label="Node_2",
+            namespace="ocarina_processors_arm",
+        )
+
+        # Add partition to node2
+        partition2 = Partition(
+            id="p2",
+            name="test_partition_2",
+        )
+
+        func2 = DeploymentFunction(
+            id="f2",
+            name="SensorFunction",
+            path="/test/path/function2",
+        )
+        partition2.functions.append(func2)
+        node2.partitions.append(partition2)
+
+        # Add nodes to deployment view
+        dv.nodes.append(node1)
+        dv.nodes.append(node2)
+
+        # Create connection between nodes
+        connection = Connection(
+            id="c1",
+            name="UartLink",
+            from_node="n1",
+            from_port="uart0",
+            to_bus="UART",
+            to_node="n2",
+            to_port="uart0",
+        )
+
+        # Add messages to connection
+        msg1 = Message(
+            id="m1",
+            name="DataMessage",
+            from_function="TestFunction",
+            from_interface="test_pi",
+            to_function="SensorFunction",
+            to_interface="sensor_ri",
+        )
+        connection.messages.append(msg1)
+
+        dv.connections.append(connection)
+
+        return dv
+
     def test_instantiator_initialization(self):
         """Test TemplateInstantiator initialization."""
         iv = self.create_sample_interface_view()
+        dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
 
-        instantiator = TemplateInstantiator(iv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types)
 
         assert instantiator.interface_view == iv
         assert instantiator.system_object_types == so_types
@@ -109,8 +223,9 @@ def test_instantiator_initialization(self):
     def test_instantiate_simple_template(self):
         """Test instantiating a simple template."""
         iv = self.create_sample_interface_view()
+        dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types)
 
         template = "Hello World!"
 
@@ -122,8 +237,9 @@ def test_instantiate_simple_template(self):
     def test_instantiate_template_with_interface_view(self):
         """Test instantiating a template that uses Interface View."""
         iv = self.create_sample_interface_view()
+        dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types)
 
         template = """Interface View version: ${interface_view.version}
 ASN1 file: ${interface_view.asn1file}
@@ -139,8 +255,9 @@ def test_instantiate_template_with_interface_view(self):
     def test_instantiate_template_with_function_details(self):
         """Test instantiating a template that accesses Function details."""
         iv = self.create_sample_interface_view()
+        dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types)
 
         template = """% for func in interface_view.functions:
 Function: ${func.name}
@@ -160,8 +277,9 @@ def test_instantiate_template_with_function_details(self):
     def test_instantiate_template_with_system_object_types(self):
         """Test instantiating a template that uses System Object Types."""
         iv = self.create_sample_interface_view()
+        dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types)
 
         template = """Number of System Object Types: ${len(system_object_types)}
 % for name, so_type in system_object_types.items():
@@ -180,8 +298,9 @@ def test_instantiate_template_with_system_object_types(self):
     def test_instantiate_template_with_system_object_instances(self):
         """Test instantiating a template that accesses System Object Type instances."""
         iv = self.create_sample_interface_view()
+        dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types)
 
         template = """% for name, so_type in system_object_types.items():
 [${name}]
@@ -208,10 +327,11 @@ def test_instantiate_template_with_system_object_instances(self):
     def test_instantiate_template_with_empty_data(self):
         """Test instantiating a template with empty Interface View and no System Objects."""
         iv = InterfaceView(version="1.0", asn1file="", uiFile="", modifierHash="")
+        dv = self.create_sample_deployment_view()
 
         so_types = {}
 
-        instantiator = TemplateInstantiator(iv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types)
 
         template = """Version: ${interface_view.version}
 Functions: ${len(interface_view.functions)}
@@ -227,8 +347,9 @@ def test_instantiate_template_with_empty_data(self):
     def test_instantiate_template_with_python_expressions(self):
         """Test instantiating a template with Python expressions."""
         iv = self.create_sample_interface_view()
+        dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types)
 
         template = """<%
 total_interfaces = sum(len(f.provided_interfaces) + len(f.required_interfaces) for f in interface_view.functions)
@@ -242,3 +363,161 @@ def test_instantiate_template_with_python_expressions(self):
 
         assert "Total Interfaces: 2" in result
         assert "Total System Object Instances: 4" in result
+
+    def test_instantiate_template_with_deployment_view(self):
+        """Test instantiating a template that uses Deployment View."""
+        iv = self.create_sample_interface_view()
+        dv = self.create_sample_deployment_view()
+        so_types = self.create_sample_system_object_types()
+        instantiator = TemplateInstantiator(iv, dv, so_types)
+
+        template = """Deployment View version: ${deployment_view.version}
+UI file: ${deployment_view.ui_file}
+Number of nodes: ${len(deployment_view.nodes)}
+Number of connections: ${len(deployment_view.connections)}"""
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            result = instantiator.instantiate(template, tmpdir)
+
+        assert "Deployment View version: 1.2" in result
+        assert "UI file: test_deployment.ui.xml" in result
+        assert "Number of nodes: 2" in result
+        assert "Number of connections: 1" in result
+
+    def test_instantiate_template_with_deployment_nodes(self):
+        """Test instantiating a template that accesses Deployment View nodes."""
+        iv = self.create_sample_interface_view()
+        dv = self.create_sample_deployment_view()
+        so_types = self.create_sample_system_object_types()
+        instantiator = TemplateInstantiator(iv, dv, so_types)
+
+        template = """% for node in deployment_view.nodes:
+Node: ${node.name}
+Type: ${node.type}
+Label: ${node.node_label}
+Namespace: ${node.namespace}
+Partitions: ${len(node.partitions)}
+Devices: ${len(node.devices)}
+% endfor"""
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            result = instantiator.instantiate(template, tmpdir)
+
+        assert "Node: x86 Linux C++_1" in result
+        assert "Type: ocarina_processors_x86::x86.generic_linux" in result
+        assert "Node: SAM V71 RTEMS N7S_1" in result
+        assert "Type: ocarina_processors_arm::samv71.rtems" in result
+        assert "Partitions: 1" in result
+        assert "Devices: 1" in result
+
+    def test_instantiate_template_with_partitions_and_functions(self):
+        """Test instantiating a template that accesses partitions and deployed functions."""
+        iv = self.create_sample_interface_view()
+        dv = self.create_sample_deployment_view()
+        so_types = self.create_sample_system_object_types()
+        instantiator = TemplateInstantiator(iv, dv, so_types)
+
+        template = """% for node in deployment_view.nodes:
+${node.name}
+% for partition in node.partitions:
+Partition: ${partition.name}
+% for func in partition.functions:
+- Function: ${func.name} (${func.id})
+  Path: ${func.path}
+% endfor
+% endfor
+% endfor"""
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            result = instantiator.instantiate(template, tmpdir)
+
+        assert "x86 Linux C++_1" in result
+        assert "Partition: test_partition_1" in result
+        assert "- Function: TestFunction (f1)" in result
+        assert "Path: /test/path/function1" in result
+        assert "SAM V71 RTEMS N7S_1" in result
+        assert "Partition: test_partition_2" in result
+        assert "- Function: SensorFunction (f2)" in result
+        assert "Path: /test/path/function2" in result
+
+    def test_instantiate_template_with_devices(self):
+        """Test instantiating a template that accesses node devices."""
+        iv = self.create_sample_interface_view()
+        dv = self.create_sample_deployment_view()
+        so_types = self.create_sample_system_object_types()
+        instantiator = TemplateInstantiator(iv, dv, so_types)
+
+        template = """% for node in deployment_view.nodes:
+% if node.devices:
+Node: ${node.name}
+% for device in node.devices:
+  Device: ${device.name}
+  - Port: ${device.port}
+  - Bus: ${device.requires_bus_access}
+  - ASN1 Type: ${device.asn1type}
+% endfor
+% endif
+% endfor"""
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            result = instantiator.instantiate(template, tmpdir)
+
+        assert "Node: x86 Linux C++_1" in result
+        assert "Device: uart0" in result
+        assert "- Port: uart0" in result
+        assert "- Bus: UART" in result
+        assert "- ASN1 Type: TestType" in result
+
+    def test_instantiate_template_with_connections(self):
+        """Test instantiating a template that accesses connections and messages."""
+        iv = self.create_sample_interface_view()
+        dv = self.create_sample_deployment_view()
+        so_types = self.create_sample_system_object_types()
+        instantiator = TemplateInstantiator(iv, dv, so_types)
+
+        template = """% for conn in deployment_view.connections:
+Connection: ${conn.name}
+  From: ${conn.from_node}:${conn.from_port}
+  To: ${conn.to_node}:${conn.to_port}
+  Bus: ${conn.to_bus}
+  Messages: ${len(conn.messages)}
+% for msg in conn.messages:
+    - ${msg.name}: ${msg.from_function}.${msg.from_interface} -> ${msg.to_function}.${msg.to_interface}
+% endfor
+% endfor"""
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            result = instantiator.instantiate(template, tmpdir)
+
+        assert "Connection: UartLink" in result
+        assert "From: n1:uart0" in result
+        assert "To: n2:uart0" in result
+        assert "Bus: UART" in result
+        assert "Messages: 1" in result
+        assert (
+            "- DataMessage: TestFunction.test_pi -> SensorFunction.sensor_ri" in result
+        )
+
+    def test_instantiate_template_with_node_requirements(self):
+        """Test instantiating a template that accesses node requirement IDs."""
+        iv = self.create_sample_interface_view()
+        dv = self.create_sample_deployment_view()
+        so_types = self.create_sample_system_object_types()
+        instantiator = TemplateInstantiator(iv, dv, so_types)
+
+        template = """% for node in deployment_view.nodes:
+Node: ${node.name}
+% if node.requirement_ids:
+  Requirements: ${', '.join(node.requirement_ids)}
+% else:
+  Requirements: None
+% endif
+% endfor"""
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            result = instantiator.instantiate(template, tmpdir)
+
+        assert "Node: x86 Linux C++_1" in result
+        assert "Requirements: r20, r21" in result
+        assert "Node: SAM V71 RTEMS N7S_1" in result
+        assert "Requirements: None" in result

From 1465314eb3509efe9eed74bd5468bbbbd00c7386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Tue, 9 Dec 2025 18:25:17 +0100
Subject: [PATCH 13/28] Added demo-project

---
 examples/demo-project/.gitignore            |   6 +
 examples/demo-project/Makefile              | 144 +++++
 examples/demo-project/Makefile.modelcheck   |  36 ++
 examples/demo-project/demo-project.acn      |   4 +
 examples/demo-project/demo-project.asn      |  21 +
 examples/demo-project/demo-project.pro      |  18 +
 examples/demo-project/deploymentview.dv.xml |  80 +++
 examples/demo-project/deploymentview.ui.xml |  82 +++
 examples/demo-project/interfaceview.ui.xml  | 218 ++++++++
 examples/demo-project/interfaceview.xml     | 574 ++++++++++++++++++++
 10 files changed, 1183 insertions(+)
 create mode 100644 examples/demo-project/.gitignore
 create mode 100644 examples/demo-project/Makefile
 create mode 100644 examples/demo-project/Makefile.modelcheck
 create mode 100644 examples/demo-project/demo-project.acn
 create mode 100644 examples/demo-project/demo-project.asn
 create mode 100644 examples/demo-project/demo-project.pro
 create mode 100755 examples/demo-project/deploymentview.dv.xml
 create mode 100644 examples/demo-project/deploymentview.ui.xml
 create mode 100644 examples/demo-project/interfaceview.ui.xml
 create mode 100644 examples/demo-project/interfaceview.xml

diff --git a/examples/demo-project/.gitignore b/examples/demo-project/.gitignore
new file mode 100644
index 0000000..30c34ba
--- /dev/null
+++ b/examples/demo-project/.gitignore
@@ -0,0 +1,6 @@
+*.aadl
+*.pro.user
+*.pro.user.*
+.qtc*
+# We don't need the details to compile the project, only ASN.1/ACN, IV and DV are of interest
+work/
\ No newline at end of file
diff --git a/examples/demo-project/Makefile b/examples/demo-project/Makefile
new file mode 100644
index 0000000..c9e6d9b
--- /dev/null
+++ b/examples/demo-project/Makefile
@@ -0,0 +1,144 @@
+KAZOO?=kazoo
+SPACECREATOR?=spacecreator.AppImage
+
+# Here you can specify custom compiler/linker flags, and add folders containing
+# external code you want to compile and link for a specific partition.
+# Use upper case for the partition name:
+#
+# export <PARTITIONNAME>_USER_CFLAGS=...
+# export <PARTITIONNAME>_USER_LDFLAGS=...
+# export <PARTITIONNAME>_EXTERNAL_SOURCE_PATH=...
+#
+# NOTE: this can also be done in the Deployment View directly
+
+# If you need to reset this Makefile to its original state, run:
+# $ taste reset
+
+# Disable the progress bar from taste-update-data-view when building systems
+export NO_PROGRESS_BAR=1
+
+# Get the list of ASN.1 files from Space Creator project file:
+DISTFILES=$(shell qmake demo-project.pro -o /tmp/null 2>&1)
+# Exclude system.asn here as the types inside do not changes - only the values in the PID
+# enumeration change, but this does not affect the content of DataView.aadl
+ASN1_FILES=$(shell find ${DISTFILES} 2>/dev/null | egrep '\.asn$$|\.asn1$$' | grep -v system.asn)
+
+all:	release
+
+include Makefile.modelcheck
+
+release:	work/glue_release
+	rm -rf work/glue_debug
+	rm -rf work/glue_coverage
+	$(MAKE) -C work check_targets
+	$(MAKE) -C work
+
+debug:	work/glue_debug
+	rm -rf work/glue_release
+	rm -rf work/glue_coverage
+	$(MAKE) -C work check_targets
+	$(MAKE) -C work
+
+coverage: work/glue_coverage
+	rm -rf work/glue_release
+	rm -rf work/glue_debug
+	$(MAKE) -C work check_targets
+	$(MAKE) -C work
+
+# To build and run the system type e.g. 'make debug run'
+run:
+	$(MAKE) -C work run
+
+# To run Cheddar/Marzhin for scheduling analysis, type 'make edit_cv'
+edit_cv:
+	$(MAKE) -C work run_cv
+
+# Simulation target (experimental - for systems made of SDL functions only)
+simu:	
+	if [ -f work/glue_debug ] || [ -f work/glue_release ] || [ -f work/glue_coverage ]; then $(MAKE) clean; fi
+	$(MAKE) interfaceview work/glue_simu
+	$(MAKE) -C work
+	$(MAKE) -C work/simulation -f Makefile.Simulation simu
+
+# Simulation and model checking: shortcut to create observer.asn
+observer_dataview:
+	$(MAKE) DataView.aadl
+	$(MAKE) InterfaceView.aadl
+	$(MAKE) interfaceview
+	$(KAZOO) --glue -t SIMU
+	$(MAKE) -C work dataview/dataview-uniq.asn
+	$(MAKE) -C work/build -f Makefile.taste observer.asn
+
+skeletons:
+	$(MAKE) work/skeletons_built
+
+work/skeletons_built:	InterfaceView.aadl DataView.aadl
+	$(KAZOO) --gw -o work
+	$(MAKE) -C work dataview simulink_skeletons
+	touch DataView.aadl # to avoid rebuilds due to new system.asn
+	touch $@
+
+work/glue_simu:	InterfaceView.aadl DataView.aadl
+	$(KAZOO) -t SIMU --glue --gw
+	$(MAKE) -C work dataview
+	touch DataView.aadl
+	touch $@
+
+work/glue_release:	InterfaceView.aadl DeploymentView.aadl DataView.aadl
+	sed -i 's/CoverageEnabled => true/CoverageEnabled => false/g' DeploymentView.aadl || :
+	$(KAZOO) -p --glue --gw -o work
+	touch DataView.aadl
+	touch $@
+
+work/glue_debug:	InterfaceView.aadl DeploymentView.aadl DataView.aadl
+	sed -i 's/CoverageEnabled => true/CoverageEnabled => false/g' DeploymentView.aadl || :
+	$(KAZOO) --debug -p --glue --gw -o work
+	touch DataView.aadl
+	touch $@
+
+work/glue_coverage:	InterfaceView.aadl DeploymentView.aadl DataView.aadl
+	sed -i 's/CoverageEnabled => false/CoverageEnabled => true/g' DeploymentView.aadl || :
+	$(KAZOO) --debug -p --glue --gw -o work
+	touch DataView.aadl
+	touch $@
+
+InterfaceView.aadl:	interfaceview.xml
+	$(SPACECREATOR) --aadlconverter  -o $^ -t $(shell taste-config --prefix)/share/xml2aadl/interfaceview.tmplt -x $@
+
+%: %.dv.xml Default_Deployment.aadl
+	# Build using deployment view $^
+	@# We must update the .aadl only if the dv.xml file has changed (more recent timestamp)
+	if [ $< -nt $@.aadl ]; then 	$(SPACECREATOR) --dvconverter -o $< -t  $(shell taste-config --prefix)/share/dv2aadl/deploymentview.tmplt -x $@.aadl; fi;
+	rsync --checksum $@.aadl DeploymentView.aadl
+
+interfaceview: Default_Deployment.aadl
+	# Build when no deployment view is open - use default
+	rsync --checksum $< DeploymentView.aadl
+
+Default_Deployment.aadl:	interfaceview.xml
+	# Create/update a default deployment view for Linux target, if none other is provided
+	$(SPACECREATOR) --aadlconverter  -o $^ -t $(shell taste-config --prefix)/share/xml2dv/interfaceview.tmplt -x $@ || exit 1
+	rsync --checksum $@ DeploymentView.aadl
+
+DeploymentView.aadl:	Default_Deployment.aadl
+
+DataView.aadl: ${ASN1_FILES}
+	$(info Generating/Updating DataView.aadl)
+	taste-update-data-view $^ work/system.asn
+
+clean:
+	rm -rf work/build work/dataview work/glue_simu
+	rm -f *.aadl  # Interface and Deployment views in AADL are generated
+	rm -f work/glue_release work/glue_debug work/glue_coverage work/skeletons_built
+	find work -type d -name "wrappers" -exec rm -rf {} + || :
+	find work -type d -name "*_GUI" -exec rm -rf {} + || :
+	find work -type d -path "*/QGenC/xmi" -exec rm -rf {} + || :
+	find work -type d -path "*/QGenC/src/.qgeninfo" -exec rm -rf {} + || :
+	find work -type d -path "*/QGenC/src/slprj" -exec rm -rf {} + || :
+	find work -type f -path "*/QGenC/src/built" -exec rm -f {} + || :
+	find work -type f -path "*/QGenC/src/*.slxc" -exec rm -f {} + || :
+	find work -type f -path "*/QGenC/src/*.h" -not -name "simulink_definition_of_types.h" -not -name "*_invoke_ri.h" -exec rm -f {} + || :
+	find work -type f -path "*/QGenC/src/*.c" -exec rm -f {} + || :
+
+.PHONY: clean release debug coverage skeletons simu run simulink_skeletons
+
diff --git a/examples/demo-project/Makefile.modelcheck b/examples/demo-project/Makefile.modelcheck
new file mode 100644
index 0000000..f07a8f9
--- /dev/null
+++ b/examples/demo-project/Makefile.modelcheck
@@ -0,0 +1,36 @@
+model-check: InterfaceView.aadl DeploymentView.aadl DataView.aadl
+	$(KAZOO) -gw --glue -t MOCHECK
+	$(MAKE) -C work model-check
+
+create-obs: work/modelchecking/properties work/modelchecking observer_dataview
+	mkdir -p work/modelchecking/properties/$(NAME)
+	make -C work obs-skeleton NAME=$(NAME)
+
+create-msc: work/modelchecking/properties work/modelchecking observer_dataview
+	mkdir -p work/modelchecking/properties/$(NAME)
+	make -C work msc-skeleton NAME=$(NAME)
+
+create-bsc: work/modelchecking/properties work/modelchecking observer_dataview
+	mkdir -p work/modelchecking/properties/$(NAME)
+	make -C work bsc-skeleton NAME=$(NAME)
+
+work/modelchecking/properties:
+	mkdir -p work/modelchecking/properties
+
+work/modelchecking:
+	mkdir -p work/modelchecking
+
+create-subtype: work/modelchecking/subtypes work/modelchecking
+	find work/ -path work/binaries -prune -o -name subtype_*.asn -exec cat {} \; >  work/modelchecking/subtypes/$(NAME).asn
+
+work/modelchecking/subtypes:
+	mkdir -p work/modelchecking/subtypes
+
+# Native model cheker target (experimental - for systems made of SDL functions only)
+native_modelchecker:
+	if [ -f work/glue_debug ] || [ -f work/glue_release ] || [ -f work/glue_coverage ]; then $(MAKE) clean; fi
+	$(MAKE) interfaceview work/glue_simu
+	$(MAKE) -C work
+	$(MAKE) -C work/simulation -f Makefile.Simulation modelcheck
+	cd work/simulation && ./modelcheck
+
diff --git a/examples/demo-project/demo-project.acn b/examples/demo-project/demo-project.acn
new file mode 100644
index 0000000..b87156b
--- /dev/null
+++ b/examples/demo-project/demo-project.acn
@@ -0,0 +1,4 @@
+DEMO-PROJECT-DATAVIEW DEFINITIONS ::= BEGIN
+
+END
+
diff --git a/examples/demo-project/demo-project.asn b/examples/demo-project/demo-project.asn
new file mode 100644
index 0000000..83057fa
--- /dev/null
+++ b/examples/demo-project/demo-project.asn
@@ -0,0 +1,21 @@
+DEMO-PROJECT-DATAVIEW DEFINITIONS ::=
+BEGIN
+
+   MyInteger ::= INTEGER (0 .. 10000)
+
+-- Dummy types with different names for documentation purposes
+
+   TC ::= INTEGER (0..10)
+   TM ::= INTEGER (0..10)
+
+   Request ::= INTEGER (0..10)
+   Response ::= INTEGER (0..10)
+
+   ParameterValue ::= INTEGER (0..10)
+
+   Cmd ::= INTEGER (0..10)
+
+   RawData ::= INTEGER (0..10)
+
+END
+
diff --git a/examples/demo-project/demo-project.pro b/examples/demo-project/demo-project.pro
new file mode 100644
index 0000000..2978d60
--- /dev/null
+++ b/examples/demo-project/demo-project.pro
@@ -0,0 +1,18 @@
+TEMPLATE = lib
+CONFIG -= qt
+CONFIG += generateC
+
+DISTFILES +=  $(HOME)/tool-inst/share/taste-types/taste-types.asn \
+    deploymentview.dv.xml
+DISTFILES += demo-project.msc
+DISTFILES += interfaceview.xml
+DISTFILES += work/binaries/*.msc
+DISTFILES += work/binaries/coverage/index.html
+DISTFILES += work/binaries/filters
+DISTFILES += work/system.asn
+
+DISTFILES += demo-project.asn
+DISTFILES += demo-project.acn
+include(work/taste.pro)
+message($$DISTFILES)
+
diff --git a/examples/demo-project/deploymentview.dv.xml b/examples/demo-project/deploymentview.dv.xml
new file mode 100755
index 0000000..8946e23
--- /dev/null
+++ b/examples/demo-project/deploymentview.dv.xml
@@ -0,0 +1,80 @@
+<DeploymentView version="1.2" UiFile="deploymentview.ui.xml" creatorHash="383508e" modifierHash="383508e">
+    <Node id="{6664b495-bb8b-4e18-a1f6-e6a0ea318565}" name="CAN Node" type="ocarina_processors_x86::x86.generic_linux" node_label="Node_3" namespace="ocarina_processors_x86">
+        <Partition id="{0919a157-97b6-4bfc-8181-96299ee17faf}" name="CANOpen172">
+            <Function id="{4b36c564-328d-4f02-b146-f9349b3fc360}" name="CANOpenSlave" path="CANOpenSlave"/>
+        </Partition>
+        <Device id="{31398d1a-3b94-44aa-84c6-fbf313cf8f46}" name="tcp1" requires_bus_access="ocarina_buses::ip.generic" port="tcp1" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1type="Socket-IP-Conf-T" asn1module="LINUX-SOCKET-IP-DRIVER" extends="ocarina_drivers::ip_socket" impl_extends="ocarina_drivers::ip_socket.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{6d455aa6-cde7-485d-9683-99a84f5dc267}" name="tcp2" requires_bus_access="ocarina_buses::ip.generic" port="tcp2" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1type="Socket-IP-Conf-T" asn1module="LINUX-SOCKET-IP-DRIVER" extends="ocarina_drivers::ip_socket" impl_extends="ocarina_drivers::ip_socket.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{ac454c1a-60d4-42f1-99be-6dde8e0356f1}" name="tcp3" requires_bus_access="ocarina_buses::ip.generic" port="tcp3" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1type="Socket-IP-Conf-T" asn1module="LINUX-SOCKET-IP-DRIVER" extends="ocarina_drivers::ip_socket" impl_extends="ocarina_drivers::ip_socket.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{aef0470b-3b07-4307-a38d-8e1fb9314a2b}" name="tcp4" requires_bus_access="ocarina_buses::ip.generic" port="tcp4" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1type="Socket-IP-Conf-T" asn1module="LINUX-SOCKET-IP-DRIVER" extends="ocarina_drivers::ip_socket" impl_extends="ocarina_drivers::ip_socket.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{184b4b98-9c54-48b9-a7dc-367bff5b5495}" name="udp1" requires_bus_access="ocarina_buses::ip.generic" port="udp1" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1type="Socket-IP-Conf-T" asn1module="LINUX-SOCKET-IP-DRIVER" extends="ocarina_drivers::udp" impl_extends="ocarina_drivers::udp.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{301b1300-55dd-4e1c-9d53-6338e26421e7}" name="udp2" requires_bus_access="ocarina_buses::ip.generic" port="udp2" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1type="Socket-IP-Conf-T" asn1module="LINUX-SOCKET-IP-DRIVER" extends="ocarina_drivers::udp" impl_extends="ocarina_drivers::udp.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{c95d880f-9361-44f7-a2ed-27ffc1f28c90}" name="udp3" requires_bus_access="ocarina_buses::ip.generic" port="udp3" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1type="Socket-IP-Conf-T" asn1module="LINUX-SOCKET-IP-DRIVER" extends="ocarina_drivers::udp" impl_extends="ocarina_drivers::udp.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{1135093a-69c9-455e-af0d-a2f96f1e9cc8}" name="udp4" requires_bus_access="ocarina_buses::ip.generic" port="udp4" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1type="Socket-IP-Conf-T" asn1module="LINUX-SOCKET-IP-DRIVER" extends="ocarina_drivers::udp" impl_extends="ocarina_drivers::udp.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{ea86428a-62d5-47cf-8fc4-d0a145b4d4e1}" name="uart0" requires_bus_access="ocarina_buses::serial.ccsds" port="uart0" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-serial-ccsds-driver.asn" asn1type="Serial-CCSDS-Linux-Conf-T" asn1module="LINUX-SERIAL-CCSDS-DRIVER" extends="ocarina_drivers::serial_ccsds" impl_extends="ocarina_drivers::serial_ccsds.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+    </Node>
+    <Node id="{0296f7af-28c0-4d6b-9931-97afaa8526ce}" name="OBC" type="ocarina_processors_arm::samv71.rtems" node_label="Node_2" namespace="ocarina_processors_arm">
+        <Partition id="{9370f3ae-27c3-4bdf-b8de-8787b03d08e5}" name="ASW">
+            <Function id="{bc643c65-7abc-49cd-aec2-b215fe1ec629}" name="SensorArray" path="SensorArray"/>
+            <Function id="{9dc5aba3-8622-41c8-80ca-e038d885a28d}" name="Transcoder" path="Transcoder"/>
+            <Function id="{130f9b3a-881b-44a6-9c34-f8c2036c19c9}" name="TC_TM_Interface" path="TC_TM_Interface"/>
+            <Function id="{f825af3f-1db6-4c85-bf05-572abe6060b5}" name="CANOpenMaster" path="CANOpenMaster"/>
+            <Function id="{d98faa9a-6991-4665-9bea-bd27058b1cc6}" name="Syncer" path="Syncer"/>
+            <Function id="{8629b700-dfe5-41fd-a436-0445c287bd24}" name="Service_A" path="Service_Frontend::Service_A"/>
+            <Function id="{ad8edb40-97e1-434d-8486-79e9b41eec30}" name="Router" path="Service_Frontend::Router"/>
+            <Function id="{7c62c4a1-1817-47c3-8085-ae2448d1a52f}" name="Service_B" path="Service_Frontend::Service_B"/>
+            <Function id="{6e93fb38-5b66-45fc-ba1c-4a81615f2c58}" name="Actuation" path="Actuation"/>
+            <Function id="{4febfb8b-e185-4119-be43-db800518cce0}" name="DataPool" path="DataPool"/>
+        </Partition>
+        <Device id="{9dc6aa59-8f49-4e35-b140-21d7d4c59e8f}" name="uart0" requires_bus_access="ocarina_buses::serial.ccsds" port="uart0" asn1file="/home/taste/tool-inst/include/TASTE-SAMV71-RTEMS-Drivers/configurations/samv71-rtems-serial-driver.asn" asn1type="Serial-SamV71-Rtems-Conf-T" asn1module="SAMV71-RTEMS-SERIAL-DRIVER" extends="ocarina_drivers::serial_ccsds" impl_extends="ocarina_drivers::serial_ccsds.samv71_rtems" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{fe7c9fc6-0910-4f23-9d2d-ba24e24ecb5b}" name="uart1" requires_bus_access="ocarina_buses::serial.ccsds" port="uart1" asn1file="/home/taste/tool-inst/include/TASTE-SAMV71-RTEMS-Drivers/configurations/samv71-rtems-serial-driver.asn" asn1type="Serial-SamV71-Rtems-Conf-T" asn1module="SAMV71-RTEMS-SERIAL-DRIVER" extends="ocarina_drivers::serial_ccsds" impl_extends="ocarina_drivers::serial_ccsds.samv71_rtems" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{75e25499-1fd0-47cf-b745-ea9cd8dfa19b}" name="uart2" requires_bus_access="ocarina_buses::serial.ccsds" port="uart2" asn1file="/home/taste/tool-inst/include/TASTE-SAMV71-RTEMS-Drivers/configurations/samv71-rtems-serial-driver.asn" asn1type="Serial-SamV71-Rtems-Conf-T" asn1module="SAMV71-RTEMS-SERIAL-DRIVER" extends="ocarina_drivers::serial_ccsds" impl_extends="ocarina_drivers::serial_ccsds.samv71_rtems" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{69ba8116-978f-4f8d-a7a4-3ab50bb59627}" name="uart3" requires_bus_access="ocarina_buses::serial.ccsds" port="uart3" asn1file="/home/taste/tool-inst/include/TASTE-SAMV71-RTEMS-Drivers/configurations/samv71-rtems-serial-driver.asn" asn1type="Serial-SamV71-Rtems-Conf-T" asn1module="SAMV71-RTEMS-SERIAL-DRIVER" extends="ocarina_drivers::serial_ccsds" impl_extends="ocarina_drivers::serial_ccsds.samv71_rtems" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{d3d690fc-2a61-485b-9309-2cb8d479dee2}" name="uart4" requires_bus_access="ocarina_buses::serial.ccsds" port="uart4" asn1file="/home/taste/tool-inst/include/TASTE-SAMV71-RTEMS-Drivers/configurations/samv71-rtems-serial-driver.asn" asn1type="Serial-SamV71-Rtems-Conf-T" asn1module="SAMV71-RTEMS-SERIAL-DRIVER" extends="ocarina_drivers::serial_ccsds" impl_extends="ocarina_drivers::serial_ccsds.samv71_rtems" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+    </Node>
+    <Node id="{9f45c816-a306-4312-92e9-6878a1e316d6}" name="EGSE" type="ocarina_processors_x86::x86.generic_linux" node_label="Node_1" namespace="ocarina_processors_x86">
+        <Partition id="{78384123-3fb5-4669-aa26-205d74f40c17}" name="MCS">
+            <Function id="{7a95f78b-d167-4738-a6b2-aeec50f4d8a7}" name="CnC" path="CnC"/>
+            <Function id="{a5369aa1-9202-4db6-ba13-5436c0b4a7d7}" name="EGSE_Transcoder" path="EGSE_Transcoder"/>
+            <Function id="{9f88caa6-eba0-49b3-bf19-a4d7077e4a2f}" name="Parameter_Monitor" path="Parameter_Monitor"/>
+            <Function id="{1ac0ee7f-e7bf-440d-9bda-43f12ec18313}" name="Archive" path="Archive"/>
+            <Function id="{7f6b93f2-0e98-4b1f-be1c-e999adae6706}" name="EGSE_IF" path="EGSE_IF"/>
+        </Partition>
+        <Device id="{6244adb4-be00-492e-b5f2-08d8f22a7ba9}" name="tcp1" requires_bus_access="ocarina_buses::ip.generic" port="tcp1" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1type="Socket-IP-Conf-T" asn1module="LINUX-SOCKET-IP-DRIVER" extends="ocarina_drivers::ip_socket" impl_extends="ocarina_drivers::ip_socket.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{651e30c7-bb26-418c-a0d7-4aec1260fcbd}" name="tcp2" requires_bus_access="ocarina_buses::ip.generic" port="tcp2" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1type="Socket-IP-Conf-T" asn1module="LINUX-SOCKET-IP-DRIVER" extends="ocarina_drivers::ip_socket" impl_extends="ocarina_drivers::ip_socket.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{d3e8cf83-41be-4fa1-b818-66c1bf4848a3}" name="tcp3" requires_bus_access="ocarina_buses::ip.generic" port="tcp3" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1type="Socket-IP-Conf-T" asn1module="LINUX-SOCKET-IP-DRIVER" extends="ocarina_drivers::ip_socket" impl_extends="ocarina_drivers::ip_socket.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{5d8567fd-e778-4c91-89ce-f8ad637a8a55}" name="tcp4" requires_bus_access="ocarina_buses::ip.generic" port="tcp4" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1type="Socket-IP-Conf-T" asn1module="LINUX-SOCKET-IP-DRIVER" extends="ocarina_drivers::ip_socket" impl_extends="ocarina_drivers::ip_socket.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{fc08f7ea-cff9-49d3-bde3-672f6ede0fe0}" name="udp1" requires_bus_access="ocarina_buses::ip.generic" port="udp1" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1type="Socket-IP-Conf-T" asn1module="LINUX-SOCKET-IP-DRIVER" extends="ocarina_drivers::udp" impl_extends="ocarina_drivers::udp.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{cdb8658b-4dbc-4c82-a78f-3dc58a7894eb}" name="udp2" requires_bus_access="ocarina_buses::ip.generic" port="udp2" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1type="Socket-IP-Conf-T" asn1module="LINUX-SOCKET-IP-DRIVER" extends="ocarina_drivers::udp" impl_extends="ocarina_drivers::udp.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{8e88487e-d556-47c8-908d-5d05c4e21790}" name="udp3" requires_bus_access="ocarina_buses::ip.generic" port="udp3" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1type="Socket-IP-Conf-T" asn1module="LINUX-SOCKET-IP-DRIVER" extends="ocarina_drivers::udp" impl_extends="ocarina_drivers::udp.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{4b20b7cd-24c0-4476-aabd-61ece516b0cd}" name="udp4" requires_bus_access="ocarina_buses::ip.generic" port="udp4" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1type="Socket-IP-Conf-T" asn1module="LINUX-SOCKET-IP-DRIVER" extends="ocarina_drivers::udp" impl_extends="ocarina_drivers::udp.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+        <Device id="{e402b5e2-8823-45f7-b1a5-8573321f71c0}" name="uart0" requires_bus_access="ocarina_buses::serial.ccsds" port="uart0" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-serial-ccsds-driver.asn" asn1type="Serial-CCSDS-Linux-Conf-T" asn1module="LINUX-SERIAL-CCSDS-DRIVER" extends="ocarina_drivers::serial_ccsds" impl_extends="ocarina_drivers::serial_ccsds.linux" bus_namespace="ocarina_buses" namespace="ocarina_drivers">
+        </Device>
+    </Node>
+    <Connection id="{c2347c25-2795-475b-829d-abe4275ab8d3}" name="Connection_1" from_node="EGSE" from_port="uart0" to_bus="ocarina_buses::serial.ccsds" to_node="OBC" to_port="uart0">
+    </Connection>
+    <Connection id="{6cd9b4f4-3ae3-4aac-bf5b-2ed2341846e9}" name="Connection_2" from_node="OBC" from_port="uart1" to_bus="ocarina_buses::serial.ccsds" to_node="CAN Node" to_port="uart0">
+    </Connection>
+</DeploymentView>
\ No newline at end of file
diff --git a/examples/demo-project/deploymentview.ui.xml b/examples/demo-project/deploymentview.ui.xml
new file mode 100644
index 0000000..b3385c4
--- /dev/null
+++ b/examples/demo-project/deploymentview.ui.xml
@@ -0,0 +1,82 @@
+<UI version="1.0" ><Entity id="{295dbee9-cdff-4e52-acf0-957a551c1731}">
+</Entity><Entity id="{6664b495-bb8b-4e18-a1f6-e6a0ea318565}"><Taste coordinates="49000 48000 65000 64000">
+</Taste>
+</Entity><Entity id="{0919a157-97b6-4bfc-8181-96299ee17faf}"><Taste coordinates="51200 50200 62800 58200">
+</Taste>
+</Entity><Entity id="{4b36c564-328d-4f02-b146-f9349b3fc360}">
+</Entity><Entity id="{31398d1a-3b94-44aa-84c6-fbf313cf8f46}"><Taste coordinates="49000 49700">
+</Taste>
+</Entity><Entity id="{6d455aa6-cde7-485d-9683-99a84f5dc267}"><Taste coordinates="49000 53800">
+</Taste>
+</Entity><Entity id="{ac454c1a-60d4-42f1-99be-6dde8e0356f1}"><Taste coordinates="49000 57900">
+</Taste>
+</Entity><Entity id="{aef0470b-3b07-4307-a38d-8e1fb9314a2b}"><Taste coordinates="49000 62000">
+</Taste>
+</Entity><Entity id="{184b4b98-9c54-48b9-a7dc-367bff5b5495}"><Taste coordinates="65000 49700">
+</Taste>
+</Entity><Entity id="{301b1300-55dd-4e1c-9d53-6338e26421e7}"><Taste coordinates="65000 53800">
+</Taste>
+</Entity><Entity id="{c95d880f-9361-44f7-a2ed-27ffc1f28c90}"><Taste coordinates="65000 57900">
+</Taste>
+</Entity><Entity id="{1135093a-69c9-455e-af0d-a2f96f1e9cc8}"><Taste coordinates="65000 62000">
+</Taste>
+</Entity><Entity id="{ea86428a-62d5-47cf-8fc4-d0a145b4d4e1}"><Taste coordinates="53100 48000">
+</Taste>
+</Entity><Entity id="{c2347c25-2795-475b-829d-abe4275ab8d3}"><Taste coordinates="23100 20800 23100 19200 36800 19200 36800 26700 69800 26700">
+</Taste>
+</Entity><Entity id="{0296f7af-28c0-4d6b-9931-97afaa8526ce}"><Taste coordinates="71000 25000 87000 60000">
+</Taste>
+</Entity><Entity id="{9370f3ae-27c3-4bdf-b8de-8787b03d08e5}"><Taste coordinates="73000 28000 84000 57000">
+</Taste>
+</Entity><Entity id="{bc643c65-7abc-49cd-aec2-b215fe1ec629}">
+</Entity><Entity id="{9dc5aba3-8622-41c8-80ca-e038d885a28d}">
+</Entity><Entity id="{130f9b3a-881b-44a6-9c34-f8c2036c19c9}">
+</Entity><Entity id="{f825af3f-1db6-4c85-bf05-572abe6060b5}">
+</Entity><Entity id="{d98faa9a-6991-4665-9bea-bd27058b1cc6}">
+</Entity><Entity id="{8629b700-dfe5-41fd-a436-0445c287bd24}">
+</Entity><Entity id="{ad8edb40-97e1-434d-8486-79e9b41eec30}">
+</Entity><Entity id="{7c62c4a1-1817-47c3-8085-ae2448d1a52f}">
+</Entity><Entity id="{6e93fb38-5b66-45fc-ba1c-4a81615f2c58}">
+</Entity><Entity id="{4febfb8b-e185-4119-be43-db800518cce0}">
+</Entity><Entity id="{9dc6aa59-8f49-4e35-b140-21d7d4c59e8f}"><Taste coordinates="71000 26700">
+</Taste>
+</Entity><Entity id="{fe7c9fc6-0910-4f23-9d2d-ba24e24ecb5b}"><Taste coordinates="71000 30800">
+</Taste>
+</Entity><Entity id="{75e25499-1fd0-47cf-b745-ea9cd8dfa19b}"><Taste coordinates="71000 34900">
+</Taste>
+</Entity><Entity id="{69ba8116-978f-4f8d-a7a4-3ab50bb59627}"><Taste coordinates="71000 39000">
+</Taste>
+</Entity><Entity id="{d3d690fc-2a61-485b-9309-2cb8d479dee2}"><Taste coordinates="87000 26700">
+</Taste>
+</Entity><Entity id="{938465ea-de41-4a1d-8afd-34780700ec41}">
+</Entity><Entity id="{6cd9b4f4-3ae3-4aac-bf5b-2ed2341846e9}"><Taste coordinates="69800 30800 53100 30800 53100 47000">
+</Taste>
+</Entity><Entity id="{9f45c816-a306-4312-92e9-6878a1e316d6}"><Taste coordinates="19000 22000 35000 38000">
+</Taste>
+</Entity><Entity id="{78384123-3fb5-4669-aa26-205d74f40c17}"><Taste coordinates="21000 24000 33000 39000">
+</Taste>
+</Entity><Entity id="{7a95f78b-d167-4738-a6b2-aeec50f4d8a7}">
+</Entity><Entity id="{a5369aa1-9202-4db6-ba13-5436c0b4a7d7}">
+</Entity><Entity id="{9f88caa6-eba0-49b3-bf19-a4d7077e4a2f}">
+</Entity><Entity id="{1ac0ee7f-e7bf-440d-9bda-43f12ec18313}">
+</Entity><Entity id="{7f6b93f2-0e98-4b1f-be1c-e999adae6706}">
+</Entity><Entity id="{6244adb4-be00-492e-b5f2-08d8f22a7ba9}"><Taste coordinates="19000 23700">
+</Taste>
+</Entity><Entity id="{651e30c7-bb26-418c-a0d7-4aec1260fcbd}"><Taste coordinates="19000 27800">
+</Taste>
+</Entity><Entity id="{d3e8cf83-41be-4fa1-b818-66c1bf4848a3}"><Taste coordinates="19000 31900">
+</Taste>
+</Entity><Entity id="{5d8567fd-e778-4c91-89ce-f8ad637a8a55}"><Taste coordinates="19000 36000">
+</Taste>
+</Entity><Entity id="{fc08f7ea-cff9-49d3-bde3-672f6ede0fe0}"><Taste coordinates="35000 23700">
+</Taste>
+</Entity><Entity id="{cdb8658b-4dbc-4c82-a78f-3dc58a7894eb}"><Taste coordinates="35000 27800">
+</Taste>
+</Entity><Entity id="{8e88487e-d556-47c8-908d-5d05c4e21790}"><Taste coordinates="35000 31900">
+</Taste>
+</Entity><Entity id="{4b20b7cd-24c0-4476-aabd-61ece516b0cd}"><Taste coordinates="35000 36000">
+</Taste>
+</Entity><Entity id="{e402b5e2-8823-45f7-b1a5-8573321f71c0}"><Taste coordinates="23100 22000">
+</Taste>
+</Entity>
+</UI>
\ No newline at end of file
diff --git a/examples/demo-project/interfaceview.ui.xml b/examples/demo-project/interfaceview.ui.xml
new file mode 100644
index 0000000..c49ca8f
--- /dev/null
+++ b/examples/demo-project/interfaceview.ui.xml
@@ -0,0 +1,218 @@
+<UI version="1.0" ><Entity id="{5b2b28b1-566c-45a2-95c4-81c8b9c53882}"><Taste coordinates="-49000 6000 -29000 14000">
+</Taste>
+</Entity><Entity id="{9eaa1896-1480-4004-9504-20a4f283ab6e}"><Taste coordinates="-29000 10800">
+</Taste>
+</Entity><Entity id="{865b64a2-64a8-490c-9979-7976225c9bc8}"><Taste coordinates="-29000 8000">
+</Taste>
+</Entity><Entity id="{712522d0-ab67-4fc0-b0b8-324fb82e7862}"><Taste coordinates="93000 -15500 93000 -26000 101700 -26000">
+</Taste>
+</Entity><Entity id="{22dd1137-c442-4169-9889-f8aa23498e44}"><Taste coordinates="102000 6000 122000 14000">
+</Taste>
+</Entity><Entity id="{d8c64dbd-d585-4c85-803c-6ec3e97046e9}"><Taste coordinates="102000 10000">
+</Taste>
+</Entity><Entity id="{375bce03-def1-4662-8ec3-59a6d0093c53}"><Taste coordinates="122000 10000">
+</Taste>
+</Entity><Entity id="{b05a2d38-49c0-4fda-a8ec-c8921702e1f3}"><Taste coordinates="106900 -30500 106900 -34100 106500 -36100 106500 -37700">
+</Taste>
+</Entity><Entity id="{b4570b1e-9a13-41e1-9b90-9a446078e1eb}"><Taste coordinates="98500 25000 100400 25000 100400 19400 100400 4400 88900 4400 88900 300">
+</Taste>
+</Entity><Entity id="{5d2e6b87-3789-41df-bc1a-42c383c4a56e}"><Taste coordinates="77500 -6000 70900 -6000 64300 -5800">
+</Taste>
+</Entity><Entity id="{21c6cdd2-9450-4ebe-bebd-9a7d2f55045a}"><Taste coordinates="110000 -14000 130000 -6000">
+</Taste>
+</Entity><Entity id="{a699aba9-2ba1-4c83-baaf-bf8070c834c7}"><Taste coordinates="130000 -10000">
+</Taste>
+</Entity><Entity id="{f97f6edd-8926-436f-b8ff-7de6f00795be}"><Taste coordinates="110000 -8900">
+</Taste>
+</Entity><Entity id="{e4372e37-10f5-4988-8140-d3445cb68a2b}"><Taste coordinates="102000 -46000 122000 -38000">
+</Taste>
+</Entity><Entity id="{2ac6b5e2-3a80-4ebf-9f5a-1e752a2c3943}"><Taste coordinates="106500 -38000">
+</Taste>
+</Entity><Entity id="{70a44ed1-5a04-4cf4-a89c-01aee3a5b462}"><Taste coordinates="116000 -38000">
+</Taste>
+</Entity><Entity id="{f16cac1a-1f05-4785-9935-921f7013afb3}"><Taste coordinates="43500 11000 36900 11000 30300 10800">
+</Taste>
+</Entity><Entity id="{9e6cfe4d-2389-4c83-8521-3c2cecd0cb37}"><Taste coordinates="64500 9000 66600 9000 68700 8800">
+</Taste>
+</Entity><Entity id="{f4a308ae-34a0-45a6-83df-122c8b4539c0}"><Taste RootCoordinates="0 0 115400 62300" coordinates="78000 -15000 98000 0">
+</Taste>
+</Entity><Entity id="{6d05d0b7-7072-4624-b40d-516772551fe2}"><Taste RootCoordinates="0 15800" coordinates="78000 -11200">
+</Taste>
+</Entity><Entity id="{cc465677-ac0d-40f7-9ce7-309b52dc79ab}"><Taste RootCoordinates="62900 62300" coordinates="88900 0">
+</Taste>
+</Entity><Entity id="{5a6bd997-24dd-4dfb-9408-b73efad61025}"><Taste RootCoordinates="0 38000" coordinates="78000 -6000">
+</Taste>
+</Entity><Entity id="{85a186a5-875c-4b3f-b500-8b8ec0d05b64}"><Taste RootCoordinates="115400 24900" coordinates="98000 -9000">
+</Taste>
+</Entity><Entity id="{1306cb03-8d26-43a1-ab47-455e3176e6de}"><Taste RootCoordinates="86600 62300" coordinates="93000 0">
+</Taste>
+</Entity><Entity id="{18cdc41f-db84-46b3-b802-89a90427160a}"><Taste RootCoordinates="86600 0" coordinates="93000 -15000">
+</Taste>
+</Entity><Entity id="{92088f77-1325-475d-a87e-bb434515f2f5}"><Taste coordinates="8000 12000 22000 23000">
+</Taste>
+</Entity><Entity id="{c659a656-c7a2-4654-95ee-1fa5a32224f8}"><Taste coordinates="8000 15900">
+</Taste>
+</Entity><Entity id="{e665ade2-5e2f-452e-8263-d522d1ac003e}"><Taste coordinates="22000 14900">
+</Taste>
+</Entity><Entity id="{9bbcc215-bf8a-4ede-bafc-015e7daca88b}"><Taste coordinates="22000 21200">
+</Taste>
+</Entity><Entity id="{f53da581-e5aa-432a-abee-c294e277cf7a}"><Taste coordinates="48000 5000 68000 13000">
+</Taste>
+</Entity><Entity id="{b1186962-b312-4b4f-b23a-d69f6c305d02}"><Taste coordinates="68000 10200">
+</Taste>
+</Entity><Entity id="{eaed407c-2b15-4f1d-a579-ee29c3108d28}"><Taste coordinates="48000 11000">
+</Taste>
+</Entity><Entity id="{4d8a8987-c894-411e-82d2-47aa466cee5c}"><Taste coordinates="48000 6800">
+</Taste>
+</Entity><Entity id="{ea607104-c20f-4d90-a25f-451784e72bb1}"><Taste coordinates="68000 6200">
+</Taste>
+</Entity><Entity id="{dc50901a-61b8-48a5-9b56-cb696093e641}"><Taste coordinates="48000 33000 68000 41000">
+</Taste>
+</Entity><Entity id="{8286eb57-6fa5-4727-b31f-aba247f62dd8}"><Taste coordinates="62500 41000">
+</Taste>
+</Entity><Entity id="{709a3794-e82c-458a-b966-4bc2c49ed035}"><Taste coordinates="68000 39000">
+</Taste>
+</Entity><Entity id="{e7c85212-ddcb-4a8b-a9dc-fa3207293a46}"><Taste coordinates="68000 35000">
+</Taste>
+</Entity><Entity id="{0d401ca5-1d03-4b80-b387-4bfd37f13d29}"><Taste coordinates="48000 38000">
+</Taste>
+</Entity><Entity id="{75775243-5268-42ff-996f-10db5e41eb06}"><Taste coordinates="48000 33500">
+</Taste>
+</Entity><Entity id="{22bfc76d-6efc-414d-b2b4-7999f946960c}"><Taste coordinates="65200 33000">
+</Taste>
+</Entity><Entity id="{f968af78-1544-4fc8-8f95-025984b8ea7c}"><Taste coordinates="62900 61800 62900 51500 62500 41300">
+</Taste>
+</Entity><Entity id="{cee8ce31-4c2a-4ee1-9bb5-92d119e203a0}"><Taste coordinates="68500 39000 86600 39000 86600 62000">
+</Taste>
+</Entity><Entity id="{e739dcf4-f148-4b84-93c7-7faf2888b613}"><Taste coordinates="68500 35000 92100 35000 92100 24900 115100 24900">
+</Taste>
+</Entity><Entity id="{ac7e7a9f-d933-483e-95e9-0eed9edbdae2}"><Taste coordinates="68500 10200 91800 10200 91800 24900 115100 24900">
+</Taste>
+</Entity><Entity id="{9f0ba552-1e2d-4d73-b85d-4f4dfd5d5de6}"><Taste coordinates="500 15800 4100 15800 7700 15900">
+</Taste>
+</Entity><Entity id="{efb4e126-1b0e-4a8d-844e-d8b1b4a86388}"><Taste coordinates="47500 38000 300 38000">
+</Taste>
+</Entity><Entity id="{3257eb51-6870-423c-9156-9073148b2ff1}"><Taste coordinates="47500 11000 23900 11000 23900 38000 300 38000">
+</Taste>
+</Entity><Entity id="{831686eb-6458-4878-8bea-bf28b1eb6bf7}"><Taste coordinates="22500 14900 35100 14900 35100 6800 47700 6800">
+</Taste>
+</Entity><Entity id="{bc8aae9b-44ae-4ea5-bdb4-b4b1eb0350c7}"><Taste coordinates="22500 21200 35400 21200 35400 33500 47700 33500">
+</Taste>
+</Entity><Entity id="{fb685181-5c60-4b25-83fa-64d17fdfe48d}"><Taste coordinates="68500 6200 86600 6200 86600 300">
+</Taste>
+</Entity><Entity id="{00d8f411-e1f0-4e08-8498-f1434b7f2324}"><Taste coordinates="65200 32500 65200 16400 86600 16400 86600 300">
+</Taste>
+</Entity><Entity id="{8252e12d-3562-42b6-8b2e-9aecbb09be41}"><Taste coordinates="-49000 -38000 -8000 -22000">
+</Taste>
+</Entity><Entity id="{ed70b5c2-5a14-45c1-8e06-26de8ee3c3ee}"><Taste coordinates="116000 -37500 116000 -33900 115800 -31900 115800 -30300">
+</Taste>
+</Entity><Entity id="{7b9c36d3-5799-45dd-995d-e6f78498ee57}"><Taste coordinates="-28500 8000 -15300 8000">
+</Taste>
+</Entity><Entity id="{a5d89e97-5ef8-4e0f-be41-64a9be0c3d36}"><Taste coordinates="-15500 11000 -22100 11000 -28700 10800">
+</Taste>
+</Entity><Entity id="{ba6d8065-554a-4be2-ad56-96392c2750e9}"><Taste coordinates="30500 8000 37100 8000 43700 7700">
+</Taste>
+</Entity><Entity id="{7a8a0847-c06e-4eca-8b97-2380811c31ab}"><Taste coordinates="-15000 -17000 5000 14000">
+</Taste>
+</Entity><Entity id="{5c7170b8-72f7-4280-93d6-c7a8651dd0cc}"><Taste coordinates="5000 7900">
+</Taste>
+</Entity><Entity id="{2d1f16d6-ee97-41d7-b880-94e020bc2de7}"><Taste coordinates="-15000 8000">
+</Taste>
+</Entity><Entity id="{d31597e3-053d-4dd8-808e-3e65317c8d86}"><Taste coordinates="5000 11000">
+</Taste>
+</Entity><Entity id="{8931d303-94e5-4178-b83f-467dbd212c83}"><Taste coordinates="-15000 -13000">
+</Taste>
+</Entity><Entity id="{7ad5b041-033d-46f1-822f-bade53b106dc}"><Taste coordinates="-15000 11000">
+</Taste>
+</Entity><Entity id="{1c207dc1-5d02-4ce7-b737-3eb43997892d}"><Taste coordinates="-15000 -1000">
+</Taste>
+</Entity><Entity id="{386b158a-a083-41da-8d81-b2ff569d64f2}"><Taste coordinates="44000 -15000 64000 14000">
+</Taste>
+</Entity><Entity id="{53b4399f-40d2-400a-934d-89b2d9e2896c}"><Taste coordinates="44000 7700">
+</Taste>
+</Entity><Entity id="{6dbb6ee2-715e-4967-969e-0afe77cd9b71}"><Taste coordinates="64000 12200">
+</Taste>
+</Entity><Entity id="{637fab93-c813-4a55-bf67-741a9787eb14}"><Taste coordinates="64000 -5800">
+</Taste>
+</Entity><Entity id="{66a72590-ab3b-47e7-8630-4e17eecf9d2f}"><Taste coordinates="44000 11000">
+</Taste>
+</Entity><Entity id="{5f71eae4-8158-4f92-8e41-bc682c79606a}"><Taste coordinates="64000 9000">
+</Taste>
+</Entity><Entity id="{01aa9e2f-fe8a-47e7-80b8-0117405a51d2}"><Taste RootCoordinates="0 15800" coordinates="64000 -11100">
+</Taste>
+</Entity><Entity id="{ed8a7364-04a5-4983-8ac1-e58403f6a041}"><Taste coordinates="102000 -30000 122000 -22000">
+</Taste>
+</Entity><Entity id="{eb478793-37e3-4798-b90d-521b4de78d02}"><Taste coordinates="115800 -30000">
+</Taste>
+</Entity><Entity id="{18c032f4-39fb-4051-8e5c-668a1f21d94f}"><Taste coordinates="102000 -26000">
+</Taste>
+</Entity><Entity id="{ff516d61-e2c1-4ec3-8cb1-93529e2c8ae8}"><Taste coordinates="118600 -22000">
+</Taste>
+</Entity><Entity id="{183b4fed-2e01-4c3b-b1c2-b7cef58040de}"><Taste coordinates="122000 -26000">
+</Taste>
+</Entity><Entity id="{076ca0fb-3663-4378-a85c-8b1dc96cb693}"><Taste coordinates="106900 -30000">
+</Taste>
+</Entity><Entity id="{d93bbc74-4768-4145-b307-331b149dc80a}"><Taste coordinates="78000 21000 98000 29000">
+</Taste>
+</Entity><Entity id="{6b86023b-de28-451f-96a1-8f0d92615857}"><Taste coordinates="80000 21000">
+</Taste>
+</Entity><Entity id="{75d10afa-4f1e-478d-a9d9-609614468574}"><Taste RootCoordinates="62900 62300" coordinates="98000 25000">
+</Taste>
+</Entity><Entity id="{12a09d36-a18e-4f09-abcc-e60eef9269a4}"><Taste coordinates="122500 -26000 131300 -26000 131300 -10000 130300 -10000">
+</Taste>
+</Entity><Entity id="{9497158f-7ce4-4b88-9bc4-b472cca4a508}"><Taste coordinates="98500 -9000 104100 -9000 109700 -8900">
+</Taste>
+</Entity><Entity id="{1f4f8841-7147-4986-8710-c10602b71116}"><Taste coordinates="144600 5500 144600 -10000 130300 -10000">
+</Taste>
+</Entity><Entity id="{60d938a7-ae09-454c-9b34-bfc8fcbdb84d}"><Taste coordinates="64500 -11100 71100 -11100 77700 -11200">
+</Taste>
+</Entity><Entity id="{f8fe3605-3c57-4030-863c-e142b66f7f3e}"><Taste coordinates="98500 25000 100100 25000 100100 4400 100400 -15600 118600 -15600 118600 -21700">
+</Taste>
+</Entity><Entity id="{165fe7a0-3619-40ac-9bae-7e55e83efedf}"><Taste coordinates="68500 12100 66400 12100 64300 12200">
+</Taste>
+</Entity><Entity id="{9112df55-1270-42a3-af98-5cdc047e2ec3}"><Taste coordinates="98500 25000 144000 25000 144000 14300">
+</Taste>
+</Entity><Entity id="{98fbadbc-3384-4ec1-8c68-d3ee594d28ee}"><Taste coordinates="-49000 -5000 -29000 3000">
+</Taste>
+</Entity><Entity id="{87c857b5-5e01-42b9-be41-14945b4095f9}"><Taste coordinates="-29000 -1000">
+</Taste>
+</Entity><Entity id="{44f323b7-7204-45aa-a1e1-28f3fd2d8d78}"><Taste coordinates="5500 11000 7600 11000 9700 11100">
+</Taste>
+</Entity><Entity id="{96c9e808-95df-4c8b-b5b6-349806fad470}"><Taste coordinates="10000 6000 30000 14000">
+</Taste>
+</Entity><Entity id="{f892b3ec-f335-4331-8da8-4a0a19b63e20}"><Taste coordinates="10000 11100">
+</Taste>
+</Entity><Entity id="{6cfa0662-fe26-43ef-b982-9300b0c8a870}"><Taste coordinates="30000 10800">
+</Taste>
+</Entity><Entity id="{78c4deed-b125-4c2b-8c80-f12c9692af44}"><Taste coordinates="10000 8000">
+</Taste>
+</Entity><Entity id="{3cb1d68b-4869-42e8-8268-cc2c734fe323}"><Taste coordinates="30000 8000">
+</Taste>
+</Entity><Entity id="{5ae7ca8a-a28e-46e9-b2e8-2d8207c03dc2}"><Taste coordinates="122500 10000 131900 10000 131900 -10000 130300 -10000">
+</Taste>
+</Entity><Entity id="{b4edeabb-5cbc-4ceb-a91c-617a02c43634}"><Taste coordinates="93000 500 93000 10000 101700 10000">
+</Taste>
+</Entity><Entity id="{9b3559ac-7da4-4df7-9f17-22e974091bbf}"><Taste coordinates="134000 6000 154000 14000">
+</Taste>
+</Entity><Entity id="{58453814-b6ce-48e1-b191-de750bcdf69b}"><Taste coordinates="144000 14000">
+</Taste>
+</Entity><Entity id="{45589777-faae-40e1-b194-958e5054fbef}"><Taste coordinates="144600 6000">
+</Taste>
+</Entity><Entity id="{17485a96-8307-419b-b49b-e979da978882}"><Taste coordinates="-49000 -17000 -29000 -9000">
+</Taste>
+</Entity><Entity id="{656c12f4-b5e0-44bf-a5e6-a236c1b79257}"><Taste coordinates="-29000 -13000">
+</Taste>
+</Entity><Entity id="{b3529bf4-7338-4df0-96b2-ff1dd49446ba}"><Taste coordinates="69000 6000 89000 14000">
+</Taste>
+</Entity><Entity id="{20496e2c-416b-4607-9898-3747a39f807c}"><Taste coordinates="69000 8800">
+</Taste>
+</Entity><Entity id="{f191bceb-abfe-4e91-81c6-0334a733e3e7}"><Taste coordinates="69000 12100">
+</Taste>
+</Entity><Entity id="{7d01a499-6e14-4c3b-9ac0-68a32d1b5d5a}"><Taste coordinates="9500 8000 7400 8000 5300 7900">
+</Taste>
+</Entity><Entity id="{8afe085b-4313-404c-842a-a703d5cbeb33}"><Taste coordinates="-15500 -1000 -28700 -1000">
+</Taste>
+</Entity><Entity id="{ed9b7227-f5bb-4e1c-a23d-275a73af6fb9}"><Taste coordinates="-15500 -13000 -28700 -13000">
+</Taste>
+</Entity>
+</UI>
\ No newline at end of file
diff --git a/examples/demo-project/interfaceview.xml b/examples/demo-project/interfaceview.xml
new file mode 100644
index 0000000..ba2c2e2
--- /dev/null
+++ b/examples/demo-project/interfaceview.xml
@@ -0,0 +1,574 @@
+<InterfaceView version="1.3" asn1file="demo-project.acn" UiFile="interfaceview.ui.xml" modifierHash="383508e" requirementsURL="https://gitlab.com/n7space/demo-project-requirements" reviewsURL="https://gitlab.com/n7space/demo-project-requirements">
+<Function id="{5b2b28b1-566c-45a2-95c4-81c8b9c53882}" name="CnC" is_type="NO" language="GUI" default_implementation="default" fixed_system_element="NO" required_system_element="NO" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{9eaa1896-1480-4004-9504-20a4f283ab6e}" name="response" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="Response" encoding="NATIVE"/>
+</Provided_Interface>
+
+<Required_Interface id="{865b64a2-64a8-490c-9979-7976225c9bc8}" name="request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="false"/>
+</Required_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="GUI"/>
+    </Implementations>
+</Function>
+
+<Function id="{22dd1137-c442-4169-9889-f8aa23498e44}" Comment="Actuates actuators" name="Actuation" is_type="NO" language="Ada" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-fun-50" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{d8c64dbd-d585-4c85-803c-6ec3e97046e9}" name="actuate" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="Cmd" encoding="NATIVE"/>
+</Provided_Interface>
+
+<Required_Interface id="{375bce03-def1-4662-8ec3-59a6d0093c53}" name="submit" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+    <Input_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="Ada"/>
+    </Implementations>
+</Function>
+
+<Function id="{21c6cdd2-9450-4ebe-bebd-9a7d2f55045a}" Comment="Stores on-board parameters" name="DataPool" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-dat-10,dp-des-20" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{a699aba9-2ba1-4c83-baaf-bf8070c834c7}" name="submit" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+    <Input_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
+</Provided_Interface>
+
+<Provided_Interface id="{f97f6edd-8926-436f-b8ff-7de6f00795be}" name="retrieve" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+    <Output_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
+</Provided_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="SDL"/>
+    </Implementations>
+</Function>
+
+<Function id="{e4372e37-10f5-4988-8140-d3445cb68a2b}" name="CANOpenSlave" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{2ac6b5e2-3a80-4ebf-9f5a-1e752a2c3943}" name="pdu_out" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
+</Provided_Interface>
+
+<Required_Interface id="{70a44ed1-5a04-4cf4-a89c-01aee3a5b462}" name="pdu_in" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="SDL"/>
+    </Implementations>
+</Function>
+
+<Function id="{f4a308ae-34a0-45a6-83df-122c8b4539c0}" Comment="Handles the command and control functions" name="Service_Frontend" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-des-10,dp-fun-10,dp-fun-20" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{6d05d0b7-7072-4624-b40d-516772551fe2}" name="request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
+</Provided_Interface>
+
+<Provided_Interface id="{cc465677-ac0d-40f7-9ce7-309b52dc79ab}" name="tick" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+</Provided_Interface>
+
+<Required_Interface id="{5a6bd997-24dd-4dfb-9408-b73efad61025}" name="response" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="Response" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+<Required_Interface id="{85a186a5-875c-4b3f-b500-8b8ec0d05b64}" name="retrieve" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+    <Output_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+<Required_Interface id="{1306cb03-8d26-43a1-ab47-455e3176e6de}" name="actuate" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="Cmd" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+<Required_Interface id="{18cdc41f-db84-46b3-b802-89a90427160a}" name="command" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+    <Input_Parameter name="p1" type="Cmd" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+<Function id="{92088f77-1325-475d-a87e-bb434515f2f5}" Comment="Router of Service Requests" name="Router" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-des-10" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{c659a656-c7a2-4654-95ee-1fa5a32224f8}" name="request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
+</Provided_Interface>
+
+<Required_Interface id="{e665ade2-5e2f-452e-8263-d522d1ac003e}" name="service_a_request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+<Required_Interface id="{9bbcc215-bf8a-4ede-bafc-015e7daca88b}" name="service_b_request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="SDL"/>
+    </Implementations>
+</Function>
+
+<Function id="{f53da581-e5aa-432a-abee-c294e277cf7a}" Comment="Services CAN interface commands" name="Service_A" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-fun-10" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{4d8a8987-c894-411e-82d2-47aa466cee5c}" name="service_a_request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
+</Provided_Interface>
+
+<Required_Interface id="{b1186962-b312-4b4f-b23a-d69f6c305d02}" name="retrieve" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false">
+    <Output_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="false"/>
+</Required_Interface>
+
+<Required_Interface id="{eaed407c-2b15-4f1d-a579-ee29c3108d28}" name="response" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false">
+    <Input_Parameter name="p1" type="Response" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="false"/>
+</Required_Interface>
+
+<Required_Interface id="{ea607104-c20f-4d90-a25f-451784e72bb1}" name="command" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false">
+    <Input_Parameter name="p1" type="Cmd" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="false"/>
+</Required_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="SDL"/>
+    </Implementations>
+</Function>
+
+<Function id="{dc50901a-61b8-48a5-9b56-cb696093e641}" Comment="Services On-Board Data" name="Service_B" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-fun-20" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{8286eb57-6fa5-4727-b31f-aba247f62dd8}" name="tick" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+</Provided_Interface>
+
+<Provided_Interface id="{75775243-5268-42ff-996f-10db5e41eb06}" name="service_b_request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
+</Provided_Interface>
+
+<Required_Interface id="{709a3794-e82c-458a-b966-4bc2c49ed035}" name="actuate" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false">
+    <Input_Parameter name="p1" type="Cmd" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="false"/>
+</Required_Interface>
+
+<Required_Interface id="{e7c85212-ddcb-4a8b-a9dc-fa3207293a46}" name="retrieve" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false">
+    <Output_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="false"/>
+</Required_Interface>
+
+<Required_Interface id="{0d401ca5-1d03-4b80-b387-4bfd37f13d29}" name="response" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false">
+    <Input_Parameter name="p1" type="Response" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="false"/>
+</Required_Interface>
+
+<Required_Interface id="{22bfc76d-6efc-414d-b2b4-7999f946960c}" name="command" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false">
+    <Input_Parameter name="p1" type="Cmd" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="false"/>
+</Required_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="SDL"/>
+    </Implementations>
+</Function>
+
+<Connection id="{f968af78-1544-4fc8-8f95-025984b8ea7c}" required_system_element="NO">
+    <Source iface_id="{cc465677-ac0d-40f7-9ce7-309b52dc79ab}" func_name="Service_Frontend" pi_name="tick" />
+    <Target iface_id="{8286eb57-6fa5-4727-b31f-aba247f62dd8}" func_name="Service_B" pi_name="tick" />
+</Connection>
+
+<Connection id="{cee8ce31-4c2a-4ee1-9bb5-92d119e203a0}" required_system_element="NO">
+    <Source iface_id="{709a3794-e82c-458a-b966-4bc2c49ed035}" func_name="Service_B" ri_name="actuate" />
+    <Target iface_id="{1306cb03-8d26-43a1-ab47-455e3176e6de}" func_name="Service_Frontend" ri_name="actuate" />
+</Connection>
+
+<Connection id="{e739dcf4-f148-4b84-93c7-7faf2888b613}" required_system_element="NO">
+    <Source iface_id="{e7c85212-ddcb-4a8b-a9dc-fa3207293a46}" func_name="Service_B" ri_name="retrieve" />
+    <Target iface_id="{85a186a5-875c-4b3f-b500-8b8ec0d05b64}" func_name="Service_Frontend" ri_name="retrieve" />
+</Connection>
+
+<Connection id="{ac7e7a9f-d933-483e-95e9-0eed9edbdae2}" required_system_element="NO">
+    <Source iface_id="{b1186962-b312-4b4f-b23a-d69f6c305d02}" func_name="Service_A" ri_name="retrieve" />
+    <Target iface_id="{85a186a5-875c-4b3f-b500-8b8ec0d05b64}" func_name="Service_Frontend" ri_name="retrieve" />
+</Connection>
+
+<Connection id="{9f0ba552-1e2d-4d73-b85d-4f4dfd5d5de6}" required_system_element="NO">
+    <Source iface_id="{6d05d0b7-7072-4624-b40d-516772551fe2}" func_name="Service_Frontend" pi_name="request" />
+    <Target iface_id="{c659a656-c7a2-4654-95ee-1fa5a32224f8}" func_name="Router" pi_name="request" />
+</Connection>
+
+<Connection id="{efb4e126-1b0e-4a8d-844e-d8b1b4a86388}" required_system_element="NO">
+    <Source iface_id="{0d401ca5-1d03-4b80-b387-4bfd37f13d29}" func_name="Service_B" ri_name="response" />
+    <Target iface_id="{5a6bd997-24dd-4dfb-9408-b73efad61025}" func_name="Service_Frontend" ri_name="response" />
+</Connection>
+
+<Connection id="{3257eb51-6870-423c-9156-9073148b2ff1}" required_system_element="NO">
+    <Source iface_id="{eaed407c-2b15-4f1d-a579-ee29c3108d28}" func_name="Service_A" ri_name="response" />
+    <Target iface_id="{5a6bd997-24dd-4dfb-9408-b73efad61025}" func_name="Service_Frontend" ri_name="response" />
+</Connection>
+
+<Connection id="{831686eb-6458-4878-8bea-bf28b1eb6bf7}" name="Router_service_a_request____Service_A_service_a_request" required_system_element="NO">
+    <Source iface_id="{e665ade2-5e2f-452e-8263-d522d1ac003e}" func_name="Router" ri_name="service_a_request" />
+    <Target iface_id="{4d8a8987-c894-411e-82d2-47aa466cee5c}" func_name="Service_A" pi_name="service_a_request" />
+</Connection>
+
+<Connection id="{bc8aae9b-44ae-4ea5-bdb4-b4b1eb0350c7}" name="Router_service_b_request____Service_B_service_b_request" required_system_element="NO">
+    <Source iface_id="{9bbcc215-bf8a-4ede-bafc-015e7daca88b}" func_name="Router" ri_name="service_b_request" />
+    <Target iface_id="{75775243-5268-42ff-996f-10db5e41eb06}" func_name="Service_B" pi_name="service_b_request" />
+</Connection>
+
+<Connection id="{fb685181-5c60-4b25-83fa-64d17fdfe48d}" required_system_element="NO">
+    <Source iface_id="{ea607104-c20f-4d90-a25f-451784e72bb1}" func_name="Service_A" ri_name="command" />
+    <Target iface_id="{18cdc41f-db84-46b3-b802-89a90427160a}" func_name="Service_Frontend" ri_name="command" />
+</Connection>
+
+<Connection id="{00d8f411-e1f0-4e08-8498-f1434b7f2324}" required_system_element="NO">
+    <Source iface_id="{22bfc76d-6efc-414d-b2b4-7999f946960c}" func_name="Service_B" ri_name="command" />
+    <Target iface_id="{18cdc41f-db84-46b3-b802-89a90427160a}" func_name="Service_Frontend" ri_name="command" />
+</Connection>
+
+    <Implementations>
+        <Implementation name="default" language="SDL"/>
+    </Implementations>
+</Function>
+
+<Function id="{7a8a0847-c06e-4eca-8b97-2380811c31ab}" name="EGSE_Transcoder" is_type="NO" language="Blackbox_C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{5c7170b8-72f7-4280-93d6-c7a8651dd0cc}" name="tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="TM" encoding="ACN"/>
+</Provided_Interface>
+
+<Provided_Interface id="{2d1f16d6-ee97-41d7-b880-94e020bc2de7}" name="request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
+</Provided_Interface>
+
+<Required_Interface id="{d31597e3-053d-4dd8-808e-3e65317c8d86}" name="tc" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="TC" encoding="ACN"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+<Required_Interface id="{8931d303-94e5-4178-b83f-467dbd212c83}" name="tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="TM" encoding="ACN"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+<Required_Interface id="{7ad5b041-033d-46f1-822f-bade53b106dc}" name="response" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="Response" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+<Required_Interface id="{1c207dc1-5d02-4ce7-b737-3eb43997892d}" name="param" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="Blackbox_C"/>
+    </Implementations>
+</Function>
+
+<Function id="{386b158a-a083-41da-8d81-b2ff569d64f2}" Comment="Handles the reception of TCs and sending of TMs" name="TC_TM_Interface" is_type="NO" language="C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-if-10,dp-if-20" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{53b4399f-40d2-400a-934d-89b2d9e2896c}" name="uart_tc" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
+</Provided_Interface>
+
+<Provided_Interface id="{6dbb6ee2-715e-4967-969e-0afe77cd9b71}" name="tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="TM" encoding="ACN"/>
+</Provided_Interface>
+
+<Provided_Interface id="{637fab93-c813-4a55-bf67-741a9787eb14}" name="response" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="Response" encoding="NATIVE"/>
+</Provided_Interface>
+
+<Required_Interface id="{66a72590-ab3b-47e7-8630-4e17eecf9d2f}" name="uart_tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+<Required_Interface id="{5f71eae4-8158-4f92-8e41-bc682c79606a}" name="tc" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="TC" encoding="ACN"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+<Required_Interface id="{01aa9e2f-fe8a-47e7-80b8-0117405a51d2}" name="request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="C"/>
+    </Implementations>
+</Function>
+
+<Function id="{ed8a7364-04a5-4983-8ac1-e58403f6a041}" Comment="Manages the connected CANOpen network" name="CANOpenMaster" is_type="NO" language="C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-dat-20,dp-fun-30,dp-if-40" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{eb478793-37e3-4798-b90d-521b4de78d02}" name="pdu_in" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
+</Provided_Interface>
+
+<Provided_Interface id="{18c032f4-39fb-4051-8e5c-668a1f21d94f}" name="command" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+    <Input_Parameter name="p1" type="Cmd" encoding="NATIVE"/>
+</Provided_Interface>
+
+<Provided_Interface id="{ff516d61-e2c1-4ec3-8cb1-93529e2c8ae8}" name="tick" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+</Provided_Interface>
+
+<Required_Interface id="{183b4fed-2e01-4c3b-b1c2-b7cef58040de}" name="submit" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+    <Input_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+<Required_Interface id="{076ca0fb-3663-4378-a85c-8b1dc96cb693}" name="pdu_out" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="C"/>
+    </Implementations>
+</Function>
+
+<Function id="{d93bbc74-4768-4145-b307-331b149dc80a}" Comment="Provides a synchronized system-wide Tick to other modules" name="Syncer" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{6b86023b-de28-451f-96a1-8f0d92615857}" name="pps" kind="Cyclic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" dispatch_offset="0" stack_size="1024" wcet="0" period="1000" priority="1">
+</Provided_Interface>
+
+<Required_Interface id="{75d10afa-4f1e-478d-a9d9-609614468574}" name="tick" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="SDL"/>
+    </Implementations>
+</Function>
+
+<Function id="{98fbadbc-3384-4ec1-8c68-d3ee594d28ee}" name="Parameter_Monitor" is_type="NO" language="GUI" default_implementation="default" fixed_system_element="NO" required_system_element="NO" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{87c857b5-5e01-42b9-be41-14945b4095f9}" name="param" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
+</Provided_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="GUI"/>
+    </Implementations>
+</Function>
+
+<Function id="{96c9e808-95df-4c8b-b5b6-349806fad470}" name="EGSE_IF" is_type="NO" language="C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{f892b3ec-f335-4331-8da8-4a0a19b63e20}" name="tc" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="TC" encoding="ACN"/>
+</Provided_Interface>
+
+<Provided_Interface id="{6cfa0662-fe26-43ef-b982-9300b0c8a870}" name="uart_tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
+</Provided_Interface>
+
+<Required_Interface id="{78c4deed-b125-4c2b-8c80-f12c9692af44}" name="tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="TM" encoding="ACN"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+<Required_Interface id="{3cb1d68b-4869-42e8-8268-cc2c734fe323}" name="uart_tc" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="C"/>
+    </Implementations>
+</Function>
+
+<Function id="{9b3559ac-7da4-4df7-9f17-22e974091bbf}" Comment="Acquires data from sensors" name="SensorArray" is_type="NO" language="C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-fun-40" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{58453814-b6ce-48e1-b191-de750bcdf69b}" name="tick" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+</Provided_Interface>
+
+<Required_Interface id="{45589777-faae-40e1-b194-958e5054fbef}" name="submit" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+    <Input_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="C"/>
+    </Implementations>
+</Function>
+
+<Function id="{17485a96-8307-419b-b49b-e979da978882}" name="Archive" is_type="NO" language="C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{656c12f4-b5e0-44bf-a5e6-a236c1b79257}" name="tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="TM" encoding="ACN"/>
+</Provided_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="C"/>
+    </Implementations>
+</Function>
+
+<Function id="{b3529bf4-7338-4df0-96b2-ff1dd49446ba}" Comment="Provides TC/TM transcoding capabilities to the TC TM Interface" name="Transcoder" is_type="NO" language="Blackbox_C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-if-30" startup_priority="1" instances_min="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{20496e2c-416b-4607-9898-3747a39f807c}" name="tc" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="TC" encoding="ACN"/>
+</Provided_Interface>
+
+<Required_Interface id="{f191bceb-abfe-4e91-81c6-0334a733e3e7}" name="tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Input_Parameter name="p1" type="TM" encoding="ACN"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="Blackbox_C"/>
+    </Implementations>
+</Function>
+
+<Connection id="{712522d0-ab67-4fc0-b0b8-324fb82e7862}" name="Service_Frontend_command____CANOpenMaster_command" required_system_element="NO">
+    <Source iface_id="{18cdc41f-db84-46b3-b802-89a90427160a}" func_name="Service_Frontend" ri_name="command" />
+    <Target iface_id="{18c032f4-39fb-4051-8e5c-668a1f21d94f}" func_name="CANOpenMaster" pi_name="command" />
+</Connection>
+
+<Connection id="{b05a2d38-49c0-4fda-a8ec-c8921702e1f3}" name="CANOpenMaster_pdu_out____CANOpenSlave_pdu_out" required_system_element="NO">
+    <Source iface_id="{076ca0fb-3663-4378-a85c-8b1dc96cb693}" func_name="CANOpenMaster" ri_name="pdu_out" />
+    <Target iface_id="{2ac6b5e2-3a80-4ebf-9f5a-1e752a2c3943}" func_name="CANOpenSlave" pi_name="pdu_out" />
+</Connection>
+
+<Connection id="{b4570b1e-9a13-41e1-9b90-9a446078e1eb}" required_system_element="NO">
+    <Source iface_id="{75d10afa-4f1e-478d-a9d9-609614468574}" func_name="Syncer" ri_name="tick" />
+    <Target iface_id="{cc465677-ac0d-40f7-9ce7-309b52dc79ab}" func_name="Service_Frontend" pi_name="tick" />
+</Connection>
+
+<Connection id="{5d2e6b87-3789-41df-bc1a-42c383c4a56e}" name="Service_Frontend_response____TC_TM_Interface_response" required_system_element="NO">
+    <Source iface_id="{5a6bd997-24dd-4dfb-9408-b73efad61025}" func_name="Service_Frontend" ri_name="response" />
+    <Target iface_id="{637fab93-c813-4a55-bf67-741a9787eb14}" func_name="TC_TM_Interface" pi_name="response" />
+</Connection>
+
+<Connection id="{f16cac1a-1f05-4785-9935-921f7013afb3}" name="TC_TM_Interface_uart_tm____EGSE_IF_uart_tm" required_system_element="NO">
+    <Source iface_id="{66a72590-ab3b-47e7-8630-4e17eecf9d2f}" func_name="TC_TM_Interface" ri_name="uart_tm" />
+    <Target iface_id="{6cfa0662-fe26-43ef-b982-9300b0c8a870}" func_name="EGSE_IF" pi_name="uart_tm" />
+</Connection>
+
+<Connection id="{9e6cfe4d-2389-4c83-8521-3c2cecd0cb37}" name="TC_TM_Interface_tc____Transcoder_tc" required_system_element="NO">
+    <Source iface_id="{5f71eae4-8158-4f92-8e41-bc682c79606a}" func_name="TC_TM_Interface" ri_name="tc" />
+    <Target iface_id="{20496e2c-416b-4607-9898-3747a39f807c}" func_name="Transcoder" pi_name="tc" />
+</Connection>
+
+<Connection id="{ed70b5c2-5a14-45c1-8e06-26de8ee3c3ee}" name="CANOpenSlave_pdu_in____CANOpenMaster_pdu_in" required_system_element="NO">
+    <Source iface_id="{70a44ed1-5a04-4cf4-a89c-01aee3a5b462}" func_name="CANOpenSlave" ri_name="pdu_in" />
+    <Target iface_id="{eb478793-37e3-4798-b90d-521b4de78d02}" func_name="CANOpenMaster" pi_name="pdu_in" />
+</Connection>
+
+<Connection id="{7b9c36d3-5799-45dd-995d-e6f78498ee57}" name="CnC_request____EGSE_Transcoder_request" required_system_element="NO">
+    <Source iface_id="{865b64a2-64a8-490c-9979-7976225c9bc8}" func_name="CnC" ri_name="request" />
+    <Target iface_id="{2d1f16d6-ee97-41d7-b880-94e020bc2de7}" func_name="EGSE_Transcoder" pi_name="request" />
+</Connection>
+
+<Connection id="{a5d89e97-5ef8-4e0f-be41-64a9be0c3d36}" name="EGSE_Transcoder_response____CnC_response" required_system_element="NO">
+    <Source iface_id="{7ad5b041-033d-46f1-822f-bade53b106dc}" func_name="EGSE_Transcoder" ri_name="response" />
+    <Target iface_id="{9eaa1896-1480-4004-9504-20a4f283ab6e}" func_name="CnC" pi_name="response" />
+</Connection>
+
+<Connection id="{ba6d8065-554a-4be2-ad56-96392c2750e9}" name="EGSE_IF_uart_tc____TC_TM_Interface_uart_tc" required_system_element="NO">
+    <Source iface_id="{3cb1d68b-4869-42e8-8268-cc2c734fe323}" func_name="EGSE_IF" ri_name="uart_tc" />
+    <Target iface_id="{53b4399f-40d2-400a-934d-89b2d9e2896c}" func_name="TC_TM_Interface" pi_name="uart_tc" />
+</Connection>
+
+<Connection id="{12a09d36-a18e-4f09-abcc-e60eef9269a4}" required_system_element="NO">
+    <Source iface_id="{183b4fed-2e01-4c3b-b1c2-b7cef58040de}" func_name="CANOpenMaster" ri_name="submit" />
+    <Target iface_id="{a699aba9-2ba1-4c83-baaf-bf8070c834c7}" func_name="DataPool" pi_name="submit" />
+</Connection>
+
+<Connection id="{9497158f-7ce4-4b88-9bc4-b472cca4a508}" name="Service_Frontend_retrieve____DataPool_retrieve" required_system_element="NO">
+    <Source iface_id="{85a186a5-875c-4b3f-b500-8b8ec0d05b64}" func_name="Service_Frontend" ri_name="retrieve" />
+    <Target iface_id="{f97f6edd-8926-436f-b8ff-7de6f00795be}" func_name="DataPool" pi_name="retrieve" />
+</Connection>
+
+<Connection id="{1f4f8841-7147-4986-8710-c10602b71116}" name="SensorArray_submit____DataPool_submit" required_system_element="NO">
+    <Source iface_id="{45589777-faae-40e1-b194-958e5054fbef}" func_name="SensorArray" ri_name="submit" />
+    <Target iface_id="{a699aba9-2ba1-4c83-baaf-bf8070c834c7}" func_name="DataPool" pi_name="submit" />
+</Connection>
+
+<Connection id="{60d938a7-ae09-454c-9b34-bfc8fcbdb84d}" name="TC_TM_Interface_request____Service_Frontend_request" required_system_element="NO">
+    <Source iface_id="{01aa9e2f-fe8a-47e7-80b8-0117405a51d2}" func_name="TC_TM_Interface" ri_name="request" />
+    <Target iface_id="{6d05d0b7-7072-4624-b40d-516772551fe2}" func_name="Service_Frontend" pi_name="request" />
+</Connection>
+
+<Connection id="{f8fe3605-3c57-4030-863c-e142b66f7f3e}" required_system_element="NO">
+    <Source iface_id="{75d10afa-4f1e-478d-a9d9-609614468574}" func_name="Syncer" ri_name="tick" />
+    <Target iface_id="{ff516d61-e2c1-4ec3-8cb1-93529e2c8ae8}" func_name="CANOpenMaster" pi_name="tick" />
+</Connection>
+
+<Connection id="{165fe7a0-3619-40ac-9bae-7e55e83efedf}" name="Transcoder_tm____TC_TM_Interface_tm" required_system_element="NO">
+    <Source iface_id="{f191bceb-abfe-4e91-81c6-0334a733e3e7}" func_name="Transcoder" ri_name="tm" />
+    <Target iface_id="{6dbb6ee2-715e-4967-969e-0afe77cd9b71}" func_name="TC_TM_Interface" pi_name="tm" />
+</Connection>
+
+<Connection id="{9112df55-1270-42a3-af98-5cdc047e2ec3}" name="Syncer_tick____SensorArray_tick" required_system_element="NO">
+    <Source iface_id="{75d10afa-4f1e-478d-a9d9-609614468574}" func_name="Syncer" ri_name="tick" />
+    <Target iface_id="{58453814-b6ce-48e1-b191-de750bcdf69b}" func_name="SensorArray" pi_name="tick" />
+</Connection>
+
+<Connection id="{44f323b7-7204-45aa-a1e1-28f3fd2d8d78}" name="EGSE_Transcoder_tc____EGSE_IF_tc" required_system_element="NO">
+    <Source iface_id="{d31597e3-053d-4dd8-808e-3e65317c8d86}" func_name="EGSE_Transcoder" ri_name="tc" />
+    <Target iface_id="{f892b3ec-f335-4331-8da8-4a0a19b63e20}" func_name="EGSE_IF" pi_name="tc" />
+</Connection>
+
+<Connection id="{5ae7ca8a-a28e-46e9-b2e8-2d8207c03dc2}" required_system_element="NO">
+    <Source iface_id="{375bce03-def1-4662-8ec3-59a6d0093c53}" func_name="Actuation" ri_name="submit" />
+    <Target iface_id="{a699aba9-2ba1-4c83-baaf-bf8070c834c7}" func_name="DataPool" pi_name="submit" />
+</Connection>
+
+<Connection id="{b4edeabb-5cbc-4ceb-a91c-617a02c43634}" name="Service_Frontend_actuate____Actuation_actuate" required_system_element="NO">
+    <Source iface_id="{1306cb03-8d26-43a1-ab47-455e3176e6de}" func_name="Service_Frontend" ri_name="actuate" />
+    <Target iface_id="{d8c64dbd-d585-4c85-803c-6ec3e97046e9}" func_name="Actuation" pi_name="actuate" />
+</Connection>
+
+<Connection id="{7d01a499-6e14-4c3b-9ac0-68a32d1b5d5a}" name="EGSE_IF_tm____EGSE_Transcoder_tm" required_system_element="NO">
+    <Source iface_id="{78c4deed-b125-4c2b-8c80-f12c9692af44}" func_name="EGSE_IF" ri_name="tm" />
+    <Target iface_id="{5c7170b8-72f7-4280-93d6-c7a8651dd0cc}" func_name="EGSE_Transcoder" pi_name="tm" />
+</Connection>
+
+<Connection id="{8afe085b-4313-404c-842a-a703d5cbeb33}" name="EGSE_Transcoder_param____Parameter_Monitor_param" required_system_element="NO">
+    <Source iface_id="{1c207dc1-5d02-4ce7-b737-3eb43997892d}" func_name="EGSE_Transcoder" ri_name="param" />
+    <Target iface_id="{87c857b5-5e01-42b9-be41-14945b4095f9}" func_name="Parameter_Monitor" pi_name="param" />
+</Connection>
+
+<Connection id="{ed9b7227-f5bb-4e1c-a23d-275a73af6fb9}" name="EGSE_Transcoder_tm____Archive_tm" required_system_element="NO">
+    <Source iface_id="{8931d303-94e5-4178-b83f-467dbd212c83}" func_name="EGSE_Transcoder" ri_name="tm" />
+    <Target iface_id="{656c12f4-b5e0-44bf-a5e6-a236c1b79257}" func_name="Archive" pi_name="tm" />
+</Connection>
+
+<Comment id="{8252e12d-3562-42b6-8b2e-9aecbb09be41}" name="This is a demonstration project. Its data is meant to drive the generation of ECSS documentation examples\n" required_system_element="NO">
+</Comment>
+
+<Layer name="default" is_visible="true"/>
+
+</InterfaceView>
\ No newline at end of file

From 131e8b95449e3ce5626c9a58653023d412f92384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Tue, 9 Dec 2025 18:25:56 +0100
Subject: [PATCH 14/28] Improved traceability template

---
 ...-e-st-40c_6_requirement_traceability.tmplt | 21 +++++++++++++++++--
 examples/generate_ecss_demo.sh                |  4 ++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt b/data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
index 6d63c33..8081f61 100644
--- a/data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
+++ b/data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
@@ -15,15 +15,32 @@ for func in interface_view.functions:
     funcs.append(func)
     funcs.extend(get_function_children(func))
 
+# Get functions deployed to the target partition
+target_partition_name = "ASW"
+
+deployed_funcs = []
+target_partition = None
+for node in deployment_view.nodes:
+    for partition in node.partitions:
+        if partition.name == target_partition_name:
+            target_partition = partition
+        
+deployed_func_names = [f.name for f in target_partition.functions]
+for fun in funcs:
+    if fun.name in deployed_func_names:
+        deployed_funcs.append(fun)
+
+
 # Get all requirements
 req_map = {}
-for func in funcs:
+for func in deployed_funcs:
     for req_id in func.requirement_ids:
         if not req_id in req_map:
             req_map[req_id] = []
         req_map[req_id].append(func)
 
 req_ids = sorted(req_map.keys()) # This can be sourced from an external (e.g., JSON) file, if needed
+
 %>
 
 ${"#"} Forward traceability matrix
@@ -42,6 +59,6 @@ ${"#"} Backward traceability matrix
 
 | Component | Requirement IDs |
 | - | - |
-% for func in funcs:
+% for func in deployed_funcs:
 | ${func.name} | ${",".join(func.requirement_ids)} |
 % endfor
diff --git a/examples/generate_ecss_demo.sh b/examples/generate_ecss_demo.sh
index b168264..e038108 100755
--- a/examples/generate_ecss_demo.sh
+++ b/examples/generate_ecss_demo.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 mkdir -p output
-template-processor --verbosity info --iv ../data/requirements.iv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
+template-processor --verbosity info --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_6_requirement_traceability.pdf output/ecss-e-st-40c_6_requirement_traceability.md
-template-processor --verbosity info --iv ../data/simple.iv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
+template-processor --verbosity info --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_4_aspects_of_each_component.pdf output/ecss-e-st-40c_5_4_aspects_of_each_component.md

From bec64234dfb21bad57d670c97740a9069342034c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Tue, 9 Dec 2025 18:27:18 +0100
Subject: [PATCH 15/28] Added missing languages in IV parsing

---
 templateprocessor/iv.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templateprocessor/iv.py b/templateprocessor/iv.py
index e67865f..0c45d64 100644
--- a/templateprocessor/iv.py
+++ b/templateprocessor/iv.py
@@ -37,6 +37,8 @@ class Language(str, Enum):
     CPP = "C++"
     SIMULINK = "Simulink"
     QGenc = "QGenc"
+    GUI = "GUI"
+    BLACKBOX_C = "Blackbox_C"
 
 
 @dataclass

From ab854d6259216aadc7d61b03adcf206d4e0d11c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Tue, 9 Dec 2025 18:58:39 +0100
Subject: [PATCH 16/28] Added custom value support

---
 ...st-40c_5_4_aspects_of_each_component.tmplt | 21 ++++++++++--
 ...-e-st-40c_6_requirement_traceability.tmplt |  3 +-
 examples/generate_ecss_demo.sh                |  4 +--
 templateprocessor/cli.py                      | 32 ++++++++++++++++++-
 templateprocessor/iv.py                       |  1 +
 templateprocessor/ivreader.py                 |  1 +
 templateprocessor/templateinstantiator.py     |  4 +++
 7 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt b/data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
index 04da6d9..46ce4fb 100644
--- a/data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
+++ b/data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
@@ -17,19 +17,34 @@ for func in interface_view.functions:
 
 funcs.sort(key=lambda f: f.name.lower())
 
+# Get functions deployed to the target partition
+target_partition_name = values["TARGET"]
+
+deployed_funcs = []
+target_partition = None
+for node in deployment_view.nodes:
+    for partition in node.partitions:
+        if partition.name == target_partition_name:
+            target_partition = partition
+        
+deployed_func_names = [f.name for f in target_partition.functions]
+for fun in funcs:
+    if fun.name in deployed_func_names:
+        deployed_funcs.append(fun)
+
 %>
 
 The below chapters summarize aspects of each component.
 
-% for func in funcs:
+% for func in deployed_funcs:
 
 ${"#"} ${func.name}
 
 Component Identifier: ${func.name}
 
-Type: TASTE Function
+Type: TASTE ${func.language.value} Function
 
-Purpose: N/A
+Purpose: ${func.comment}
 
 Subordinates: ${",".join([child.name for child in func.nested_functions])}
 
diff --git a/data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt b/data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
index 8081f61..816aee3 100644
--- a/data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
+++ b/data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
@@ -16,7 +16,7 @@ for func in interface_view.functions:
     funcs.extend(get_function_children(func))
 
 # Get functions deployed to the target partition
-target_partition_name = "ASW"
+target_partition_name = values["TARGET"]
 
 deployed_funcs = []
 target_partition = None
@@ -30,7 +30,6 @@ for fun in funcs:
     if fun.name in deployed_func_names:
         deployed_funcs.append(fun)
 
-
 # Get all requirements
 req_map = {}
 for func in deployed_funcs:
diff --git a/examples/generate_ecss_demo.sh b/examples/generate_ecss_demo.sh
index e038108..e57c191 100755
--- a/examples/generate_ecss_demo.sh
+++ b/examples/generate_ecss_demo.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 mkdir -p output
-template-processor --verbosity info --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
+template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_6_requirement_traceability.pdf output/ecss-e-st-40c_6_requirement_traceability.md
-template-processor --verbosity info --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
+template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_4_aspects_of_each_component.pdf output/ecss-e-st-40c_5_4_aspects_of_each_component.md
diff --git a/templateprocessor/cli.py b/templateprocessor/cli.py
index 45d2ffa..ba8dadd 100644
--- a/templateprocessor/cli.py
+++ b/templateprocessor/cli.py
@@ -48,6 +48,13 @@ def parse_arguments() -> argparse.Namespace:
         action="append",
     )
 
+    parser.add_argument(
+        "-v",
+        "--value",
+        help="Input values (formatted as name=value pair, e.g., target=ASW)",
+        action="append",
+    )
+
     parser.add_argument(
         "-t",
         "--template",
@@ -93,6 +100,25 @@ def get_log_level(level_str: str) -> int:
     return log_levels.get(level_str.lower(), logging.WARNING)
 
 
+def get_values_dictionary(values: list[str]) -> dict[str, str]:
+    if not values or not isinstance(values, list):
+        return {}
+    result = {}
+    for pair in values:
+        if pair.count("=") != 1:
+            raise Exception(
+                f"Pair [{pair}] contains incorrect number of name/value separators (=)"
+            )
+        split = pair.split("=")
+        name = split[0].strip()
+        value = split[1].strip()
+        if len(name) == 0:
+            raise Exception(f"Name in [{pair}] is empty")
+        # value can be empty
+        result[name] = value
+    return result
+
+
 def main():
     """Main entry point for the Template Processor CLI."""
 
@@ -104,6 +130,7 @@ def main():
     logging.debug(f"Interface View: {args.iv}")
     logging.debug(f"Deployment View: {args.dv}")
     logging.debug(f"System Objects: {args.sos}")
+    logging.debug(f"Values: {args.value}")
     logging.debug(f"Templates: {args.template}")
     logging.debug(f"Output Directory: {args.output}")
 
@@ -120,8 +147,11 @@ def main():
             logging.debug(f"-SOT name: {name}")
             sos = so_reader.read(sot_file)
             sots[name] = sos
+    logging.info(f"Parsing values from {args.value}")
+    values = get_values_dictionary(args.value)
 
-    instantiator = TemplateInstantiator(iv, dv, sots)
+    logging.info(f"Instantiating the TemplateInstantiator")
+    instantiator = TemplateInstantiator(iv, dv, sots, values)
 
     if args.template:
         for template_file in args.template:
diff --git a/templateprocessor/iv.py b/templateprocessor/iv.py
index 0c45d64..8be8a4e 100644
--- a/templateprocessor/iv.py
+++ b/templateprocessor/iv.py
@@ -125,6 +125,7 @@ class Function:
 
     id: str
     name: str
+    comment: str
     is_type: bool
     language: Optional[Language] = None
     default_implementation: str = "default"
diff --git a/templateprocessor/ivreader.py b/templateprocessor/ivreader.py
index 3557eec..5d4efc7 100644
--- a/templateprocessor/ivreader.py
+++ b/templateprocessor/ivreader.py
@@ -118,6 +118,7 @@ def _parse_function(self, elem: ET.Element) -> Function:
         function = Function(
             id=elem.get("id", ""),
             name=elem.get("name", ""),
+            comment=elem.get("Comment", ""),
             is_type=elem.get("is_type", "NO") == "YES",
             language=(
                 Language(elem.get("language", "")) if elem.get("language") else None
diff --git a/templateprocessor/templateinstantiator.py b/templateprocessor/templateinstantiator.py
index 60bfb9f..d2a32b2 100644
--- a/templateprocessor/templateinstantiator.py
+++ b/templateprocessor/templateinstantiator.py
@@ -17,6 +17,7 @@ class TemplateInstantiator:
     """
 
     system_object_types: Dict[str, SystemObjectType] = dict()
+    values: Dict[str, str] = dict()
     interface_view: InterfaceView
     deployment_view: DeploymentView
 
@@ -25,10 +26,12 @@ def __init__(
         interface_view: InterfaceView,
         deployment_view: DeploymentView,
         system_object_types: Dict[str, SystemObjectType],
+        values: Dict[str, str],
     ):
         self.system_object_types = system_object_types
         self.interface_view = interface_view
         self.deployment_view = deployment_view
+        self.values = values
 
     def instantiate(self, template: str, context_directory: str) -> str:
         mako_template = Template(text=template, module_directory=context_directory)
@@ -37,6 +40,7 @@ def instantiate(self, template: str, context_directory: str) -> str:
             "system_object_types": self.system_object_types,
             "interface_view": self.interface_view,
             "deployment_view": self.deployment_view,
+            "values": self.values,
         }
 
         instantiated_text = str(mako_template.render(**context))

From dd16df951d53f6bba425bab2f6a9dd962bc44c40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Wed, 10 Dec 2025 14:43:00 +0100
Subject: [PATCH 17/28] Added dynamic architecture template and improved
 interface data model

---
 ...0c_4_2_software_dynamic_architecture.tmplt |  75 ++-
 examples/demo-project/interfaceview.ui.xml    | 190 ++++----
 examples/demo-project/interfaceview.xml       | 444 +++++++++---------
 examples/generate_ecss_demo.sh                |   2 +
 templateprocessor/iv.py                       |   1 +
 templateprocessor/ivreader.py                 |   1 +
 6 files changed, 395 insertions(+), 318 deletions(-)

diff --git a/data/ecss-template/ecss-e-st-40c_4_2_software_dynamic_architecture.tmplt b/data/ecss-template/ecss-e-st-40c_4_2_software_dynamic_architecture.tmplt
index 41e7ba6..adbfb7b 100644
--- a/data/ecss-template/ecss-e-st-40c_4_2_software_dynamic_architecture.tmplt
+++ b/data/ecss-template/ecss-e-st-40c_4_2_software_dynamic_architecture.tmplt
@@ -1 +1,74 @@
-TODO real-time constraints
\ No newline at end of file
+<%
+## Data Initialization
+# Get all functions
+
+funcs = []
+def get_function_children(func):
+    result = []
+    if func.nested_functions:
+        for nested in func.nested_functions:
+            result.append(nested)
+            result.extend(get_function_children(nested))
+    return result
+
+for func in interface_view.functions:
+    funcs.append(func)
+    funcs.extend(get_function_children(func))
+
+funcs.sort(key=lambda f: f.name.lower())
+
+# Get functions deployed to the target partition
+target_partition_name = values["TARGET"]
+
+deployed_funcs = []
+target_partition = None
+for node in deployment_view.nodes:
+    for partition in node.partitions:
+        if partition.name == target_partition_name:
+            target_partition = partition
+        
+deployed_func_names = [f.name for f in target_partition.functions]
+for fun in funcs:
+    if fun.name in deployed_func_names:
+        deployed_funcs.append(fun)
+
+# Get all threads
+threads = []
+for func in deployed_funcs:
+    for pi in func.provided_interfaces:
+        if pi.kind.value == "Sporadic" or pi.kind.value == "Cyclic":
+            threads.append((func, pi))
+
+%>
+
+
+The list below summarizes all threads of the user components.
+% for (func, pi) in threads:
+
+${"##"} [${pi.kind.value}] ${func.name}::${pi.name}
+
+- Description: ${pi.comment}
+
+- Stack size: ${pi.stack_size}
+
+% if pi.kind.value == "Sporadic":
+- Queue size: ${pi.queue_size}
+
+% endif
+- Priority: ${pi.priority}
+
+% if pi.kind.value == "Cyclic":
+- Period: ${pi.period}
+
+- Dispatch offset : ${pi.dispatch_offset}
+%endif
+
+% if pi.wcet is not None and pi.wcet != 0:
+- WCET: ${pi.wcet}
+
+%endif
+% if pi.miat is not None and pi.miat != 0:
+- MIAT: ${pi.miat} 
+
+% endif
+% endfor
diff --git a/examples/demo-project/interfaceview.ui.xml b/examples/demo-project/interfaceview.ui.xml
index c49ca8f..32ec9c8 100644
--- a/examples/demo-project/interfaceview.ui.xml
+++ b/examples/demo-project/interfaceview.ui.xml
@@ -1,52 +1,26 @@
-<UI version="1.0" ><Entity id="{5b2b28b1-566c-45a2-95c4-81c8b9c53882}"><Taste coordinates="-49000 6000 -29000 14000">
+<UI version="1.0" ><Entity id="{9e6cfe4d-2389-4c83-8521-3c2cecd0cb37}"><Taste coordinates="64500 9000 66600 9000 68700 8800">
 </Taste>
-</Entity><Entity id="{9eaa1896-1480-4004-9504-20a4f283ab6e}"><Taste coordinates="-29000 10800">
-</Taste>
-</Entity><Entity id="{865b64a2-64a8-490c-9979-7976225c9bc8}"><Taste coordinates="-29000 8000">
-</Taste>
-</Entity><Entity id="{712522d0-ab67-4fc0-b0b8-324fb82e7862}"><Taste coordinates="93000 -15500 93000 -26000 101700 -26000">
-</Taste>
-</Entity><Entity id="{22dd1137-c442-4169-9889-f8aa23498e44}"><Taste coordinates="102000 6000 122000 14000">
-</Taste>
-</Entity><Entity id="{d8c64dbd-d585-4c85-803c-6ec3e97046e9}"><Taste coordinates="102000 10000">
-</Taste>
-</Entity><Entity id="{375bce03-def1-4662-8ec3-59a6d0093c53}"><Taste coordinates="122000 10000">
-</Taste>
-</Entity><Entity id="{b05a2d38-49c0-4fda-a8ec-c8921702e1f3}"><Taste coordinates="106900 -30500 106900 -34100 106500 -36100 106500 -37700">
-</Taste>
-</Entity><Entity id="{b4570b1e-9a13-41e1-9b90-9a446078e1eb}"><Taste coordinates="98500 25000 100400 25000 100400 19400 100400 4400 88900 4400 88900 300">
-</Taste>
-</Entity><Entity id="{5d2e6b87-3789-41df-bc1a-42c383c4a56e}"><Taste coordinates="77500 -6000 70900 -6000 64300 -5800">
-</Taste>
-</Entity><Entity id="{21c6cdd2-9450-4ebe-bebd-9a7d2f55045a}"><Taste coordinates="110000 -14000 130000 -6000">
-</Taste>
-</Entity><Entity id="{a699aba9-2ba1-4c83-baaf-bf8070c834c7}"><Taste coordinates="130000 -10000">
-</Taste>
-</Entity><Entity id="{f97f6edd-8926-436f-b8ff-7de6f00795be}"><Taste coordinates="110000 -8900">
-</Taste>
-</Entity><Entity id="{e4372e37-10f5-4988-8140-d3445cb68a2b}"><Taste coordinates="102000 -46000 122000 -38000">
-</Taste>
-</Entity><Entity id="{2ac6b5e2-3a80-4ebf-9f5a-1e752a2c3943}"><Taste coordinates="106500 -38000">
+</Entity><Entity id="{ba6d8065-554a-4be2-ad56-96392c2750e9}"><Taste coordinates="30500 8000 37100 8000 43700 7700">
 </Taste>
-</Entity><Entity id="{70a44ed1-5a04-4cf4-a89c-01aee3a5b462}"><Taste coordinates="116000 -38000">
+</Entity><Entity id="{a5d89e97-5ef8-4e0f-be41-64a9be0c3d36}"><Taste coordinates="-15500 11000 -22100 11000 -28700 10800">
 </Taste>
-</Entity><Entity id="{f16cac1a-1f05-4785-9935-921f7013afb3}"><Taste coordinates="43500 11000 36900 11000 30300 10800">
+</Entity><Entity id="{7b9c36d3-5799-45dd-995d-e6f78498ee57}"><Taste coordinates="-28500 8000 -15300 8000">
 </Taste>
-</Entity><Entity id="{9e6cfe4d-2389-4c83-8521-3c2cecd0cb37}"><Taste coordinates="64500 9000 66600 9000 68700 8800">
+</Entity><Entity id="{ed70b5c2-5a14-45c1-8e06-26de8ee3c3ee}"><Taste coordinates="116000 -37500 116000 -33900 115800 -31900 115800 -30300">
 </Taste>
-</Entity><Entity id="{f4a308ae-34a0-45a6-83df-122c8b4539c0}"><Taste RootCoordinates="0 0 115400 62300" coordinates="78000 -15000 98000 0">
+</Entity><Entity id="{f4a308ae-34a0-45a6-83df-122c8b4539c0}"><Taste coordinates="78000 -15000 98000 0" RootCoordinates="0 0 115400 62300">
 </Taste>
-</Entity><Entity id="{6d05d0b7-7072-4624-b40d-516772551fe2}"><Taste RootCoordinates="0 15800" coordinates="78000 -11200">
+</Entity><Entity id="{6d05d0b7-7072-4624-b40d-516772551fe2}"><Taste coordinates="78000 -11200" RootCoordinates="0 15800">
 </Taste>
-</Entity><Entity id="{cc465677-ac0d-40f7-9ce7-309b52dc79ab}"><Taste RootCoordinates="62900 62300" coordinates="88900 0">
+</Entity><Entity id="{cc465677-ac0d-40f7-9ce7-309b52dc79ab}"><Taste coordinates="88900 0" RootCoordinates="62900 62300">
 </Taste>
-</Entity><Entity id="{5a6bd997-24dd-4dfb-9408-b73efad61025}"><Taste RootCoordinates="0 38000" coordinates="78000 -6000">
+</Entity><Entity id="{5a6bd997-24dd-4dfb-9408-b73efad61025}"><Taste coordinates="78000 -6000" RootCoordinates="0 38000">
 </Taste>
-</Entity><Entity id="{85a186a5-875c-4b3f-b500-8b8ec0d05b64}"><Taste RootCoordinates="115400 24900" coordinates="98000 -9000">
+</Entity><Entity id="{85a186a5-875c-4b3f-b500-8b8ec0d05b64}"><Taste coordinates="98000 -9000" RootCoordinates="115400 24900">
 </Taste>
-</Entity><Entity id="{1306cb03-8d26-43a1-ab47-455e3176e6de}"><Taste RootCoordinates="86600 62300" coordinates="93000 0">
+</Entity><Entity id="{1306cb03-8d26-43a1-ab47-455e3176e6de}"><Taste coordinates="93000 0" RootCoordinates="86600 62300">
 </Taste>
-</Entity><Entity id="{18cdc41f-db84-46b3-b802-89a90427160a}"><Taste RootCoordinates="86600 0" coordinates="93000 -15000">
+</Entity><Entity id="{18cdc41f-db84-46b3-b802-89a90427160a}"><Taste coordinates="93000 -15000" RootCoordinates="86600 0">
 </Taste>
 </Entity><Entity id="{92088f77-1325-475d-a87e-bb434515f2f5}"><Taste coordinates="8000 12000 22000 23000">
 </Taste>
@@ -58,26 +32,26 @@
 </Taste>
 </Entity><Entity id="{f53da581-e5aa-432a-abee-c294e277cf7a}"><Taste coordinates="48000 5000 68000 13000">
 </Taste>
+</Entity><Entity id="{4d8a8987-c894-411e-82d2-47aa466cee5c}"><Taste coordinates="48000 6800">
+</Taste>
 </Entity><Entity id="{b1186962-b312-4b4f-b23a-d69f6c305d02}"><Taste coordinates="68000 10200">
 </Taste>
 </Entity><Entity id="{eaed407c-2b15-4f1d-a579-ee29c3108d28}"><Taste coordinates="48000 11000">
 </Taste>
-</Entity><Entity id="{4d8a8987-c894-411e-82d2-47aa466cee5c}"><Taste coordinates="48000 6800">
-</Taste>
 </Entity><Entity id="{ea607104-c20f-4d90-a25f-451784e72bb1}"><Taste coordinates="68000 6200">
 </Taste>
 </Entity><Entity id="{dc50901a-61b8-48a5-9b56-cb696093e641}"><Taste coordinates="48000 33000 68000 41000">
 </Taste>
 </Entity><Entity id="{8286eb57-6fa5-4727-b31f-aba247f62dd8}"><Taste coordinates="62500 41000">
 </Taste>
+</Entity><Entity id="{75775243-5268-42ff-996f-10db5e41eb06}"><Taste coordinates="48000 33500">
+</Taste>
 </Entity><Entity id="{709a3794-e82c-458a-b966-4bc2c49ed035}"><Taste coordinates="68000 39000">
 </Taste>
 </Entity><Entity id="{e7c85212-ddcb-4a8b-a9dc-fa3207293a46}"><Taste coordinates="68000 35000">
 </Taste>
 </Entity><Entity id="{0d401ca5-1d03-4b80-b387-4bfd37f13d29}"><Taste coordinates="48000 38000">
 </Taste>
-</Entity><Entity id="{75775243-5268-42ff-996f-10db5e41eb06}"><Taste coordinates="48000 33500">
-</Taste>
 </Entity><Entity id="{22bfc76d-6efc-414d-b2b4-7999f946960c}"><Taste coordinates="65200 33000">
 </Taste>
 </Entity><Entity id="{f968af78-1544-4fc8-8f95-025984b8ea7c}"><Taste coordinates="62900 61800 62900 51500 62500 41300">
@@ -104,115 +78,141 @@
 </Taste>
 </Entity><Entity id="{8252e12d-3562-42b6-8b2e-9aecbb09be41}"><Taste coordinates="-49000 -38000 -8000 -22000">
 </Taste>
-</Entity><Entity id="{ed70b5c2-5a14-45c1-8e06-26de8ee3c3ee}"><Taste coordinates="116000 -37500 116000 -33900 115800 -31900 115800 -30300">
+</Entity><Entity id="{b05a2d38-49c0-4fda-a8ec-c8921702e1f3}"><Taste coordinates="106900 -30500 106900 -34100 106500 -36100 106500 -37700">
 </Taste>
-</Entity><Entity id="{7b9c36d3-5799-45dd-995d-e6f78498ee57}"><Taste coordinates="-28500 8000 -15300 8000">
+</Entity><Entity id="{712522d0-ab67-4fc0-b0b8-324fb82e7862}"><Taste coordinates="93000 -15500 93000 -26000 101700 -26000">
 </Taste>
-</Entity><Entity id="{a5d89e97-5ef8-4e0f-be41-64a9be0c3d36}"><Taste coordinates="-15500 11000 -22100 11000 -28700 10800">
+</Entity><Entity id="{22dd1137-c442-4169-9889-f8aa23498e44}"><Taste coordinates="102000 6000 122000 14000">
 </Taste>
-</Entity><Entity id="{ba6d8065-554a-4be2-ad56-96392c2750e9}"><Taste coordinates="30500 8000 37100 8000 43700 7700">
+</Entity><Entity id="{d8c64dbd-d585-4c85-803c-6ec3e97046e9}"><Taste coordinates="102000 10000">
 </Taste>
-</Entity><Entity id="{7a8a0847-c06e-4eca-8b97-2380811c31ab}"><Taste coordinates="-15000 -17000 5000 14000">
+</Entity><Entity id="{375bce03-def1-4662-8ec3-59a6d0093c53}"><Taste coordinates="122000 10000">
 </Taste>
-</Entity><Entity id="{5c7170b8-72f7-4280-93d6-c7a8651dd0cc}"><Taste coordinates="5000 7900">
+</Entity><Entity id="{5b2b28b1-566c-45a2-95c4-81c8b9c53882}"><Taste coordinates="-49000 6000 -29000 14000">
 </Taste>
-</Entity><Entity id="{2d1f16d6-ee97-41d7-b880-94e020bc2de7}"><Taste coordinates="-15000 8000">
+</Entity><Entity id="{9eaa1896-1480-4004-9504-20a4f283ab6e}"><Taste coordinates="-29000 10800">
 </Taste>
-</Entity><Entity id="{d31597e3-053d-4dd8-808e-3e65317c8d86}"><Taste coordinates="5000 11000">
+</Entity><Entity id="{865b64a2-64a8-490c-9979-7976225c9bc8}"><Taste coordinates="-29000 8000">
 </Taste>
-</Entity><Entity id="{8931d303-94e5-4178-b83f-467dbd212c83}"><Taste coordinates="-15000 -13000">
+</Entity><Entity id="{f16cac1a-1f05-4785-9935-921f7013afb3}"><Taste coordinates="43500 11000 36900 11000 30300 10800">
 </Taste>
-</Entity><Entity id="{7ad5b041-033d-46f1-822f-bade53b106dc}"><Taste coordinates="-15000 11000">
+</Entity><Entity id="{e4372e37-10f5-4988-8140-d3445cb68a2b}"><Taste coordinates="102000 -46000 122000 -38000">
 </Taste>
-</Entity><Entity id="{1c207dc1-5d02-4ce7-b737-3eb43997892d}"><Taste coordinates="-15000 -1000">
+</Entity><Entity id="{2ac6b5e2-3a80-4ebf-9f5a-1e752a2c3943}"><Taste coordinates="106500 -38000">
 </Taste>
-</Entity><Entity id="{386b158a-a083-41da-8d81-b2ff569d64f2}"><Taste coordinates="44000 -15000 64000 14000">
+</Entity><Entity id="{70a44ed1-5a04-4cf4-a89c-01aee3a5b462}"><Taste coordinates="116000 -38000">
 </Taste>
-</Entity><Entity id="{53b4399f-40d2-400a-934d-89b2d9e2896c}"><Taste coordinates="44000 7700">
+</Entity><Entity id="{21c6cdd2-9450-4ebe-bebd-9a7d2f55045a}"><Taste coordinates="110000 -14000 130000 -6000">
 </Taste>
-</Entity><Entity id="{6dbb6ee2-715e-4967-969e-0afe77cd9b71}"><Taste coordinates="64000 12200">
+</Entity><Entity id="{a699aba9-2ba1-4c83-baaf-bf8070c834c7}"><Taste coordinates="130000 -10000">
 </Taste>
-</Entity><Entity id="{637fab93-c813-4a55-bf67-741a9787eb14}"><Taste coordinates="64000 -5800">
+</Entity><Entity id="{f97f6edd-8926-436f-b8ff-7de6f00795be}"><Taste coordinates="110000 -8900">
 </Taste>
-</Entity><Entity id="{66a72590-ab3b-47e7-8630-4e17eecf9d2f}"><Taste coordinates="44000 11000">
+</Entity><Entity id="{b4570b1e-9a13-41e1-9b90-9a446078e1eb}"><Taste coordinates="98500 25000 100400 25000 100400 19400 100400 4400 88900 4400 88900 300">
 </Taste>
-</Entity><Entity id="{5f71eae4-8158-4f92-8e41-bc682c79606a}"><Taste coordinates="64000 9000">
+</Entity><Entity id="{9b3559ac-7da4-4df7-9f17-22e974091bbf}"><Taste coordinates="134000 6000 154000 14000">
 </Taste>
-</Entity><Entity id="{01aa9e2f-fe8a-47e7-80b8-0117405a51d2}"><Taste RootCoordinates="0 15800" coordinates="64000 -11100">
+</Entity><Entity id="{58453814-b6ce-48e1-b191-de750bcdf69b}"><Taste coordinates="144000 14000">
 </Taste>
-</Entity><Entity id="{ed8a7364-04a5-4983-8ac1-e58403f6a041}"><Taste coordinates="102000 -30000 122000 -22000">
+</Entity><Entity id="{45589777-faae-40e1-b194-958e5054fbef}"><Taste coordinates="144600 6000">
 </Taste>
-</Entity><Entity id="{eb478793-37e3-4798-b90d-521b4de78d02}"><Taste coordinates="115800 -30000">
+</Entity><Entity id="{5d2e6b87-3789-41df-bc1a-42c383c4a56e}"><Taste coordinates="77500 -6000 70900 -6000 64300 -5800">
 </Taste>
-</Entity><Entity id="{18c032f4-39fb-4051-8e5c-668a1f21d94f}"><Taste coordinates="102000 -26000">
+</Entity><Entity id="{b4edeabb-5cbc-4ceb-a91c-617a02c43634}"><Taste coordinates="93000 500 93000 10000 101700 10000">
 </Taste>
-</Entity><Entity id="{ff516d61-e2c1-4ec3-8cb1-93529e2c8ae8}"><Taste coordinates="118600 -22000">
+</Entity><Entity id="{5ae7ca8a-a28e-46e9-b2e8-2d8207c03dc2}"><Taste coordinates="122500 10000 131900 10000 131900 -10000 130300 -10000">
 </Taste>
-</Entity><Entity id="{183b4fed-2e01-4c3b-b1c2-b7cef58040de}"><Taste coordinates="122000 -26000">
+</Entity><Entity id="{ed9b7227-f5bb-4e1c-a23d-275a73af6fb9}"><Taste coordinates="-15500 -13000 -28700 -13000">
 </Taste>
-</Entity><Entity id="{076ca0fb-3663-4378-a85c-8b1dc96cb693}"><Taste coordinates="106900 -30000">
+</Entity><Entity id="{8afe085b-4313-404c-842a-a703d5cbeb33}"><Taste coordinates="-15500 -1000 -28700 -1000">
+</Taste>
+</Entity><Entity id="{7d01a499-6e14-4c3b-9ac0-68a32d1b5d5a}"><Taste coordinates="9500 8000 7400 8000 5300 7900">
+</Taste>
+</Entity><Entity id="{17485a96-8307-419b-b49b-e979da978882}"><Taste coordinates="-49000 -17000 -29000 -9000">
+</Taste>
+</Entity><Entity id="{656c12f4-b5e0-44bf-a5e6-a236c1b79257}"><Taste coordinates="-29000 -13000">
+</Taste>
+</Entity><Entity id="{b3529bf4-7338-4df0-96b2-ff1dd49446ba}"><Taste coordinates="69000 6000 89000 14000">
+</Taste>
+</Entity><Entity id="{20496e2c-416b-4607-9898-3747a39f807c}"><Taste coordinates="69000 8800">
+</Taste>
+</Entity><Entity id="{e3d3cf30-d761-47bc-aae8-e1a915926bad}"><Taste coordinates="69000 12000">
+</Taste>
+</Entity><Entity id="{a88425f6-631d-4fc2-b9f2-edc02d2ac033}"><Taste coordinates="64500 12100 66600 12100 68700 12000">
+</Taste>
+</Entity><Entity id="{1f4f8841-7147-4986-8710-c10602b71116}"><Taste coordinates="144600 5500 144600 -10000 130300 -10000">
+</Taste>
+</Entity><Entity id="{9497158f-7ce4-4b88-9bc4-b472cca4a508}"><Taste coordinates="98500 -9000 104100 -9000 109700 -8900">
+</Taste>
+</Entity><Entity id="{12a09d36-a18e-4f09-abcc-e60eef9269a4}"><Taste coordinates="122500 -26000 131300 -26000 131300 -10000 130300 -10000">
 </Taste>
 </Entity><Entity id="{d93bbc74-4768-4145-b307-331b149dc80a}"><Taste coordinates="78000 21000 98000 29000">
 </Taste>
 </Entity><Entity id="{6b86023b-de28-451f-96a1-8f0d92615857}"><Taste coordinates="80000 21000">
 </Taste>
-</Entity><Entity id="{75d10afa-4f1e-478d-a9d9-609614468574}"><Taste RootCoordinates="62900 62300" coordinates="98000 25000">
+</Entity><Entity id="{75d10afa-4f1e-478d-a9d9-609614468574}"><Taste coordinates="98000 25000" RootCoordinates="62900 62300">
 </Taste>
-</Entity><Entity id="{12a09d36-a18e-4f09-abcc-e60eef9269a4}"><Taste coordinates="122500 -26000 131300 -26000 131300 -10000 130300 -10000">
+</Entity><Entity id="{386b158a-a083-41da-8d81-b2ff569d64f2}"><Taste coordinates="44000 -15000 64000 14000">
 </Taste>
-</Entity><Entity id="{9497158f-7ce4-4b88-9bc4-b472cca4a508}"><Taste coordinates="98500 -9000 104100 -9000 109700 -8900">
+</Entity><Entity id="{53b4399f-40d2-400a-934d-89b2d9e2896c}"><Taste coordinates="44000 7700">
 </Taste>
-</Entity><Entity id="{1f4f8841-7147-4986-8710-c10602b71116}"><Taste coordinates="144600 5500 144600 -10000 130300 -10000">
+</Entity><Entity id="{637fab93-c813-4a55-bf67-741a9787eb14}"><Taste coordinates="64000 -5800">
 </Taste>
-</Entity><Entity id="{60d938a7-ae09-454c-9b34-bfc8fcbdb84d}"><Taste coordinates="64500 -11100 71100 -11100 77700 -11200">
+</Entity><Entity id="{66a72590-ab3b-47e7-8630-4e17eecf9d2f}"><Taste coordinates="44000 11000">
 </Taste>
-</Entity><Entity id="{f8fe3605-3c57-4030-863c-e142b66f7f3e}"><Taste coordinates="98500 25000 100100 25000 100100 4400 100400 -15600 118600 -15600 118600 -21700">
+</Entity><Entity id="{5f71eae4-8158-4f92-8e41-bc682c79606a}"><Taste coordinates="64000 9000">
 </Taste>
-</Entity><Entity id="{165fe7a0-3619-40ac-9bae-7e55e83efedf}"><Taste coordinates="68500 12100 66400 12100 64300 12200">
+</Entity><Entity id="{01aa9e2f-fe8a-47e7-80b8-0117405a51d2}"><Taste coordinates="64000 -11100" RootCoordinates="0 15800">
 </Taste>
-</Entity><Entity id="{9112df55-1270-42a3-af98-5cdc047e2ec3}"><Taste coordinates="98500 25000 144000 25000 144000 14300">
+</Entity><Entity id="{e458de7f-a099-444f-969c-c8bed882e9d3}"><Taste coordinates="64000 12100">
 </Taste>
-</Entity><Entity id="{98fbadbc-3384-4ec1-8c68-d3ee594d28ee}"><Taste coordinates="-49000 -5000 -29000 3000">
+</Entity><Entity id="{ed8a7364-04a5-4983-8ac1-e58403f6a041}"><Taste coordinates="102000 -30000 122000 -22000">
 </Taste>
-</Entity><Entity id="{87c857b5-5e01-42b9-be41-14945b4095f9}"><Taste coordinates="-29000 -1000">
+</Entity><Entity id="{eb478793-37e3-4798-b90d-521b4de78d02}"><Taste coordinates="115800 -30000">
 </Taste>
-</Entity><Entity id="{44f323b7-7204-45aa-a1e1-28f3fd2d8d78}"><Taste coordinates="5500 11000 7600 11000 9700 11100">
+</Entity><Entity id="{18c032f4-39fb-4051-8e5c-668a1f21d94f}"><Taste coordinates="102000 -26000">
 </Taste>
-</Entity><Entity id="{96c9e808-95df-4c8b-b5b6-349806fad470}"><Taste coordinates="10000 6000 30000 14000">
+</Entity><Entity id="{ff516d61-e2c1-4ec3-8cb1-93529e2c8ae8}"><Taste coordinates="118600 -22000">
 </Taste>
-</Entity><Entity id="{f892b3ec-f335-4331-8da8-4a0a19b63e20}"><Taste coordinates="10000 11100">
+</Entity><Entity id="{183b4fed-2e01-4c3b-b1c2-b7cef58040de}"><Taste coordinates="122000 -26000">
 </Taste>
-</Entity><Entity id="{6cfa0662-fe26-43ef-b982-9300b0c8a870}"><Taste coordinates="30000 10800">
+</Entity><Entity id="{076ca0fb-3663-4378-a85c-8b1dc96cb693}"><Taste coordinates="106900 -30000">
 </Taste>
-</Entity><Entity id="{78c4deed-b125-4c2b-8c80-f12c9692af44}"><Taste coordinates="10000 8000">
+</Entity><Entity id="{7a8a0847-c06e-4eca-8b97-2380811c31ab}"><Taste coordinates="-15000 -17000 5000 14000">
 </Taste>
-</Entity><Entity id="{3cb1d68b-4869-42e8-8268-cc2c734fe323}"><Taste coordinates="30000 8000">
+</Entity><Entity id="{5c7170b8-72f7-4280-93d6-c7a8651dd0cc}"><Taste coordinates="5000 7900">
 </Taste>
-</Entity><Entity id="{5ae7ca8a-a28e-46e9-b2e8-2d8207c03dc2}"><Taste coordinates="122500 10000 131900 10000 131900 -10000 130300 -10000">
+</Entity><Entity id="{2d1f16d6-ee97-41d7-b880-94e020bc2de7}"><Taste coordinates="-15000 8000">
 </Taste>
-</Entity><Entity id="{b4edeabb-5cbc-4ceb-a91c-617a02c43634}"><Taste coordinates="93000 500 93000 10000 101700 10000">
+</Entity><Entity id="{d31597e3-053d-4dd8-808e-3e65317c8d86}"><Taste coordinates="5000 11000">
 </Taste>
-</Entity><Entity id="{9b3559ac-7da4-4df7-9f17-22e974091bbf}"><Taste coordinates="134000 6000 154000 14000">
+</Entity><Entity id="{8931d303-94e5-4178-b83f-467dbd212c83}"><Taste coordinates="-15000 -13000">
 </Taste>
-</Entity><Entity id="{58453814-b6ce-48e1-b191-de750bcdf69b}"><Taste coordinates="144000 14000">
+</Entity><Entity id="{7ad5b041-033d-46f1-822f-bade53b106dc}"><Taste coordinates="-15000 11000">
 </Taste>
-</Entity><Entity id="{45589777-faae-40e1-b194-958e5054fbef}"><Taste coordinates="144600 6000">
+</Entity><Entity id="{1c207dc1-5d02-4ce7-b737-3eb43997892d}"><Taste coordinates="-15000 -1000">
 </Taste>
-</Entity><Entity id="{17485a96-8307-419b-b49b-e979da978882}"><Taste coordinates="-49000 -17000 -29000 -9000">
+</Entity><Entity id="{96c9e808-95df-4c8b-b5b6-349806fad470}"><Taste coordinates="10000 6000 30000 14000">
 </Taste>
-</Entity><Entity id="{656c12f4-b5e0-44bf-a5e6-a236c1b79257}"><Taste coordinates="-29000 -13000">
+</Entity><Entity id="{f892b3ec-f335-4331-8da8-4a0a19b63e20}"><Taste coordinates="10000 11100">
 </Taste>
-</Entity><Entity id="{b3529bf4-7338-4df0-96b2-ff1dd49446ba}"><Taste coordinates="69000 6000 89000 14000">
+</Entity><Entity id="{6cfa0662-fe26-43ef-b982-9300b0c8a870}"><Taste coordinates="30000 10800">
 </Taste>
-</Entity><Entity id="{20496e2c-416b-4607-9898-3747a39f807c}"><Taste coordinates="69000 8800">
+</Entity><Entity id="{78c4deed-b125-4c2b-8c80-f12c9692af44}"><Taste coordinates="10000 8000">
 </Taste>
-</Entity><Entity id="{f191bceb-abfe-4e91-81c6-0334a733e3e7}"><Taste coordinates="69000 12100">
+</Entity><Entity id="{3cb1d68b-4869-42e8-8268-cc2c734fe323}"><Taste coordinates="30000 8000">
 </Taste>
-</Entity><Entity id="{7d01a499-6e14-4c3b-9ac0-68a32d1b5d5a}"><Taste coordinates="9500 8000 7400 8000 5300 7900">
+</Entity><Entity id="{98fbadbc-3384-4ec1-8c68-d3ee594d28ee}"><Taste coordinates="-49000 -5000 -29000 3000">
 </Taste>
-</Entity><Entity id="{8afe085b-4313-404c-842a-a703d5cbeb33}"><Taste coordinates="-15500 -1000 -28700 -1000">
+</Entity><Entity id="{87c857b5-5e01-42b9-be41-14945b4095f9}"><Taste coordinates="-29000 -1000">
 </Taste>
-</Entity><Entity id="{ed9b7227-f5bb-4e1c-a23d-275a73af6fb9}"><Taste coordinates="-15500 -13000 -28700 -13000">
+</Entity><Entity id="{9112df55-1270-42a3-af98-5cdc047e2ec3}"><Taste coordinates="98500 25000 144000 25000 144000 14300">
+</Taste>
+</Entity><Entity id="{44f323b7-7204-45aa-a1e1-28f3fd2d8d78}"><Taste coordinates="5500 11000 7600 11000 9700 11100">
+</Taste>
+</Entity><Entity id="{f8fe3605-3c57-4030-863c-e142b66f7f3e}"><Taste coordinates="98500 25000 100100 25000 100100 4400 100400 -15600 118600 -15600 118600 -21700">
+</Taste>
+</Entity><Entity id="{60d938a7-ae09-454c-9b34-bfc8fcbdb84d}"><Taste coordinates="64500 -11100 71100 -11100 77700 -11200">
 </Taste>
 </Entity>
 </UI>
\ No newline at end of file
diff --git a/examples/demo-project/interfaceview.xml b/examples/demo-project/interfaceview.xml
index ba2c2e2..4e7d949 100644
--- a/examples/demo-project/interfaceview.xml
+++ b/examples/demo-project/interfaceview.xml
@@ -1,116 +1,50 @@
 <InterfaceView version="1.3" asn1file="demo-project.acn" UiFile="interfaceview.ui.xml" modifierHash="383508e" requirementsURL="https://gitlab.com/n7space/demo-project-requirements" reviewsURL="https://gitlab.com/n7space/demo-project-requirements">
-<Function id="{5b2b28b1-566c-45a2-95c4-81c8b9c53882}" name="CnC" is_type="NO" language="GUI" default_implementation="default" fixed_system_element="NO" required_system_element="NO" startup_priority="1" instances_min="1" instances_max="1">
+<Function id="{f4a308ae-34a0-45a6-83df-122c8b4539c0}" Comment="Handles the command and control functions" name="Service_Frontend" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-des-10,dp-fun-10,dp-fun-20" instances_min="1" startup_priority="1" instances_max="1">
     <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{9eaa1896-1480-4004-9504-20a4f283ab6e}" name="response" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
-    <Input_Parameter name="p1" type="Response" encoding="NATIVE"/>
-</Provided_Interface>
-
-<Required_Interface id="{865b64a2-64a8-490c-9979-7976225c9bc8}" name="request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Provided_Interface id="{6d05d0b7-7072-4624-b40d-516772551fe2}" Comment="Transmit unencoded Request data" name="request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
-    <Property name="Taste::InheritPI" value="true"/>
-    <Property name="Taste::Autonamed" value="false"/>
-</Required_Interface>
-
-    <Implementations>
-        <Implementation name="default" language="GUI"/>
-    </Implementations>
-</Function>
-
-<Function id="{22dd1137-c442-4169-9889-f8aa23498e44}" Comment="Actuates actuators" name="Actuation" is_type="NO" language="Ada" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-fun-50" startup_priority="1" instances_min="1" instances_max="1">
-    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{d8c64dbd-d585-4c85-803c-6ec3e97046e9}" name="actuate" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
-    <Input_Parameter name="p1" type="Cmd" encoding="NATIVE"/>
 </Provided_Interface>
 
-<Required_Interface id="{375bce03-def1-4662-8ec3-59a6d0093c53}" name="submit" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
-    <Input_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
-    <Property name="Taste::InheritPI" value="true"/>
-    <Property name="Taste::Autonamed" value="true"/>
-</Required_Interface>
-
-    <Implementations>
-        <Implementation name="default" language="Ada"/>
-    </Implementations>
-</Function>
-
-<Function id="{21c6cdd2-9450-4ebe-bebd-9a7d2f55045a}" Comment="Stores on-board parameters" name="DataPool" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-dat-10,dp-des-20" startup_priority="1" instances_min="1" instances_max="1">
-    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{a699aba9-2ba1-4c83-baaf-bf8070c834c7}" name="submit" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
-    <Input_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
+<Provided_Interface id="{cc465677-ac0d-40f7-9ce7-309b52dc79ab}" Comment="Synchronous time pulse" name="tick" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
 </Provided_Interface>
 
-<Provided_Interface id="{f97f6edd-8926-436f-b8ff-7de6f00795be}" name="retrieve" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
-    <Output_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
-</Provided_Interface>
-
-    <Implementations>
-        <Implementation name="default" language="SDL"/>
-    </Implementations>
-</Function>
-
-<Function id="{e4372e37-10f5-4988-8140-d3445cb68a2b}" name="CANOpenSlave" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" startup_priority="1" instances_min="1" instances_max="1">
-    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{2ac6b5e2-3a80-4ebf-9f5a-1e752a2c3943}" name="pdu_out" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
-    <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
-</Provided_Interface>
-
-<Required_Interface id="{70a44ed1-5a04-4cf4-a89c-01aee3a5b462}" name="pdu_in" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
-    <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
-    <Property name="Taste::InheritPI" value="true"/>
-    <Property name="Taste::Autonamed" value="true"/>
-</Required_Interface>
-
-    <Implementations>
-        <Implementation name="default" language="SDL"/>
-    </Implementations>
-</Function>
-
-<Function id="{f4a308ae-34a0-45a6-83df-122c8b4539c0}" Comment="Handles the command and control functions" name="Service_Frontend" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-des-10,dp-fun-10,dp-fun-20" startup_priority="1" instances_min="1" instances_max="1">
-    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{6d05d0b7-7072-4624-b40d-516772551fe2}" name="request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
-    <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
-</Provided_Interface>
-
-<Provided_Interface id="{cc465677-ac0d-40f7-9ce7-309b52dc79ab}" name="tick" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
-</Provided_Interface>
-
-<Required_Interface id="{5a6bd997-24dd-4dfb-9408-b73efad61025}" name="response" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Required_Interface id="{5a6bd997-24dd-4dfb-9408-b73efad61025}" Comment="Transmit unencoded Response data" name="response" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="Response" encoding="NATIVE"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
 </Required_Interface>
 
-<Required_Interface id="{85a186a5-875c-4b3f-b500-8b8ec0d05b64}" name="retrieve" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+<Required_Interface id="{85a186a5-875c-4b3f-b500-8b8ec0d05b64}" Comment="Retrieve parameter value from DataPool" name="retrieve" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
     <Output_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
 </Required_Interface>
 
-<Required_Interface id="{1306cb03-8d26-43a1-ab47-455e3176e6de}" name="actuate" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Required_Interface id="{1306cb03-8d26-43a1-ab47-455e3176e6de}" Comment="Actuate the on-board actuator" name="actuate" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="Cmd" encoding="NATIVE"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
 </Required_Interface>
 
-<Required_Interface id="{18cdc41f-db84-46b3-b802-89a90427160a}" name="command" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+<Required_Interface id="{18cdc41f-db84-46b3-b802-89a90427160a}" Comment="Command for the managed CANopen network" name="command" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
     <Input_Parameter name="p1" type="Cmd" encoding="NATIVE"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
 </Required_Interface>
 
-<Function id="{92088f77-1325-475d-a87e-bb434515f2f5}" Comment="Router of Service Requests" name="Router" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-des-10" startup_priority="1" instances_min="1" instances_max="1">
+<Function id="{92088f77-1325-475d-a87e-bb434515f2f5}" Comment="Router of Service Requests" name="Router" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-des-10" instances_min="1" startup_priority="1" instances_max="1">
     <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{c659a656-c7a2-4654-95ee-1fa5a32224f8}" name="request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Provided_Interface id="{c659a656-c7a2-4654-95ee-1fa5a32224f8}" Comment="Transmit request to the provided Services" name="request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
 </Provided_Interface>
 
-<Required_Interface id="{e665ade2-5e2f-452e-8263-d522d1ac003e}" name="service_a_request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Required_Interface id="{e665ade2-5e2f-452e-8263-d522d1ac003e}" Comment="Handle Request to Service A" name="service_a_request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
 </Required_Interface>
 
-<Required_Interface id="{9bbcc215-bf8a-4ede-bafc-015e7daca88b}" name="service_b_request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Required_Interface id="{9bbcc215-bf8a-4ede-bafc-015e7daca88b}" Comment="Handle Request to Service B" name="service_b_request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
@@ -121,9 +55,9 @@
     </Implementations>
 </Function>
 
-<Function id="{f53da581-e5aa-432a-abee-c294e277cf7a}" Comment="Services CAN interface commands" name="Service_A" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-fun-10" startup_priority="1" instances_min="1" instances_max="1">
+<Function id="{f53da581-e5aa-432a-abee-c294e277cf7a}" Comment="Services CAN interface commands" name="Service_A" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-fun-10" instances_min="1" startup_priority="1" instances_max="1">
     <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{4d8a8987-c894-411e-82d2-47aa466cee5c}" name="service_a_request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Provided_Interface id="{4d8a8987-c894-411e-82d2-47aa466cee5c}" Comment="Handle Request to Service A" name="service_a_request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
 </Provided_Interface>
 
@@ -150,12 +84,12 @@
     </Implementations>
 </Function>
 
-<Function id="{dc50901a-61b8-48a5-9b56-cb696093e641}" Comment="Services On-Board Data" name="Service_B" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-fun-20" startup_priority="1" instances_min="1" instances_max="1">
+<Function id="{dc50901a-61b8-48a5-9b56-cb696093e641}" Comment="Services On-Board Data" name="Service_B" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-fun-20" instances_min="1" startup_priority="1" instances_max="1">
     <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{8286eb57-6fa5-4727-b31f-aba247f62dd8}" name="tick" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Provided_Interface id="{8286eb57-6fa5-4727-b31f-aba247f62dd8}" Comment="Synchronization pulse" name="tick" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
 </Provided_Interface>
 
-<Provided_Interface id="{75775243-5268-42ff-996f-10db5e41eb06}" name="service_b_request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Provided_Interface id="{75775243-5268-42ff-996f-10db5e41eb06}" Comment="Handle Request to Service B" name="service_b_request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
 </Provided_Interface>
 
@@ -248,102 +182,188 @@
     </Implementations>
 </Function>
 
-<Function id="{7a8a0847-c06e-4eca-8b97-2380811c31ab}" name="EGSE_Transcoder" is_type="NO" language="Blackbox_C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" startup_priority="1" instances_min="1" instances_max="1">
+<Function id="{22dd1137-c442-4169-9889-f8aa23498e44}" Comment="Actuates actuators" name="Actuation" is_type="NO" language="Ada" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-fun-50" instances_min="1" startup_priority="1" instances_max="1">
     <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{5c7170b8-72f7-4280-93d6-c7a8651dd0cc}" name="tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
-    <Input_Parameter name="p1" type="TM" encoding="ACN"/>
-</Provided_Interface>
-
-<Provided_Interface id="{2d1f16d6-ee97-41d7-b880-94e020bc2de7}" name="request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
-    <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
+<Provided_Interface id="{d8c64dbd-d585-4c85-803c-6ec3e97046e9}" Comment="Actuate the on-board actuator" name="actuate" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
+    <Input_Parameter name="p1" type="Cmd" encoding="NATIVE"/>
 </Provided_Interface>
 
-<Required_Interface id="{d31597e3-053d-4dd8-808e-3e65317c8d86}" name="tc" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
-    <Input_Parameter name="p1" type="TC" encoding="ACN"/>
+<Required_Interface id="{375bce03-def1-4662-8ec3-59a6d0093c53}" Comment="Submit parameter value to the DataPool" name="submit" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+    <Input_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
 </Required_Interface>
 
-<Required_Interface id="{8931d303-94e5-4178-b83f-467dbd212c83}" name="tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
-    <Input_Parameter name="p1" type="TM" encoding="ACN"/>
+    <Implementations>
+        <Implementation name="default" language="Ada"/>
+    </Implementations>
+</Function>
+
+<Function id="{5b2b28b1-566c-45a2-95c4-81c8b9c53882}" name="CnC" is_type="NO" language="GUI" default_implementation="default" fixed_system_element="NO" required_system_element="NO" instances_min="1" startup_priority="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{9eaa1896-1480-4004-9504-20a4f283ab6e}" name="response" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
+    <Input_Parameter name="p1" type="Response" encoding="NATIVE"/>
+</Provided_Interface>
+
+<Required_Interface id="{865b64a2-64a8-490c-9979-7976225c9bc8}" name="request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
+    <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
     <Property name="Taste::InheritPI" value="true"/>
-    <Property name="Taste::Autonamed" value="true"/>
+    <Property name="Taste::Autonamed" value="false"/>
 </Required_Interface>
 
-<Required_Interface id="{7ad5b041-033d-46f1-822f-bade53b106dc}" name="response" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
-    <Input_Parameter name="p1" type="Response" encoding="NATIVE"/>
+    <Implementations>
+        <Implementation name="default" language="GUI"/>
+    </Implementations>
+</Function>
+
+<Function id="{e4372e37-10f5-4988-8140-d3445cb68a2b}" name="CANOpenSlave" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" instances_min="1" startup_priority="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{2ac6b5e2-3a80-4ebf-9f5a-1e752a2c3943}" Comment="PDU output to CAN network" name="pdu_out" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
+    <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
+</Provided_Interface>
+
+<Required_Interface id="{70a44ed1-5a04-4cf4-a89c-01aee3a5b462}" Comment="PDU input from CAN network" name="pdu_in" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
+    <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
 </Required_Interface>
 
-<Required_Interface id="{1c207dc1-5d02-4ce7-b737-3eb43997892d}" name="param" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Implementations>
+        <Implementation name="default" language="SDL"/>
+    </Implementations>
+</Function>
+
+<Function id="{21c6cdd2-9450-4ebe-bebd-9a7d2f55045a}" Comment="Stores on-board parameters" name="DataPool" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-dat-10,dp-des-20" instances_min="1" startup_priority="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{a699aba9-2ba1-4c83-baaf-bf8070c834c7}" Comment="Submit parameter value to the DataPool" name="submit" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+    <Input_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
+</Provided_Interface>
+
+<Provided_Interface id="{f97f6edd-8926-436f-b8ff-7de6f00795be}" Comment="Retrieve parameter value from DataPool" name="retrieve" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+    <Output_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
+</Provided_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="SDL"/>
+    </Implementations>
+</Function>
+
+<Function id="{9b3559ac-7da4-4df7-9f17-22e974091bbf}" Comment="Acquires data from sensors" name="SensorArray" is_type="NO" language="C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-fun-40" instances_min="1" startup_priority="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{58453814-b6ce-48e1-b191-de750bcdf69b}" Comment="Synchronous time pulse" name="tick" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
+</Provided_Interface>
+
+<Required_Interface id="{45589777-faae-40e1-b194-958e5054fbef}" Comment="Submit parameter value to the DataPool" name="submit" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
     <Input_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
 </Required_Interface>
 
     <Implementations>
-        <Implementation name="default" language="Blackbox_C"/>
+        <Implementation name="default" language="C"/>
     </Implementations>
 </Function>
 
-<Function id="{386b158a-a083-41da-8d81-b2ff569d64f2}" Comment="Handles the reception of TCs and sending of TMs" name="TC_TM_Interface" is_type="NO" language="C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-if-10,dp-if-20" startup_priority="1" instances_min="1" instances_max="1">
+<Function id="{17485a96-8307-419b-b49b-e979da978882}" name="Archive" is_type="NO" language="C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" instances_min="1" startup_priority="1" instances_max="1">
     <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{53b4399f-40d2-400a-934d-89b2d9e2896c}" name="uart_tc" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
-    <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
+<Provided_Interface id="{656c12f4-b5e0-44bf-a5e6-a236c1b79257}" name="tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
+    <Input_Parameter name="p1" type="TM" encoding="ACN"/>
+</Provided_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="C"/>
+    </Implementations>
+</Function>
+
+<Function id="{b3529bf4-7338-4df0-96b2-ff1dd49446ba}" Comment="Provides TC/TM transcoding capabilities to the TC TM Interface" name="Transcoder" is_type="NO" language="Blackbox_C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-if-30" instances_min="1" startup_priority="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{20496e2c-416b-4607-9898-3747a39f807c}" Comment="Decode TC" name="tc" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+    <Input_Parameter name="p1" type="TC" encoding="ACN"/>
 </Provided_Interface>
 
-<Provided_Interface id="{6dbb6ee2-715e-4967-969e-0afe77cd9b71}" name="tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Provided_Interface id="{e3d3cf30-d761-47bc-aae8-e1a915926bad}" Comment="Encode TM" name="tm" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
     <Input_Parameter name="p1" type="TM" encoding="ACN"/>
 </Provided_Interface>
 
-<Provided_Interface id="{637fab93-c813-4a55-bf67-741a9787eb14}" name="response" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+    <Implementations>
+        <Implementation name="default" language="Blackbox_C"/>
+    </Implementations>
+</Function>
+
+<Function id="{d93bbc74-4768-4145-b307-331b149dc80a}" Comment="Provides a synchronized system-wide Tick to other modules" name="Syncer" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" instances_min="1" startup_priority="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{6b86023b-de28-451f-96a1-8f0d92615857}" Comment="Pulse Per Second, for synchronizing other interfaces that need it" name="pps" kind="Cyclic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" dispatch_offset="0" period="1000" priority="1" stack_size="1024">
+</Provided_Interface>
+
+<Required_Interface id="{75d10afa-4f1e-478d-a9d9-609614468574}" Comment="Synchronous time pulse" name="tick" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+    <Implementations>
+        <Implementation name="default" language="SDL"/>
+    </Implementations>
+</Function>
+
+<Function id="{386b158a-a083-41da-8d81-b2ff569d64f2}" Comment="Handles the reception of TCs and sending of TMs" name="TC_TM_Interface" is_type="NO" language="C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-if-10,dp-if-20" instances_min="1" startup_priority="1" instances_max="1">
+    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
+<Provided_Interface id="{53b4399f-40d2-400a-934d-89b2d9e2896c}" Comment="Transmit TC over UART link" name="uart_tc" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
+    <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
+</Provided_Interface>
+
+<Provided_Interface id="{637fab93-c813-4a55-bf67-741a9787eb14}" Comment="Transmit unencoded Response data" name="response" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="Response" encoding="NATIVE"/>
 </Provided_Interface>
 
-<Required_Interface id="{66a72590-ab3b-47e7-8630-4e17eecf9d2f}" name="uart_tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Required_Interface id="{66a72590-ab3b-47e7-8630-4e17eecf9d2f}" Comment="Transmit TM over UART link" name="uart_tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
 </Required_Interface>
 
-<Required_Interface id="{5f71eae4-8158-4f92-8e41-bc682c79606a}" name="tc" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Required_Interface id="{5f71eae4-8158-4f92-8e41-bc682c79606a}" Comment="Decode TC" name="tc" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
     <Input_Parameter name="p1" type="TC" encoding="ACN"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
 </Required_Interface>
 
-<Required_Interface id="{01aa9e2f-fe8a-47e7-80b8-0117405a51d2}" name="request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Required_Interface id="{01aa9e2f-fe8a-47e7-80b8-0117405a51d2}" Comment="Transmit unencoded Request data" name="request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
 </Required_Interface>
 
+<Required_Interface id="{e458de7f-a099-444f-969c-c8bed882e9d3}" Comment="Encode TM" name="tm" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+    <Input_Parameter name="p1" type="TM" encoding="ACN"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
     <Implementations>
         <Implementation name="default" language="C"/>
     </Implementations>
 </Function>
 
-<Function id="{ed8a7364-04a5-4983-8ac1-e58403f6a041}" Comment="Manages the connected CANOpen network" name="CANOpenMaster" is_type="NO" language="C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-dat-20,dp-fun-30,dp-if-40" startup_priority="1" instances_min="1" instances_max="1">
+<Function id="{ed8a7364-04a5-4983-8ac1-e58403f6a041}" Comment="Manages the connected CANOpen network" name="CANOpenMaster" is_type="NO" language="C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-dat-20,dp-fun-30,dp-if-40" instances_min="1" startup_priority="1" instances_max="1">
     <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{eb478793-37e3-4798-b90d-521b4de78d02}" name="pdu_in" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Provided_Interface id="{eb478793-37e3-4798-b90d-521b4de78d02}" Comment="PDU input from CAN network" name="pdu_in" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
 </Provided_Interface>
 
-<Provided_Interface id="{18c032f4-39fb-4051-8e5c-668a1f21d94f}" name="command" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+<Provided_Interface id="{18c032f4-39fb-4051-8e5c-668a1f21d94f}" Comment="Command for the managed CANopen network" name="command" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
     <Input_Parameter name="p1" type="Cmd" encoding="NATIVE"/>
 </Provided_Interface>
 
-<Provided_Interface id="{ff516d61-e2c1-4ec3-8cb1-93529e2c8ae8}" name="tick" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Provided_Interface id="{ff516d61-e2c1-4ec3-8cb1-93529e2c8ae8}" Comment="Synchronous time pulse" name="tick" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
 </Provided_Interface>
 
-<Required_Interface id="{183b4fed-2e01-4c3b-b1c2-b7cef58040de}" name="submit" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+<Required_Interface id="{183b4fed-2e01-4c3b-b1c2-b7cef58040de}" Comment="Submit parameter value to the DataPool" name="submit" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
     <Input_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
 </Required_Interface>
 
-<Required_Interface id="{076ca0fb-3663-4378-a85c-8b1dc96cb693}" name="pdu_out" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Required_Interface id="{076ca0fb-3663-4378-a85c-8b1dc96cb693}" Comment="PDU output to CAN network" name="pdu_out" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
@@ -354,49 +374,62 @@
     </Implementations>
 </Function>
 
-<Function id="{d93bbc74-4768-4145-b307-331b149dc80a}" Comment="Provides a synchronized system-wide Tick to other modules" name="Syncer" is_type="NO" language="SDL" default_implementation="default" fixed_system_element="NO" required_system_element="NO" startup_priority="1" instances_min="1" instances_max="1">
+<Function id="{7a8a0847-c06e-4eca-8b97-2380811c31ab}" name="EGSE_Transcoder" is_type="NO" language="Blackbox_C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" instances_min="1" startup_priority="1" instances_max="1">
     <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{6b86023b-de28-451f-96a1-8f0d92615857}" name="pps" kind="Cyclic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" dispatch_offset="0" stack_size="1024" wcet="0" period="1000" priority="1">
+<Provided_Interface id="{5c7170b8-72f7-4280-93d6-c7a8651dd0cc}" name="tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
+    <Input_Parameter name="p1" type="TM" encoding="ACN"/>
 </Provided_Interface>
 
-<Required_Interface id="{75d10afa-4f1e-478d-a9d9-609614468574}" name="tick" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Provided_Interface id="{2d1f16d6-ee97-41d7-b880-94e020bc2de7}" name="request" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
+    <Input_Parameter name="p1" type="Request" encoding="NATIVE"/>
+</Provided_Interface>
+
+<Required_Interface id="{d31597e3-053d-4dd8-808e-3e65317c8d86}" name="tc" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
+    <Input_Parameter name="p1" type="TC" encoding="ACN"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
 </Required_Interface>
 
-    <Implementations>
-        <Implementation name="default" language="SDL"/>
-    </Implementations>
-</Function>
+<Required_Interface id="{8931d303-94e5-4178-b83f-467dbd212c83}" name="tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
+    <Input_Parameter name="p1" type="TM" encoding="ACN"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
 
-<Function id="{98fbadbc-3384-4ec1-8c68-d3ee594d28ee}" name="Parameter_Monitor" is_type="NO" language="GUI" default_implementation="default" fixed_system_element="NO" required_system_element="NO" startup_priority="1" instances_min="1" instances_max="1">
-    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{87c857b5-5e01-42b9-be41-14945b4095f9}" name="param" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Required_Interface id="{7ad5b041-033d-46f1-822f-bade53b106dc}" name="response" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
+    <Input_Parameter name="p1" type="Response" encoding="NATIVE"/>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
+
+<Required_Interface id="{1c207dc1-5d02-4ce7-b737-3eb43997892d}" name="param" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
-</Provided_Interface>
+    <Property name="Taste::InheritPI" value="true"/>
+    <Property name="Taste::Autonamed" value="true"/>
+</Required_Interface>
 
     <Implementations>
-        <Implementation name="default" language="GUI"/>
+        <Implementation name="default" language="Blackbox_C"/>
     </Implementations>
 </Function>
 
-<Function id="{96c9e808-95df-4c8b-b5b6-349806fad470}" name="EGSE_IF" is_type="NO" language="C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" startup_priority="1" instances_min="1" instances_max="1">
+<Function id="{96c9e808-95df-4c8b-b5b6-349806fad470}" name="EGSE_IF" is_type="NO" language="C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" instances_min="1" startup_priority="1" instances_max="1">
     <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{f892b3ec-f335-4331-8da8-4a0a19b63e20}" name="tc" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Provided_Interface id="{f892b3ec-f335-4331-8da8-4a0a19b63e20}" name="tc" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="TC" encoding="ACN"/>
 </Provided_Interface>
 
-<Provided_Interface id="{6cfa0662-fe26-43ef-b982-9300b0c8a870}" name="uart_tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Provided_Interface id="{6cfa0662-fe26-43ef-b982-9300b0c8a870}" Comment="Transmit TM over UART link" name="uart_tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
 </Provided_Interface>
 
-<Required_Interface id="{78c4deed-b125-4c2b-8c80-f12c9692af44}" name="tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Required_Interface id="{78c4deed-b125-4c2b-8c80-f12c9692af44}" name="tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="TM" encoding="ACN"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
 </Required_Interface>
 
-<Required_Interface id="{3cb1d68b-4869-42e8-8268-cc2c734fe323}" name="uart_tc" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
+<Required_Interface id="{3cb1d68b-4869-42e8-8268-cc2c734fe323}" Comment="Transmit TC over UART link" name="uart_tc" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="RawData" encoding="ACN"/>
     <Property name="Taste::InheritPI" value="true"/>
     <Property name="Taste::Autonamed" value="true"/>
@@ -407,58 +440,55 @@
     </Implementations>
 </Function>
 
-<Function id="{9b3559ac-7da4-4df7-9f17-22e974091bbf}" Comment="Acquires data from sensors" name="SensorArray" is_type="NO" language="C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-fun-40" startup_priority="1" instances_min="1" instances_max="1">
+<Function id="{98fbadbc-3384-4ec1-8c68-d3ee594d28ee}" name="Parameter_Monitor" is_type="NO" language="GUI" default_implementation="default" fixed_system_element="NO" required_system_element="NO" instances_min="1" startup_priority="1" instances_max="1">
     <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{58453814-b6ce-48e1-b191-de750bcdf69b}" name="tick" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
-</Provided_Interface>
-
-<Required_Interface id="{45589777-faae-40e1-b194-958e5054fbef}" name="submit" kind="Protected" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0">
+<Provided_Interface id="{87c857b5-5e01-42b9-be41-14945b4095f9}" name="param" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" wcet="0" miat="0" queue_size="1" priority="1" stack_size="1024">
     <Input_Parameter name="p1" type="ParameterValue" encoding="NATIVE"/>
-    <Property name="Taste::InheritPI" value="true"/>
-    <Property name="Taste::Autonamed" value="true"/>
-</Required_Interface>
+</Provided_Interface>
 
     <Implementations>
-        <Implementation name="default" language="C"/>
+        <Implementation name="default" language="GUI"/>
     </Implementations>
 </Function>
 
-<Function id="{17485a96-8307-419b-b49b-e979da978882}" name="Archive" is_type="NO" language="C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" startup_priority="1" instances_min="1" instances_max="1">
-    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{656c12f4-b5e0-44bf-a5e6-a236c1b79257}" name="tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
-    <Input_Parameter name="p1" type="TM" encoding="ACN"/>
-</Provided_Interface>
+<Connection id="{9e6cfe4d-2389-4c83-8521-3c2cecd0cb37}" name="TC_TM_Interface_tc____Transcoder_tc" required_system_element="NO">
+    <Source iface_id="{5f71eae4-8158-4f92-8e41-bc682c79606a}" func_name="TC_TM_Interface" ri_name="tc" />
+    <Target iface_id="{20496e2c-416b-4607-9898-3747a39f807c}" func_name="Transcoder" pi_name="tc" />
+</Connection>
 
-    <Implementations>
-        <Implementation name="default" language="C"/>
-    </Implementations>
-</Function>
+<Connection id="{ba6d8065-554a-4be2-ad56-96392c2750e9}" name="EGSE_IF_uart_tc____TC_TM_Interface_uart_tc" required_system_element="NO">
+    <Source iface_id="{3cb1d68b-4869-42e8-8268-cc2c734fe323}" func_name="EGSE_IF" ri_name="uart_tc" />
+    <Target iface_id="{53b4399f-40d2-400a-934d-89b2d9e2896c}" func_name="TC_TM_Interface" pi_name="uart_tc" />
+</Connection>
 
-<Function id="{b3529bf4-7338-4df0-96b2-ff1dd49446ba}" Comment="Provides TC/TM transcoding capabilities to the TC TM Interface" name="Transcoder" is_type="NO" language="Blackbox_C" default_implementation="default" fixed_system_element="NO" required_system_element="NO" requirement_ids="dp-if-30" startup_priority="1" instances_min="1" instances_max="1">
-    <Property name="TASTE_IV_Properties::Default_Codegen" value="Ada"/>
-<Provided_Interface id="{20496e2c-416b-4607-9898-3747a39f807c}" name="tc" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
-    <Input_Parameter name="p1" type="TC" encoding="ACN"/>
-</Provided_Interface>
+<Connection id="{a5d89e97-5ef8-4e0f-be41-64a9be0c3d36}" name="EGSE_Transcoder_response____CnC_response" required_system_element="NO">
+    <Source iface_id="{7ad5b041-033d-46f1-822f-bade53b106dc}" func_name="EGSE_Transcoder" ri_name="response" />
+    <Target iface_id="{9eaa1896-1480-4004-9504-20a4f283ab6e}" func_name="CnC" pi_name="response" />
+</Connection>
 
-<Required_Interface id="{f191bceb-abfe-4e91-81c6-0334a733e3e7}" name="tm" kind="Sporadic" enable_multicast="true" layer="default" required_system_element="NO" is_simulink_interface="false" queue_size="1" stack_size="1024" wcet="0" priority="1" miat="0">
-    <Input_Parameter name="p1" type="TM" encoding="ACN"/>
-    <Property name="Taste::InheritPI" value="true"/>
-    <Property name="Taste::Autonamed" value="true"/>
-</Required_Interface>
+<Connection id="{7b9c36d3-5799-45dd-995d-e6f78498ee57}" name="CnC_request____EGSE_Transcoder_request" required_system_element="NO">
+    <Source iface_id="{865b64a2-64a8-490c-9979-7976225c9bc8}" func_name="CnC" ri_name="request" />
+    <Target iface_id="{2d1f16d6-ee97-41d7-b880-94e020bc2de7}" func_name="EGSE_Transcoder" pi_name="request" />
+</Connection>
 
-    <Implementations>
-        <Implementation name="default" language="Blackbox_C"/>
-    </Implementations>
-</Function>
+<Connection id="{ed70b5c2-5a14-45c1-8e06-26de8ee3c3ee}" name="CANOpenSlave_pdu_in____CANOpenMaster_pdu_in" required_system_element="NO">
+    <Source iface_id="{70a44ed1-5a04-4cf4-a89c-01aee3a5b462}" func_name="CANOpenSlave" ri_name="pdu_in" />
+    <Target iface_id="{eb478793-37e3-4798-b90d-521b4de78d02}" func_name="CANOpenMaster" pi_name="pdu_in" />
+</Connection>
+
+<Connection id="{b05a2d38-49c0-4fda-a8ec-c8921702e1f3}" name="CANOpenMaster_pdu_out____CANOpenSlave_pdu_out" required_system_element="NO">
+    <Source iface_id="{076ca0fb-3663-4378-a85c-8b1dc96cb693}" func_name="CANOpenMaster" ri_name="pdu_out" />
+    <Target iface_id="{2ac6b5e2-3a80-4ebf-9f5a-1e752a2c3943}" func_name="CANOpenSlave" pi_name="pdu_out" />
+</Connection>
 
 <Connection id="{712522d0-ab67-4fc0-b0b8-324fb82e7862}" name="Service_Frontend_command____CANOpenMaster_command" required_system_element="NO">
     <Source iface_id="{18cdc41f-db84-46b3-b802-89a90427160a}" func_name="Service_Frontend" ri_name="command" />
     <Target iface_id="{18c032f4-39fb-4051-8e5c-668a1f21d94f}" func_name="CANOpenMaster" pi_name="command" />
 </Connection>
 
-<Connection id="{b05a2d38-49c0-4fda-a8ec-c8921702e1f3}" name="CANOpenMaster_pdu_out____CANOpenSlave_pdu_out" required_system_element="NO">
-    <Source iface_id="{076ca0fb-3663-4378-a85c-8b1dc96cb693}" func_name="CANOpenMaster" ri_name="pdu_out" />
-    <Target iface_id="{2ac6b5e2-3a80-4ebf-9f5a-1e752a2c3943}" func_name="CANOpenSlave" pi_name="pdu_out" />
+<Connection id="{f16cac1a-1f05-4785-9935-921f7013afb3}" name="TC_TM_Interface_uart_tm____EGSE_IF_uart_tm" required_system_element="NO">
+    <Source iface_id="{66a72590-ab3b-47e7-8630-4e17eecf9d2f}" func_name="TC_TM_Interface" ri_name="uart_tm" />
+    <Target iface_id="{6cfa0662-fe26-43ef-b982-9300b0c8a870}" func_name="EGSE_IF" pi_name="uart_tm" />
 </Connection>
 
 <Connection id="{b4570b1e-9a13-41e1-9b90-9a446078e1eb}" required_system_element="NO">
@@ -471,38 +501,38 @@
     <Target iface_id="{637fab93-c813-4a55-bf67-741a9787eb14}" func_name="TC_TM_Interface" pi_name="response" />
 </Connection>
 
-<Connection id="{f16cac1a-1f05-4785-9935-921f7013afb3}" name="TC_TM_Interface_uart_tm____EGSE_IF_uart_tm" required_system_element="NO">
-    <Source iface_id="{66a72590-ab3b-47e7-8630-4e17eecf9d2f}" func_name="TC_TM_Interface" ri_name="uart_tm" />
-    <Target iface_id="{6cfa0662-fe26-43ef-b982-9300b0c8a870}" func_name="EGSE_IF" pi_name="uart_tm" />
+<Connection id="{b4edeabb-5cbc-4ceb-a91c-617a02c43634}" name="Service_Frontend_actuate____Actuation_actuate" required_system_element="NO">
+    <Source iface_id="{1306cb03-8d26-43a1-ab47-455e3176e6de}" func_name="Service_Frontend" ri_name="actuate" />
+    <Target iface_id="{d8c64dbd-d585-4c85-803c-6ec3e97046e9}" func_name="Actuation" pi_name="actuate" />
 </Connection>
 
-<Connection id="{9e6cfe4d-2389-4c83-8521-3c2cecd0cb37}" name="TC_TM_Interface_tc____Transcoder_tc" required_system_element="NO">
-    <Source iface_id="{5f71eae4-8158-4f92-8e41-bc682c79606a}" func_name="TC_TM_Interface" ri_name="tc" />
-    <Target iface_id="{20496e2c-416b-4607-9898-3747a39f807c}" func_name="Transcoder" pi_name="tc" />
+<Connection id="{5ae7ca8a-a28e-46e9-b2e8-2d8207c03dc2}" required_system_element="NO">
+    <Source iface_id="{375bce03-def1-4662-8ec3-59a6d0093c53}" func_name="Actuation" ri_name="submit" />
+    <Target iface_id="{a699aba9-2ba1-4c83-baaf-bf8070c834c7}" func_name="DataPool" pi_name="submit" />
 </Connection>
 
-<Connection id="{ed70b5c2-5a14-45c1-8e06-26de8ee3c3ee}" name="CANOpenSlave_pdu_in____CANOpenMaster_pdu_in" required_system_element="NO">
-    <Source iface_id="{70a44ed1-5a04-4cf4-a89c-01aee3a5b462}" func_name="CANOpenSlave" ri_name="pdu_in" />
-    <Target iface_id="{eb478793-37e3-4798-b90d-521b4de78d02}" func_name="CANOpenMaster" pi_name="pdu_in" />
+<Connection id="{ed9b7227-f5bb-4e1c-a23d-275a73af6fb9}" name="EGSE_Transcoder_tm____Archive_tm" required_system_element="NO">
+    <Source iface_id="{8931d303-94e5-4178-b83f-467dbd212c83}" func_name="EGSE_Transcoder" ri_name="tm" />
+    <Target iface_id="{656c12f4-b5e0-44bf-a5e6-a236c1b79257}" func_name="Archive" pi_name="tm" />
 </Connection>
 
-<Connection id="{7b9c36d3-5799-45dd-995d-e6f78498ee57}" name="CnC_request____EGSE_Transcoder_request" required_system_element="NO">
-    <Source iface_id="{865b64a2-64a8-490c-9979-7976225c9bc8}" func_name="CnC" ri_name="request" />
-    <Target iface_id="{2d1f16d6-ee97-41d7-b880-94e020bc2de7}" func_name="EGSE_Transcoder" pi_name="request" />
+<Connection id="{8afe085b-4313-404c-842a-a703d5cbeb33}" name="EGSE_Transcoder_param____Parameter_Monitor_param" required_system_element="NO">
+    <Source iface_id="{1c207dc1-5d02-4ce7-b737-3eb43997892d}" func_name="EGSE_Transcoder" ri_name="param" />
+    <Target iface_id="{87c857b5-5e01-42b9-be41-14945b4095f9}" func_name="Parameter_Monitor" pi_name="param" />
 </Connection>
 
-<Connection id="{a5d89e97-5ef8-4e0f-be41-64a9be0c3d36}" name="EGSE_Transcoder_response____CnC_response" required_system_element="NO">
-    <Source iface_id="{7ad5b041-033d-46f1-822f-bade53b106dc}" func_name="EGSE_Transcoder" ri_name="response" />
-    <Target iface_id="{9eaa1896-1480-4004-9504-20a4f283ab6e}" func_name="CnC" pi_name="response" />
+<Connection id="{7d01a499-6e14-4c3b-9ac0-68a32d1b5d5a}" name="EGSE_IF_tm____EGSE_Transcoder_tm" required_system_element="NO">
+    <Source iface_id="{78c4deed-b125-4c2b-8c80-f12c9692af44}" func_name="EGSE_IF" ri_name="tm" />
+    <Target iface_id="{5c7170b8-72f7-4280-93d6-c7a8651dd0cc}" func_name="EGSE_Transcoder" pi_name="tm" />
 </Connection>
 
-<Connection id="{ba6d8065-554a-4be2-ad56-96392c2750e9}" name="EGSE_IF_uart_tc____TC_TM_Interface_uart_tc" required_system_element="NO">
-    <Source iface_id="{3cb1d68b-4869-42e8-8268-cc2c734fe323}" func_name="EGSE_IF" ri_name="uart_tc" />
-    <Target iface_id="{53b4399f-40d2-400a-934d-89b2d9e2896c}" func_name="TC_TM_Interface" pi_name="uart_tc" />
+<Connection id="{a88425f6-631d-4fc2-b9f2-edc02d2ac033}" name="TC_TM_Interface_tm____Transcoder_tm" required_system_element="NO">
+    <Source iface_id="{e458de7f-a099-444f-969c-c8bed882e9d3}" func_name="TC_TM_Interface" ri_name="tm" />
+    <Target iface_id="{e3d3cf30-d761-47bc-aae8-e1a915926bad}" func_name="Transcoder" pi_name="tm" />
 </Connection>
 
-<Connection id="{12a09d36-a18e-4f09-abcc-e60eef9269a4}" required_system_element="NO">
-    <Source iface_id="{183b4fed-2e01-4c3b-b1c2-b7cef58040de}" func_name="CANOpenMaster" ri_name="submit" />
+<Connection id="{1f4f8841-7147-4986-8710-c10602b71116}" name="SensorArray_submit____DataPool_submit" required_system_element="NO">
+    <Source iface_id="{45589777-faae-40e1-b194-958e5054fbef}" func_name="SensorArray" ri_name="submit" />
     <Target iface_id="{a699aba9-2ba1-4c83-baaf-bf8070c834c7}" func_name="DataPool" pi_name="submit" />
 </Connection>
 
@@ -511,26 +541,11 @@
     <Target iface_id="{f97f6edd-8926-436f-b8ff-7de6f00795be}" func_name="DataPool" pi_name="retrieve" />
 </Connection>
 
-<Connection id="{1f4f8841-7147-4986-8710-c10602b71116}" name="SensorArray_submit____DataPool_submit" required_system_element="NO">
-    <Source iface_id="{45589777-faae-40e1-b194-958e5054fbef}" func_name="SensorArray" ri_name="submit" />
+<Connection id="{12a09d36-a18e-4f09-abcc-e60eef9269a4}" required_system_element="NO">
+    <Source iface_id="{183b4fed-2e01-4c3b-b1c2-b7cef58040de}" func_name="CANOpenMaster" ri_name="submit" />
     <Target iface_id="{a699aba9-2ba1-4c83-baaf-bf8070c834c7}" func_name="DataPool" pi_name="submit" />
 </Connection>
 
-<Connection id="{60d938a7-ae09-454c-9b34-bfc8fcbdb84d}" name="TC_TM_Interface_request____Service_Frontend_request" required_system_element="NO">
-    <Source iface_id="{01aa9e2f-fe8a-47e7-80b8-0117405a51d2}" func_name="TC_TM_Interface" ri_name="request" />
-    <Target iface_id="{6d05d0b7-7072-4624-b40d-516772551fe2}" func_name="Service_Frontend" pi_name="request" />
-</Connection>
-
-<Connection id="{f8fe3605-3c57-4030-863c-e142b66f7f3e}" required_system_element="NO">
-    <Source iface_id="{75d10afa-4f1e-478d-a9d9-609614468574}" func_name="Syncer" ri_name="tick" />
-    <Target iface_id="{ff516d61-e2c1-4ec3-8cb1-93529e2c8ae8}" func_name="CANOpenMaster" pi_name="tick" />
-</Connection>
-
-<Connection id="{165fe7a0-3619-40ac-9bae-7e55e83efedf}" name="Transcoder_tm____TC_TM_Interface_tm" required_system_element="NO">
-    <Source iface_id="{f191bceb-abfe-4e91-81c6-0334a733e3e7}" func_name="Transcoder" ri_name="tm" />
-    <Target iface_id="{6dbb6ee2-715e-4967-969e-0afe77cd9b71}" func_name="TC_TM_Interface" pi_name="tm" />
-</Connection>
-
 <Connection id="{9112df55-1270-42a3-af98-5cdc047e2ec3}" name="Syncer_tick____SensorArray_tick" required_system_element="NO">
     <Source iface_id="{75d10afa-4f1e-478d-a9d9-609614468574}" func_name="Syncer" ri_name="tick" />
     <Target iface_id="{58453814-b6ce-48e1-b191-de750bcdf69b}" func_name="SensorArray" pi_name="tick" />
@@ -541,29 +556,14 @@
     <Target iface_id="{f892b3ec-f335-4331-8da8-4a0a19b63e20}" func_name="EGSE_IF" pi_name="tc" />
 </Connection>
 
-<Connection id="{5ae7ca8a-a28e-46e9-b2e8-2d8207c03dc2}" required_system_element="NO">
-    <Source iface_id="{375bce03-def1-4662-8ec3-59a6d0093c53}" func_name="Actuation" ri_name="submit" />
-    <Target iface_id="{a699aba9-2ba1-4c83-baaf-bf8070c834c7}" func_name="DataPool" pi_name="submit" />
-</Connection>
-
-<Connection id="{b4edeabb-5cbc-4ceb-a91c-617a02c43634}" name="Service_Frontend_actuate____Actuation_actuate" required_system_element="NO">
-    <Source iface_id="{1306cb03-8d26-43a1-ab47-455e3176e6de}" func_name="Service_Frontend" ri_name="actuate" />
-    <Target iface_id="{d8c64dbd-d585-4c85-803c-6ec3e97046e9}" func_name="Actuation" pi_name="actuate" />
-</Connection>
-
-<Connection id="{7d01a499-6e14-4c3b-9ac0-68a32d1b5d5a}" name="EGSE_IF_tm____EGSE_Transcoder_tm" required_system_element="NO">
-    <Source iface_id="{78c4deed-b125-4c2b-8c80-f12c9692af44}" func_name="EGSE_IF" ri_name="tm" />
-    <Target iface_id="{5c7170b8-72f7-4280-93d6-c7a8651dd0cc}" func_name="EGSE_Transcoder" pi_name="tm" />
-</Connection>
-
-<Connection id="{8afe085b-4313-404c-842a-a703d5cbeb33}" name="EGSE_Transcoder_param____Parameter_Monitor_param" required_system_element="NO">
-    <Source iface_id="{1c207dc1-5d02-4ce7-b737-3eb43997892d}" func_name="EGSE_Transcoder" ri_name="param" />
-    <Target iface_id="{87c857b5-5e01-42b9-be41-14945b4095f9}" func_name="Parameter_Monitor" pi_name="param" />
+<Connection id="{f8fe3605-3c57-4030-863c-e142b66f7f3e}" required_system_element="NO">
+    <Source iface_id="{75d10afa-4f1e-478d-a9d9-609614468574}" func_name="Syncer" ri_name="tick" />
+    <Target iface_id="{ff516d61-e2c1-4ec3-8cb1-93529e2c8ae8}" func_name="CANOpenMaster" pi_name="tick" />
 </Connection>
 
-<Connection id="{ed9b7227-f5bb-4e1c-a23d-275a73af6fb9}" name="EGSE_Transcoder_tm____Archive_tm" required_system_element="NO">
-    <Source iface_id="{8931d303-94e5-4178-b83f-467dbd212c83}" func_name="EGSE_Transcoder" ri_name="tm" />
-    <Target iface_id="{656c12f4-b5e0-44bf-a5e6-a236c1b79257}" func_name="Archive" pi_name="tm" />
+<Connection id="{60d938a7-ae09-454c-9b34-bfc8fcbdb84d}" name="TC_TM_Interface_request____Service_Frontend_request" required_system_element="NO">
+    <Source iface_id="{01aa9e2f-fe8a-47e7-80b8-0117405a51d2}" func_name="TC_TM_Interface" ri_name="request" />
+    <Target iface_id="{6d05d0b7-7072-4624-b40d-516772551fe2}" func_name="Service_Frontend" pi_name="request" />
 </Connection>
 
 <Comment id="{8252e12d-3562-42b6-8b2e-9aecbb09be41}" name="This is a demonstration project. Its data is meant to drive the generation of ECSS documentation examples\n" required_system_element="NO">
diff --git a/examples/generate_ecss_demo.sh b/examples/generate_ecss_demo.sh
index e57c191..07f27d1 100755
--- a/examples/generate_ecss_demo.sh
+++ b/examples/generate_ecss_demo.sh
@@ -4,3 +4,5 @@ template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfa
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_6_requirement_traceability.pdf output/ecss-e-st-40c_6_requirement_traceability.md
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_4_aspects_of_each_component.pdf output/ecss-e-st-40c_5_4_aspects_of_each_component.md
+template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_4_2_software_dynamic_architecture.tmplt
+pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_4_2_software_dynamic_architecture.pdf output/ecss-e-st-40c_4_2_software_dynamic_architecture.md
diff --git a/templateprocessor/iv.py b/templateprocessor/iv.py
index 8be8a4e..0bffeb5 100644
--- a/templateprocessor/iv.py
+++ b/templateprocessor/iv.py
@@ -78,6 +78,7 @@ class FunctionInterface:
 
     id: str
     name: str
+    comment: str
     kind: InterfaceKind
     enable_multicast: bool = True
     layer: str = "default"
diff --git a/templateprocessor/ivreader.py b/templateprocessor/ivreader.py
index 5d4efc7..58509de 100644
--- a/templateprocessor/ivreader.py
+++ b/templateprocessor/ivreader.py
@@ -177,6 +177,7 @@ def _parse_interface(self, elem: ET.Element) -> FunctionInterface:
         iface = FunctionInterface(
             id=elem.get("id", ""),
             name=elem.get("name", ""),
+            comment=elem.get("Comment", ""),
             kind=InterfaceKind(elem.get("kind", "")),
             enable_multicast=elem.get("enable_multicast", "true") == "true",
             layer=elem.get("layer", "default"),

From ec4e51a20bdf674064685dfdb44d420e315b4640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Wed, 10 Dec 2025 19:09:39 +0100
Subject: [PATCH 18/28] Added initial version of internal_inferfaces_design
 template

---
 ...st-40c_5_5_internal_interface_design.tmplt | 158 +++++++++++++++++-
 examples/generate_ecss_demo.sh                |   2 +
 2 files changed, 159 insertions(+), 1 deletion(-)

diff --git a/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt b/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
index e89bed5..5aa3ab9 100644
--- a/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
+++ b/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
@@ -1 +1,157 @@
-TODO internal interfaces, including data
\ No newline at end of file
+<%
+## Data Initialization
+# Get all functions
+
+def find_by_name(all, name):
+    for f in all:
+        if f.name == name:
+            return f
+    return None
+
+funcs = []
+def get_function_children(func):
+    result = []
+    if func.nested_functions:
+        for nested in func.nested_functions:
+            result.append(nested)
+            result.extend(get_function_children(nested))
+    return result
+
+for func in interface_view.functions:
+    funcs.append(func)
+    funcs.extend(get_function_children(func))
+
+funcs.sort(key=lambda f: f.name.lower())
+
+# Get functions deployed to the target partition
+target_partition_name = values["TARGET"]
+
+deployed_funcs = []
+target_partition = None
+for node in deployment_view.nodes:
+    for partition in node.partitions:
+        if partition.name == target_partition_name:
+            target_partition = partition
+        
+deployed_func_names = [f.name for f in target_partition.functions]
+for fun in funcs:
+    if fun.name in deployed_func_names:
+        deployed_funcs.append(fun)
+
+
+
+# Find and crossreference all connections
+def get_function_connections(func):
+    result = []
+    if func.nested_connections:
+        result.extend(func.nested_connections)
+    if func.nested_functions:
+        for nested in func.nested_functions:
+            result.extend(get_function_connections(nested))
+    return result
+
+connections = []
+connections.extend(interface_view.connections)
+for func in interface_view.functions:
+    connections.extend(get_function_connections(func))
+
+internal_connections = []
+
+for connection in connections:
+    if connection.source is None or connection.source.function_name is None:
+        continue
+    if connection.target is None or connection.target.function_name is None:
+        continue
+    if connection.target.function_name in deployed_func_names and connection.source.function_name in deployed_func_names:
+        internal_connections.append(connection)
+
+iface_source_map = {}
+iface_target_map = {}
+
+for connection in internal_connections:
+    meta = {}
+    meta["connection"] = connection
+    meta["source_function"] = find_by_name(funcs, connection.source.function_name)
+    if meta["source_function"] is None:
+        print(f"Source function {connection.source.function_name} not found")
+        continue
+    meta["source_iface"] = find_by_name(meta["source_function"].provided_interfaces + meta["source_function"].required_interfaces, connection.source.iface_name)
+    meta["target_function"] = find_by_name(funcs, connection.target.function_name)
+    if meta["target_function"] is None:
+        print(f"Target function {connection.target.function_name} not found")
+        continue
+    meta["target_iface"] = find_by_name(meta["target_function"].provided_interfaces + meta["target_function"].required_interfaces, connection.source.iface_name)
+    source_handle = f"{meta["source_function"].name}__{meta["source_iface"].name}" 
+    target_handle = f"{meta["target_function"].name}__{meta["target_iface"].name}" 
+    if not source_handle in iface_source_map.keys():
+        iface_source_map[source_handle] = []
+    iface_source_map[source_handle].append((meta["target_function"], meta["target_iface"]))
+    if not target_handle in iface_target_map.keys():
+        iface_target_map[target_handle] = []
+    iface_target_map[target_handle].append((meta["source_function"], meta["source_iface"]))
+
+%>
+
+The list below summarizes all internal interfaces between user components.
+
+% for func in deployed_funcs:
+% for iface in func.provided_interfaces + func.required_interfaces:
+<%
+iface_handle = f"{func.name}__{iface.name}"
+if not iface_handle in iface_source_map and not iface_handle in iface_target_map:
+    continue
+%> \
+${"##"} \
+% if iface in func.provided_interfaces:
+[PROVIDED] \
+% else:
+[REQUIRED] \
+% endif
+[${iface.kind.value}] ${func.name}::${iface.name}
+
+- Description: ${iface.comment}
+
+% if iface.kind.value != "Cyclic":
+- Parameters:
+% for param in iface.input_parameters + iface.output_parameters:
+
+    - \
+% if param in iface.input_parameters:
+[IN] \
+% else: 
+[OUT] \
+% endif
+${param.name} ${param.type} (with ${param.encoding.value} encoding)
+% endfor
+% endif
+
+% if iface_handle in iface_source_map:
+- Connects to:
+% for (other_function, other_iface) in iface_source_map[iface_handle]:
+
+    - ${other_function.name}::${other_iface.name}
+% endfor
+% endif
+
+% if iface_handle in iface_target_map:
+- Is connected from:
+% for (other_function, other_iface) in iface_target_map[iface_handle]:
+
+    - ${other_function.name}::${other_iface.name}
+% endfor
+% endif
+
+% endfor
+% endfor
+
+The list below summarizes all internal connections between the interfaces:
+% for connection in internal_connections:
+<%
+    if connection.source is None or connection.source.function_name is None:
+        continue
+    if connection.target is None or connection.target.function_name is None:
+        continue
+%> \
+
+- Connection from ${connection.source.function_name}::${connection.source.iface_name} to ${connection.target.function_name}::${connection.target.iface_name}
+% endfor
\ No newline at end of file
diff --git a/examples/generate_ecss_demo.sh b/examples/generate_ecss_demo.sh
index 07f27d1..633c5e9 100755
--- a/examples/generate_ecss_demo.sh
+++ b/examples/generate_ecss_demo.sh
@@ -6,3 +6,5 @@ template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfa
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_4_aspects_of_each_component.pdf output/ecss-e-st-40c_5_4_aspects_of_each_component.md
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_4_2_software_dynamic_architecture.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_4_2_software_dynamic_architecture.pdf output/ecss-e-st-40c_4_2_software_dynamic_architecture.md
+template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
+pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_5_internal_interface_design.pdf output/ecss-e-st-40c_5_5_internal_interface_design.md
\ No newline at end of file

From 01405113367179c895d29e3f6162facc1c1c3932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Wed, 10 Dec 2025 19:13:40 +0100
Subject: [PATCH 19/28] Fixed existing tests

---
 tests/test_templateinstantiator.py | 36 +++++++++++++++++-------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/tests/test_templateinstantiator.py b/tests/test_templateinstantiator.py
index b82d0ec..85b96d0 100644
--- a/tests/test_templateinstantiator.py
+++ b/tests/test_templateinstantiator.py
@@ -45,13 +45,18 @@ def create_sample_interface_view() -> InterfaceView:
 
         # Create a sample function
         func = Function(
-            id="func_1", name="TestFunction", is_type=False, language=Language.C
+            id="func_1",
+            comment="No Comment",
+            name="TestFunction",
+            is_type=False,
+            language=Language.C,
         )
 
         # Add a provided interface
         pi = ProvidedInterface(
             id="pi_1",
             name="test_pi",
+            comment="No Comment",
             kind=InterfaceKind.SPORADIC,
         )
         pi.input_parameters = [
@@ -63,6 +68,7 @@ def create_sample_interface_view() -> InterfaceView:
         ri = RequiredInterface(
             id="ri_1",
             name="test_ri",
+            comment="No Comment",
             kind=InterfaceKind.CYCLIC,
         )
         ri.output_parameters = [
@@ -214,7 +220,7 @@ def test_instantiator_initialization(self):
         dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
 
-        instantiator = TemplateInstantiator(iv, dv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types, {})
 
         assert instantiator.interface_view == iv
         assert instantiator.system_object_types == so_types
@@ -225,7 +231,7 @@ def test_instantiate_simple_template(self):
         iv = self.create_sample_interface_view()
         dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, dv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types, {})
 
         template = "Hello World!"
 
@@ -239,7 +245,7 @@ def test_instantiate_template_with_interface_view(self):
         iv = self.create_sample_interface_view()
         dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, dv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types, {})
 
         template = """Interface View version: ${interface_view.version}
 ASN1 file: ${interface_view.asn1file}
@@ -257,7 +263,7 @@ def test_instantiate_template_with_function_details(self):
         iv = self.create_sample_interface_view()
         dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, dv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types, {})
 
         template = """% for func in interface_view.functions:
 Function: ${func.name}
@@ -279,7 +285,7 @@ def test_instantiate_template_with_system_object_types(self):
         iv = self.create_sample_interface_view()
         dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, dv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types, {})
 
         template = """Number of System Object Types: ${len(system_object_types)}
 % for name, so_type in system_object_types.items():
@@ -300,7 +306,7 @@ def test_instantiate_template_with_system_object_instances(self):
         iv = self.create_sample_interface_view()
         dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, dv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types, {})
 
         template = """% for name, so_type in system_object_types.items():
 [${name}]
@@ -331,7 +337,7 @@ def test_instantiate_template_with_empty_data(self):
 
         so_types = {}
 
-        instantiator = TemplateInstantiator(iv, dv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types, {})
 
         template = """Version: ${interface_view.version}
 Functions: ${len(interface_view.functions)}
@@ -349,7 +355,7 @@ def test_instantiate_template_with_python_expressions(self):
         iv = self.create_sample_interface_view()
         dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, dv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types, {})
 
         template = """<%
 total_interfaces = sum(len(f.provided_interfaces) + len(f.required_interfaces) for f in interface_view.functions)
@@ -369,7 +375,7 @@ def test_instantiate_template_with_deployment_view(self):
         iv = self.create_sample_interface_view()
         dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, dv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types, {})
 
         template = """Deployment View version: ${deployment_view.version}
 UI file: ${deployment_view.ui_file}
@@ -389,7 +395,7 @@ def test_instantiate_template_with_deployment_nodes(self):
         iv = self.create_sample_interface_view()
         dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, dv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types, {})
 
         template = """% for node in deployment_view.nodes:
 Node: ${node.name}
@@ -415,7 +421,7 @@ def test_instantiate_template_with_partitions_and_functions(self):
         iv = self.create_sample_interface_view()
         dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, dv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types, {})
 
         template = """% for node in deployment_view.nodes:
 ${node.name}
@@ -445,7 +451,7 @@ def test_instantiate_template_with_devices(self):
         iv = self.create_sample_interface_view()
         dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, dv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types, {})
 
         template = """% for node in deployment_view.nodes:
 % if node.devices:
@@ -473,7 +479,7 @@ def test_instantiate_template_with_connections(self):
         iv = self.create_sample_interface_view()
         dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, dv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types, {})
 
         template = """% for conn in deployment_view.connections:
 Connection: ${conn.name}
@@ -503,7 +509,7 @@ def test_instantiate_template_with_node_requirements(self):
         iv = self.create_sample_interface_view()
         dv = self.create_sample_deployment_view()
         so_types = self.create_sample_system_object_types()
-        instantiator = TemplateInstantiator(iv, dv, so_types)
+        instantiator = TemplateInstantiator(iv, dv, so_types, {})
 
         template = """% for node in deployment_view.nodes:
 Node: ${node.name}

From f5c99e3bb520cb94d4eee1f840d085e6fb6f1b4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Wed, 10 Dec 2025 19:32:21 +0100
Subject: [PATCH 20/28] Added test for value instantiation

---
 tests/test_templateinstantiator.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tests/test_templateinstantiator.py b/tests/test_templateinstantiator.py
index 85b96d0..040a500 100644
--- a/tests/test_templateinstantiator.py
+++ b/tests/test_templateinstantiator.py
@@ -527,3 +527,31 @@ def test_instantiate_template_with_node_requirements(self):
         assert "Requirements: r20, r21" in result
         assert "Node: SAM V71 RTEMS N7S_1" in result
         assert "Requirements: None" in result
+
+    def test_instantiate_template_with_values(self):
+        """Test instantiating a template that uses provided values."""
+        iv = self.create_sample_interface_view()
+        dv = self.create_sample_deployment_view()
+        so_types = self.create_sample_system_object_types()
+
+        values = {
+            "project_name": "MyProject",
+            "version": "2.1.0",
+            "author": "Test Author",
+            "description": "Test project description",
+        }
+
+        instantiator = TemplateInstantiator(iv, dv, so_types, values)
+
+        template = """Project: ${values['project_name']}
+Version: ${values['version']}
+Author: ${values['author']}
+Description: ${values['description']}"""
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            result = instantiator.instantiate(template, tmpdir)
+
+        assert "Project: MyProject" in result
+        assert "Version: 2.1.0" in result
+        assert "Author: Test Author" in result
+        assert "Description: Test project description" in result

From 16f2b14407526a5138e68b5f15957b51f6a7e66a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Wed, 10 Dec 2025 21:18:55 +0100
Subject: [PATCH 21/28] Fixed filtering of container functions

---
 ...s-e-st-40c_5_5_internal_interface_design.tmplt | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt b/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
index 5aa3ab9..9a76a6b 100644
--- a/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
+++ b/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
@@ -38,6 +38,15 @@ for fun in funcs:
     if fun.name in deployed_func_names:
         deployed_funcs.append(fun)
 
+# Only leaf functions are deployed, so a correction for parents must be applied
+for func in funcs:
+    if func.nested_functions:
+        for nested in func.nested_functions:
+            if nested in deployed_funcs and not func in deployed_funcs:
+                deployed_funcs.append(func)
+                deployed_func_names.append(func.name) 
+
+print(f"Deployed Functions: {[func.name for func in deployed_funcs]}")
 
 
 # Find and crossreference all connections
@@ -58,12 +67,18 @@ for func in interface_view.functions:
 internal_connections = []
 
 for connection in connections:
+    print(f"Processing connection {connection.name} from {connection.source.function_name} to {connection.target.function_name}")
     if connection.source is None or connection.source.function_name is None:
+        print(f"  -Rejecting due to SOURCE")
         continue
     if connection.target is None or connection.target.function_name is None:
+        print(f"  -Rejecting due to TARGET")
         continue
     if connection.target.function_name in deployed_func_names and connection.source.function_name in deployed_func_names:
+        print(f"  +Adding as INTERNAL")
         internal_connections.append(connection)
+    else:
+        print(f"  -Rejecting as EXTERNAL")
 
 iface_source_map = {}
 iface_target_map = {}

From 83929d80de702de3b263eab29b542d93239f4d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Thu, 11 Dec 2025 01:09:47 +0100
Subject: [PATCH 22/28] Added interfaces context template

---
 ...ecss-e-st-40c_4_4_interfaces_context.tmplt | 173 ++++++++++++++++++
 ...st-40c_5_5_internal_interface_design.tmplt |   5 +-
 examples/generate_ecss_demo.sh                |   4 +-
 3 files changed, 179 insertions(+), 3 deletions(-)

diff --git a/data/ecss-template/ecss-e-st-40c_4_4_interfaces_context.tmplt b/data/ecss-template/ecss-e-st-40c_4_4_interfaces_context.tmplt
index e69de29..193dc64 100644
--- a/data/ecss-template/ecss-e-st-40c_4_4_interfaces_context.tmplt
+++ b/data/ecss-template/ecss-e-st-40c_4_4_interfaces_context.tmplt
@@ -0,0 +1,173 @@
+<%
+## Data Initialization
+# Get all functions
+
+def find_by_name(all, name):
+    for f in all:
+        if f.name == name:
+            return f
+    return None
+
+funcs = []
+def get_function_children(func):
+    result = []
+    if func.nested_functions:
+        for nested in func.nested_functions:
+            result.append(nested)
+            result.extend(get_function_children(nested))
+    return result
+
+for func in interface_view.functions:
+    funcs.append(func)
+    funcs.extend(get_function_children(func))
+
+funcs.sort(key=lambda f: f.name.lower())
+
+# Get functions deployed to the target partition
+target_partition_name = values["TARGET"]
+
+deployed_funcs = []
+target_partition = None
+for node in deployment_view.nodes:
+    for partition in node.partitions:
+        if partition.name == target_partition_name:
+            target_partition = partition
+        
+deployed_func_names = [f.name for f in target_partition.functions]
+for fun in funcs:
+    if fun.name in deployed_func_names:
+        deployed_funcs.append(fun)
+
+# Only leaf functions are deployed, so a correction for parents must be applied
+for func in funcs:
+    if func.nested_functions:
+        for nested in func.nested_functions:
+            if nested in deployed_funcs and not func in deployed_funcs:
+                deployed_funcs.append(func)
+                deployed_func_names.append(func.name) 
+
+print(f"Deployed Functions: {[func.name for func in deployed_funcs]}")
+
+# Find and crossreference all connections
+def get_function_connections(func):
+    result = []
+    if func.nested_connections:
+        result.extend(func.nested_connections)
+    if func.nested_functions:
+        for nested in func.nested_functions:
+            result.extend(get_function_connections(nested))
+    return result
+
+connections = []
+connections.extend(interface_view.connections)
+for func in interface_view.functions:
+    connections.extend(get_function_connections(func))
+
+external_connections = []
+
+for connection in connections:
+    print(f"Processing connection {connection.name} from {connection.source.function_name} to {connection.target.function_name}")
+    if connection.source is None or connection.source.function_name is None:
+        print(f"  -Rejecting due to SOURCE")
+        continue
+    if connection.target is None or connection.target.function_name is None:
+        print(f"  -Rejecting due to TARGET")
+        continue
+    target_inside = connection.target.function_name in deployed_func_names
+    source_inside = connection.source.function_name in deployed_func_names 
+    if (target_inside and not source_inside) or (not target_inside and source_inside):
+        print(f"  +Adding as BOUNDARY")
+        external_connections.append(connection)
+    else:
+        print(f"  -Rejecting as NON-BOUNDARY")
+
+iface_source_map = {}
+iface_target_map = {}
+
+for connection in external_connections:
+    meta = {}
+    meta["connection"] = connection
+    meta["source_function"] = find_by_name(funcs, connection.source.function_name)
+    if meta["source_function"] is None:
+        print(f"Source function {connection.source.function_name} not found")
+        continue
+    meta["source_iface"] = find_by_name(meta["source_function"].provided_interfaces + meta["source_function"].required_interfaces, connection.source.iface_name)
+    meta["target_function"] = find_by_name(funcs, connection.target.function_name)
+    if meta["target_function"] is None:
+        print(f"Target function {connection.target.function_name} not found")
+        continue
+    meta["target_iface"] = find_by_name(meta["target_function"].provided_interfaces + meta["target_function"].required_interfaces, connection.source.iface_name)
+    source_handle = f"{meta["source_function"].name}__{meta["source_iface"].name}" 
+    target_handle = f"{meta["target_function"].name}__{meta["target_iface"].name}" 
+    if not source_handle in iface_source_map.keys():
+        iface_source_map[source_handle] = []
+    iface_source_map[source_handle].append((meta["target_function"], meta["target_iface"]))
+    if not target_handle in iface_target_map.keys():
+        iface_target_map[target_handle] = []
+    iface_target_map[target_handle].append((meta["source_function"], meta["source_iface"]))
+
+%>
+
+The list below summarizes all external interfaces.
+
+% for func in deployed_funcs:
+% for iface in func.provided_interfaces + func.required_interfaces:
+<%
+iface_handle = f"{func.name}__{iface.name}"
+if not iface_handle in iface_source_map and not iface_handle in iface_target_map:
+    continue
+%>
+${"#"} \
+% if iface in func.provided_interfaces:
+[PROVIDED] \
+% else:
+[REQUIRED] \
+% endif
+[${iface.kind.value}] ${func.name}::${iface.name}
+
+- Description: ${iface.comment}
+
+% if iface.kind.value != "Cyclic":
+- Parameters:
+% for param in iface.input_parameters + iface.output_parameters:
+
+    - \
+% if param in iface.input_parameters:
+[IN] \
+% else: 
+[OUT] \
+% endif
+${param.name} ${param.type} (with ${param.encoding.value} encoding)
+% endfor
+% endif
+
+% if iface_handle in iface_source_map:
+- Connects to:
+% for (other_function, other_iface) in iface_source_map[iface_handle]:
+
+    - ${other_function.name}::${other_iface.name}
+% endfor
+% endif
+
+% if iface_handle in iface_target_map:
+- Is connected from:
+% for (other_function, other_iface) in iface_target_map[iface_handle]:
+
+    - ${other_function.name}::${other_iface.name}
+% endfor
+% endif
+
+% endfor
+% endfor
+
+The list below summarizes all external connections:
+% for connection in external_connections:
+<%
+    if connection.source is None or connection.source.function_name is None:
+        continue
+    if connection.target is None or connection.target.function_name is None:
+        continue
+%> \
+
+- Connection from ${connection.source.function_name}::${connection.source.iface_name} to ${connection.target.function_name}::${connection.target.iface_name}
+% endfor
\ No newline at end of file
diff --git a/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt b/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
index 9a76a6b..3549234 100644
--- a/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
+++ b/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
@@ -115,8 +115,9 @@ The list below summarizes all internal interfaces between user components.
 iface_handle = f"{func.name}__{iface.name}"
 if not iface_handle in iface_source_map and not iface_handle in iface_target_map:
     continue
-%> \
-${"##"} \
+%>
+
+${"#"} \
 % if iface in func.provided_interfaces:
 [PROVIDED] \
 % else:
diff --git a/examples/generate_ecss_demo.sh b/examples/generate_ecss_demo.sh
index 633c5e9..efba071 100755
--- a/examples/generate_ecss_demo.sh
+++ b/examples/generate_ecss_demo.sh
@@ -7,4 +7,6 @@ pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_4_aspects_of_each_co
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_4_2_software_dynamic_architecture.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_4_2_software_dynamic_architecture.pdf output/ecss-e-st-40c_4_2_software_dynamic_architecture.md
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
-pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_5_internal_interface_design.pdf output/ecss-e-st-40c_5_5_internal_interface_design.md
\ No newline at end of file
+pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_5_internal_interface_design.pdf output/ecss-e-st-40c_5_5_internal_interface_design.md
+template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_4_4_interfaces_context.tmplt
+pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_4_4_interfaces_context.pdf output/ecss-e-st-40c_4_4_interfaces_context.md
\ No newline at end of file

From 2504eac350508f737ba1c72640d97c1c34af0e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Thu, 11 Dec 2025 01:35:22 +0100
Subject: [PATCH 23/28] Added static architecture template

---
 ...40c_4_1_software_static_architecture.tmplt | 83 ++++++++++++++++++-
 ...ecss-e-st-40c_4_4_interfaces_context.tmplt |  8 --
 ...st-40c_5_4_aspects_of_each_component.tmplt |  8 ++
 ...st-40c_5_5_internal_interface_design.tmplt |  7 --
 examples/generate_ecss_demo.sh                |  4 +-
 5 files changed, 93 insertions(+), 17 deletions(-)

diff --git a/data/ecss-template/ecss-e-st-40c_4_1_software_static_architecture.tmplt b/data/ecss-template/ecss-e-st-40c_4_1_software_static_architecture.tmplt
index 1ec43e0..a8274c2 100644
--- a/data/ecss-template/ecss-e-st-40c_4_1_software_static_architecture.tmplt
+++ b/data/ecss-template/ecss-e-st-40c_4_1_software_static_architecture.tmplt
@@ -1 +1,82 @@
-TODO architecture of the software item, including relationship between its major components
\ No newline at end of file
+<%
+## Data Initialization
+# Get all functions
+
+funcs = []
+def get_function_children(func):
+    result = []
+    if func.nested_functions:
+        for nested in func.nested_functions:
+            result.append(nested)
+            result.extend(get_function_children(nested))
+    return result
+
+for func in interface_view.functions:
+    funcs.append(func)
+    funcs.extend(get_function_children(func))
+
+funcs.sort(key=lambda f: f.name.lower())
+
+# Get functions deployed to the target partition
+target_partition_name = values["TARGET"]
+
+deployed_funcs = []
+target_partition = None
+target_node = None
+for node in deployment_view.nodes:
+    for partition in node.partitions:
+        if partition.name == target_partition_name:
+            target_node = node
+            target_partition = partition
+        
+deployed_func_names = [f.name for f in target_partition.functions]
+for fun in funcs:
+    if fun.name in deployed_func_names:
+        deployed_funcs.append(fun)
+
+# Only leaf functions are deployed, so a correction for parents must be applied
+for func in funcs:
+    if func.nested_functions:
+        for nested in func.nested_functions:
+            if nested in deployed_funcs and not func in deployed_funcs:
+                deployed_funcs.append(func)
+                deployed_func_names.append(func.name) 
+
+# Get used implementations
+languages = set()
+for func in deployed_funcs:
+    languages.add(func.language)
+
+%>
+
+The software architecture of ${target_partition_name} consists of ${len(deployed_funcs)} functions deployed onto ${target_node.name} node.
+The functions use the following implementation technologies: ${",".join([l.value for l in languages])}.
+The top-level components are as follows:
+% for func in interface_view.functions:
+<%
+if not func.name in deployed_func_names:
+    continue
+is_composite = func.nested_functions and len(func.nested_functions) > 0
+implementation_text = "[COMPOSITE] " if is_composite else func.language.value
+%>
+
+- ${func.name} [${implementation_text}] - ${func.comment}
+% endfor
+## Print the level 2 functions
+% for func in interface_view.functions:
+<%
+if not func.nested_functions or len(func.nested_functions) == 0:
+    continue
+%>
+
+Function ${func.name} is a composite, containing the following sub-functions:
+% for nested in func.nested_functions:
+<%
+is_composite = nested.nested_functions and len(nested.nested_functions) > 0
+implementation_text = "[COMPOSITE] " if is_composite else nested.language.value
+%>
+
+- ${nested.name} [${implementation_text}] - ${nested.comment}
+% endfor
+
+% endfor
\ No newline at end of file
diff --git a/data/ecss-template/ecss-e-st-40c_4_4_interfaces_context.tmplt b/data/ecss-template/ecss-e-st-40c_4_4_interfaces_context.tmplt
index 193dc64..bfc8968 100644
--- a/data/ecss-template/ecss-e-st-40c_4_4_interfaces_context.tmplt
+++ b/data/ecss-template/ecss-e-st-40c_4_4_interfaces_context.tmplt
@@ -46,8 +46,6 @@ for func in funcs:
                 deployed_funcs.append(func)
                 deployed_func_names.append(func.name) 
 
-print(f"Deployed Functions: {[func.name for func in deployed_funcs]}")
-
 # Find and crossreference all connections
 def get_function_connections(func):
     result = []
@@ -66,20 +64,14 @@ for func in interface_view.functions:
 external_connections = []
 
 for connection in connections:
-    print(f"Processing connection {connection.name} from {connection.source.function_name} to {connection.target.function_name}")
     if connection.source is None or connection.source.function_name is None:
-        print(f"  -Rejecting due to SOURCE")
         continue
     if connection.target is None or connection.target.function_name is None:
-        print(f"  -Rejecting due to TARGET")
         continue
     target_inside = connection.target.function_name in deployed_func_names
     source_inside = connection.source.function_name in deployed_func_names 
     if (target_inside and not source_inside) or (not target_inside and source_inside):
-        print(f"  +Adding as BOUNDARY")
         external_connections.append(connection)
-    else:
-        print(f"  -Rejecting as NON-BOUNDARY")
 
 iface_source_map = {}
 iface_target_map = {}
diff --git a/data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt b/data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
index 46ce4fb..d878524 100644
--- a/data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
+++ b/data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
@@ -32,6 +32,14 @@ for fun in funcs:
     if fun.name in deployed_func_names:
         deployed_funcs.append(fun)
 
+# Only leaf functions are deployed, so a correction for parents must be applied
+for func in funcs:
+    if func.nested_functions:
+        for nested in func.nested_functions:
+            if nested in deployed_funcs and not func in deployed_funcs:
+                deployed_funcs.append(func)
+                deployed_func_names.append(func.name) 
+
 %>
 
 The below chapters summarize aspects of each component.
diff --git a/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt b/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
index 3549234..dd2ecac 100644
--- a/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
+++ b/data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
@@ -46,7 +46,6 @@ for func in funcs:
                 deployed_funcs.append(func)
                 deployed_func_names.append(func.name) 
 
-print(f"Deployed Functions: {[func.name for func in deployed_funcs]}")
 
 
 # Find and crossreference all connections
@@ -67,18 +66,12 @@ for func in interface_view.functions:
 internal_connections = []
 
 for connection in connections:
-    print(f"Processing connection {connection.name} from {connection.source.function_name} to {connection.target.function_name}")
     if connection.source is None or connection.source.function_name is None:
-        print(f"  -Rejecting due to SOURCE")
         continue
     if connection.target is None or connection.target.function_name is None:
-        print(f"  -Rejecting due to TARGET")
         continue
     if connection.target.function_name in deployed_func_names and connection.source.function_name in deployed_func_names:
-        print(f"  +Adding as INTERNAL")
         internal_connections.append(connection)
-    else:
-        print(f"  -Rejecting as EXTERNAL")
 
 iface_source_map = {}
 iface_target_map = {}
diff --git a/examples/generate_ecss_demo.sh b/examples/generate_ecss_demo.sh
index efba071..8ce16b9 100755
--- a/examples/generate_ecss_demo.sh
+++ b/examples/generate_ecss_demo.sh
@@ -9,4 +9,6 @@ pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_4_2_software_dynamic_a
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_5_internal_interface_design.pdf output/ecss-e-st-40c_5_5_internal_interface_design.md
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_4_4_interfaces_context.tmplt
-pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_4_4_interfaces_context.pdf output/ecss-e-st-40c_4_4_interfaces_context.md
\ No newline at end of file
+pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_4_4_interfaces_context.pdf output/ecss-e-st-40c_4_4_interfaces_context.md
+template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_4_1_software_static_architecture.tmplt
+pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_4_1_software_static_architecture.pdf output/ecss-e-st-40c_4_1_software_static_architecture.md
\ No newline at end of file

From a8ebd195e4daaeead3ef2f8651f18bd64c22918f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Thu, 11 Dec 2025 02:19:55 +0100
Subject: [PATCH 24/28] Added overall architecture template

---
 .../ecss-e-st-40c_5_1_software_design.tmplt   |   0
 ...ss-e-st-40c_5_2_overall_architecture.tmplt | 102 ++++++++++++++++++
 ...-40c_5_3_software_copmponents_design.tmplt |  51 +++++++++
 examples/generate_ecss_demo.sh                |  20 ++--
 4 files changed, 165 insertions(+), 8 deletions(-)
 delete mode 100644 data/ecss-template/ecss-e-st-40c_5_1_software_design.tmplt

diff --git a/data/ecss-template/ecss-e-st-40c_5_1_software_design.tmplt b/data/ecss-template/ecss-e-st-40c_5_1_software_design.tmplt
deleted file mode 100644
index e69de29..0000000
diff --git a/data/ecss-template/ecss-e-st-40c_5_2_overall_architecture.tmplt b/data/ecss-template/ecss-e-st-40c_5_2_overall_architecture.tmplt
index e69de29..7ad8a05 100644
--- a/data/ecss-template/ecss-e-st-40c_5_2_overall_architecture.tmplt
+++ b/data/ecss-template/ecss-e-st-40c_5_2_overall_architecture.tmplt
@@ -0,0 +1,102 @@
+<%
+## Data Initialization
+# Get all functions
+
+funcs = []
+def get_function_children(func):
+    result = []
+    if func.nested_functions:
+        for nested in func.nested_functions:
+            result.append(nested)
+            result.extend(get_function_children(nested))
+    return result
+
+for func in interface_view.functions:
+    funcs.append(func)
+    funcs.extend(get_function_children(func))
+
+funcs.sort(key=lambda f: f.name.lower())
+
+# Get functions deployed to the target partition
+target_partition_name = values["TARGET"]
+
+deployed_funcs = []
+target_partition = None
+target_node = None
+for node in deployment_view.nodes:
+    for partition in node.partitions:
+        if partition.name == target_partition_name:
+            target_node = node
+            target_partition = partition
+        
+deployed_func_names = [f.name for f in target_partition.functions]
+for fun in funcs:
+    if fun.name in deployed_func_names:
+        deployed_funcs.append(fun)
+
+# Only leaf functions are deployed, so a correction for parents must be applied
+for func in funcs:
+    if func.nested_functions:
+        for nested in func.nested_functions:
+            if nested in deployed_funcs and not func in deployed_funcs:
+                deployed_funcs.append(func)
+                deployed_func_names.append(func.name) 
+
+%>
+
+Components of ${target_partition_name} are enumerated in 4.1 Software Static Architecture, while threads are de described in 4.2 Software Dynamic Architecture.
+Details of each of the components are provided in 5.4 Aspects of each Component. Scheduling is pre-emptive, multithreaded, provided by ${node.type}.
+<%
+mutex_function_names = set()
+thread_function_names = set()
+for func in deployed_funcs:
+    if len(func.nested_functions) > 0:
+        continue 
+    for pi in func.provided_interfaces:
+        if pi.kind.value != "Unprotected":
+            mutex_function_names.add(func.name)
+        if pi.kind.value == "Cyclic" or pi.kind.value == "Sporadic":
+            thread_function_names.add(func.name)
+%>
+The following functions host threads for cyclic or sporadic interfaces (described in Chapter 4.2):
+% for func in deployed_funcs:
+<%
+if not func.name in thread_function_names:
+    continue
+%>
+
+- ${func.name}
+% endfor
+
+The following functions host semaphores, due to providing at least once cyclic, sporadic or protected interface:
+% for func in deployed_funcs:
+<%
+if not func.name in mutex_function_names:
+    continue
+%>
+
+- ${func.name}
+% endfor
+
+Table below lists the queues that the components interact through. Connections are described in detail in Chapter 5.5.
+
+| Queue | Item Type | Size |
+| - | - | - |
+% for func in deployed_funcs:
+<%
+if len(func.nested_functions) > 0:
+    continue
+%>\
+% for pi in func.provided_interfaces:
+<%
+if pi.kind.value != "Sporadic":
+    continue
+
+param = "Dummy Item"
+if len(pi.input_parameters) > 0:
+    param = pi.input_parameters[0].type
+%>\
+| ${func.name}::${pi.name} | ${param} | ${pi.queue_size} |
+% endfor
+% endfor
+
diff --git a/data/ecss-template/ecss-e-st-40c_5_3_software_copmponents_design.tmplt b/data/ecss-template/ecss-e-st-40c_5_3_software_copmponents_design.tmplt
index e69de29..467b979 100644
--- a/data/ecss-template/ecss-e-st-40c_5_3_software_copmponents_design.tmplt
+++ b/data/ecss-template/ecss-e-st-40c_5_3_software_copmponents_design.tmplt
@@ -0,0 +1,51 @@
+<%
+## Data Initialization
+# Get all functions
+
+funcs = []
+def get_function_children(func):
+    result = []
+    if func.nested_functions:
+        for nested in func.nested_functions:
+            result.append(nested)
+            result.extend(get_function_children(nested))
+    return result
+
+for func in interface_view.functions:
+    funcs.append(func)
+    funcs.extend(get_function_children(func))
+
+funcs.sort(key=lambda f: f.name.lower())
+
+# Get functions deployed to the target partition
+target_partition_name = values["TARGET"]
+
+deployed_funcs = []
+target_partition = None
+for node in deployment_view.nodes:
+    for partition in node.partitions:
+        if partition.name == target_partition_name:
+            target_partition = partition
+        
+deployed_func_names = [f.name for f in target_partition.functions]
+for fun in funcs:
+    if fun.name in deployed_func_names:
+        deployed_funcs.append(fun)
+
+# Only leaf functions are deployed, so a correction for parents must be applied
+for func in funcs:
+    if func.nested_functions:
+        for nested in func.nested_functions:
+            if nested in deployed_funcs and not func in deployed_funcs:
+                deployed_funcs.append(func)
+                deployed_func_names.append(func.name) 
+
+%>
+
+The below table lists all components of ${target_partition_name}.
+
+| Function | Type | Description |
+| -| - | - |
+% for func in deployed_funcs:
+| ${func.name} | ${func.language.value if len(func.nested_functions) == 0 else "COMPOSITE" } | ${func.comment} |
+% endfor
\ No newline at end of file
diff --git a/examples/generate_ecss_demo.sh b/examples/generate_ecss_demo.sh
index 8ce16b9..0d33eee 100755
--- a/examples/generate_ecss_demo.sh
+++ b/examples/generate_ecss_demo.sh
@@ -1,14 +1,18 @@
 #!/bin/bash
 mkdir -p output
-template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
-pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_6_requirement_traceability.pdf output/ecss-e-st-40c_6_requirement_traceability.md
-template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
-pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_4_aspects_of_each_component.pdf output/ecss-e-st-40c_5_4_aspects_of_each_component.md
+template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_4_1_software_static_architecture.tmplt
+pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_4_1_software_static_architecture.pdf output/ecss-e-st-40c_4_1_software_static_architecture.md
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_4_2_software_dynamic_architecture.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_4_2_software_dynamic_architecture.pdf output/ecss-e-st-40c_4_2_software_dynamic_architecture.md
-template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
-pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_5_internal_interface_design.pdf output/ecss-e-st-40c_5_5_internal_interface_design.md
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_4_4_interfaces_context.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_4_4_interfaces_context.pdf output/ecss-e-st-40c_4_4_interfaces_context.md
-template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_4_1_software_static_architecture.tmplt
-pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_4_1_software_static_architecture.pdf output/ecss-e-st-40c_4_1_software_static_architecture.md
\ No newline at end of file
+template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_2_overall_architecture.tmplt
+pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_2_overall_architecture.pdf output/ecss-e-st-40c_5_2_overall_architecture.md
+template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_3_software_copmponents_design.tmplt
+pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_3_software_copmponents_design.pdf output/ecss-e-st-40c_5_3_software_copmponents_design.md
+template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
+pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_4_aspects_of_each_component.pdf output/ecss-e-st-40c_5_4_aspects_of_each_component.md
+template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
+pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_5_internal_interface_design.pdf output/ecss-e-st-40c_5_5_internal_interface_design.md
+template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
+pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_6_requirement_traceability.pdf output/ecss-e-st-40c_6_requirement_traceability.md
\ No newline at end of file

From f2c01bd9136acd863493659850e916614791c717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Thu, 11 Dec 2025 02:25:57 +0100
Subject: [PATCH 25/28] Improved System Objects example

---
 examples/generate_so_list.sh | 3 ++-
 examples/so_list.tmplt       | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/examples/generate_so_list.sh b/examples/generate_so_list.sh
index 298f8bb..9fef728 100755
--- a/examples/generate_so_list.sh
+++ b/examples/generate_so_list.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 mkdir -p output
-template-processor --verbosity info --sos ../data/events.csv -o output -t so_list.tmplt
\ No newline at end of file
+template-processor --verbosity info --sos ../data/events.csv -o output -t so_list.tmplt
+pandoc --pdf-engine=pdfroff --output=output/so_list.pdf output/so_list.md
\ No newline at end of file
diff --git a/examples/so_list.tmplt b/examples/so_list.tmplt
index 2260540..e80082c 100644
--- a/examples/so_list.tmplt
+++ b/examples/so_list.tmplt
@@ -1,8 +1,10 @@
 ### List of all System Objects
 % for name, so_type in system_object_types.items():
-[${name}]
+
+# [${name}]
 Properties: ${', '.join(so_type.property_names)}
 % for idx, instance in enumerate(so_type.instances):
-Instance ${idx}: ${', '.join(instance.values.values())}
+
+- Instance ${idx}: ${', '.join(instance.values.values())}
 % endfor
 % endfor
\ No newline at end of file

From 82b67308b390faea9386dea4602c752c4e9e104c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Thu, 11 Dec 2025 12:51:51 +0100
Subject: [PATCH 26/28] Review fixes

---
 ...st-40c_5_3_software_components_design.tmplt} |  0
 examples/generate_ecss_demo.sh                  |  4 ++--
 templateprocessor/cli.py                        | 17 +++++++++++++----
 templateprocessor/ivreader.py                   |  8 ++++++--
 templateprocessor/templateinstantiator.py       |  8 ++++----
 tests/test_templateinstantiator.py              |  3 +--
 6 files changed, 26 insertions(+), 14 deletions(-)
 rename data/ecss-template/{ecss-e-st-40c_5_3_software_copmponents_design.tmplt => ecss-e-st-40c_5_3_software_components_design.tmplt} (100%)

diff --git a/data/ecss-template/ecss-e-st-40c_5_3_software_copmponents_design.tmplt b/data/ecss-template/ecss-e-st-40c_5_3_software_components_design.tmplt
similarity index 100%
rename from data/ecss-template/ecss-e-st-40c_5_3_software_copmponents_design.tmplt
rename to data/ecss-template/ecss-e-st-40c_5_3_software_components_design.tmplt
diff --git a/examples/generate_ecss_demo.sh b/examples/generate_ecss_demo.sh
index 0d33eee..84ce76a 100755
--- a/examples/generate_ecss_demo.sh
+++ b/examples/generate_ecss_demo.sh
@@ -8,8 +8,8 @@ template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfa
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_4_4_interfaces_context.pdf output/ecss-e-st-40c_4_4_interfaces_context.md
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_2_overall_architecture.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_2_overall_architecture.pdf output/ecss-e-st-40c_5_2_overall_architecture.md
-template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_3_software_copmponents_design.tmplt
-pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_3_software_copmponents_design.pdf output/ecss-e-st-40c_5_3_software_copmponents_design.md
+template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_3_software_components_design.tmplt
+pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_3_software_components_design.pdf output/ecss-e-st-40c_5_3_software_components_design.md
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_4_aspects_of_each_component.pdf output/ecss-e-st-40c_5_4_aspects_of_each_component.md
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
diff --git a/templateprocessor/cli.py b/templateprocessor/cli.py
index ba8dadd..edf57a0 100644
--- a/templateprocessor/cli.py
+++ b/templateprocessor/cli.py
@@ -4,7 +4,6 @@
 
 import logging
 import argparse
-import os
 from pathlib import Path
 import sys
 from templateprocessor import __version__
@@ -63,6 +62,13 @@ def parse_arguments() -> argparse.Namespace:
         action="append",
     )
 
+    parser.add_argument(
+        "-m",
+        "--module-directory",
+        help="Module directory for Mako templating engine",
+        metavar="FILE",
+    )
+
     parser.add_argument(
         "-o",
         "--output",
@@ -106,14 +112,14 @@ def get_values_dictionary(values: list[str]) -> dict[str, str]:
     result = {}
     for pair in values:
         if pair.count("=") != 1:
-            raise Exception(
+            raise ValueError(
                 f"Pair [{pair}] contains incorrect number of name/value separators (=)"
             )
         split = pair.split("=")
         name = split[0].strip()
         value = split[1].strip()
         if len(name) == 0:
-            raise Exception(f"Name in [{pair}] is empty")
+            raise ValueError(f"Name in [{pair}] is empty")
         # value can be empty
         result[name] = value
     return result
@@ -133,6 +139,7 @@ def main():
     logging.debug(f"Values: {args.value}")
     logging.debug(f"Templates: {args.template}")
     logging.debug(f"Output Directory: {args.output}")
+    logging.debug(f"Module directory: {args.module_directory}")
 
     logging.info(f"Reading Interface View from {args.iv}")
     iv = IVReader().read(args.iv) if args.iv else InterfaceView()
@@ -162,7 +169,9 @@ def main():
             with open(template_file, "r") as f:
                 template = f.read()
             logging.debug(f"Instantiating template:\n {template}")
-            instantiated_template = instantiator.instantiate(template, "")
+            instantiated_template = instantiator.instantiate(
+                template, args.module_directory
+            )
             logging.debug(f"Instantiation:\n {instantiated_template}")
             output = Path(args.output) / f"{name}.md"
             logging.debug(f"Saving to {output}")
diff --git a/templateprocessor/ivreader.py b/templateprocessor/ivreader.py
index 58509de..293abed 100644
--- a/templateprocessor/ivreader.py
+++ b/templateprocessor/ivreader.py
@@ -135,7 +135,9 @@ def _parse_function(self, elem: ET.Element) -> Function:
                 if elem.get("type_language")
                 else None
             ),
-            requirement_ids=elem.get("requirement_ids", "").split(","),
+            requirement_ids=[
+                rid for rid in elem.get("requirement_ids", "").split(",") if rid
+            ],
         )
 
         # Parse properties
@@ -195,7 +197,9 @@ def _parse_interface(self, elem: ET.Element) -> FunctionInterface:
                 else None
             ),
             priority=int(elem.get("priority")) if elem.get("priority") else None,
-            requirement_ids=elem.get("requirement_ids", "").split(","),
+            requirement_ids=[
+                rid for rid in elem.get("requirement_ids", "").split(",") if rid
+            ],
         )
 
         # Parse input parameters
diff --git a/templateprocessor/templateinstantiator.py b/templateprocessor/templateinstantiator.py
index d2a32b2..25f0c62 100644
--- a/templateprocessor/templateinstantiator.py
+++ b/templateprocessor/templateinstantiator.py
@@ -6,8 +6,8 @@
 
 from templateprocessor.iv import InterfaceView
 from templateprocessor.dv import DeploymentView
-from templateprocessor.so import SystemObjectType, SystemObject
-from typing import List, Dict
+from templateprocessor.so import SystemObjectType
+from typing import Dict
 from mako.template import Template
 
 
@@ -16,8 +16,8 @@ class TemplateInstantiator:
     Instantiator of Mako templates
     """
 
-    system_object_types: Dict[str, SystemObjectType] = dict()
-    values: Dict[str, str] = dict()
+    system_object_types: Dict[str, SystemObjectType]
+    values: Dict[str, str]
     interface_view: InterfaceView
     deployment_view: DeploymentView
 
diff --git a/tests/test_templateinstantiator.py b/tests/test_templateinstantiator.py
index 040a500..e11ca52 100644
--- a/tests/test_templateinstantiator.py
+++ b/tests/test_templateinstantiator.py
@@ -4,8 +4,7 @@
 
 import pytest
 import tempfile
-from pathlib import Path
-from typing import Dict, List
+from typing import Dict
 from templateprocessor.templateinstantiator import TemplateInstantiator
 from templateprocessor.iv import (
     InterfaceView,

From 99f23b9aa10601eb4e6e208389646d82056ff82f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Thu, 11 Dec 2025 13:04:13 +0100
Subject: [PATCH 27/28] Refactored CLI

---
 templateprocessor/cli.py | 73 +++++++++++++++++++++++++++-------------
 1 file changed, 49 insertions(+), 24 deletions(-)

diff --git a/templateprocessor/cli.py b/templateprocessor/cli.py
index edf57a0..feb3c5d 100644
--- a/templateprocessor/cli.py
+++ b/templateprocessor/cli.py
@@ -13,6 +13,7 @@
 from templateprocessor.ivreader import IVReader
 from templateprocessor.soreader import SOReader
 from templateprocessor.dvreader import DVReader
+from templateprocessor.so import SystemObjectType
 
 
 def parse_arguments() -> argparse.Namespace:
@@ -125,6 +126,47 @@ def get_values_dictionary(values: list[str]) -> dict[str, str]:
     return result
 
 
+def read_sots(file_names: list[str]) -> dict[str, SystemObjectType]:
+    sots = {}
+    so_reader = SOReader()
+    for sot_file in file_names:
+        try:
+            logging.info(f"Reading System Objects from {sot_file}")
+            name = Path(sot_file).stem
+            logging.debug(f"-SOT name: {name}")
+            sos = so_reader.read(sot_file)
+            sots[name] = sos
+        except Exception as e:
+            logging.error(f"Could not read System Objects from {sot_file}")
+    return sots
+
+
+def instantiate(
+    instantiator: TemplateInstantiator,
+    template_file: str,
+    module_directory: str,
+    output_directory: str,
+):
+    try:
+        logging.info(f"Processing template {template_file}")
+        name = Path(template_file).stem
+        logging.debug(f"Base name: {name}")
+        logging.debug(f"Reading template {template_file}")
+        with open(template_file, "r") as f:
+            template = f.read()
+        logging.debug(f"Instantiating template:\n {template}")
+        instantiated_template = instantiator.instantiate(template, module_directory)
+        logging.debug(f"Instantiation:\n {instantiated_template}")
+        output = Path(output_directory) / f"{name}.md"
+        logging.debug(f"Saving to {output}")
+        with open(output, "w") as f:
+            f.write(instantiated_template)
+    except FileNotFoundError as e:
+        logging.error(f"File not found: {e.filename}")
+    except Exception as e:
+        logging.error(f"Error processing template {template_file}: {e}")
+
+
 def main():
     """Main entry point for the Template Processor CLI."""
 
@@ -143,17 +185,13 @@ def main():
 
     logging.info(f"Reading Interface View from {args.iv}")
     iv = IVReader().read(args.iv) if args.iv else InterfaceView()
+
     logging.info(f"Reading Deployment View from {args.dv}")
     dv = DVReader().read(args.dv) if args.dv else DeploymentView()
-    sots = {}
-    if args.sos:
-        so_reader = SOReader()
-        for sot_file in args.sos:
-            logging.info(f"Reading System Objects from {sot_file}")
-            name = Path(sot_file).stem
-            logging.debug(f"-SOT name: {name}")
-            sos = so_reader.read(sot_file)
-            sots[name] = sos
+
+    logging.info(f"Reading provided System Objects")
+    sots = read_sots(args.sos) if args.sos else {}
+
     logging.info(f"Parsing values from {args.value}")
     values = get_values_dictionary(args.value)
 
@@ -161,22 +199,9 @@ def main():
     instantiator = TemplateInstantiator(iv, dv, sots, values)
 
     if args.template:
+        logging.info(f"Instantiating templates")
         for template_file in args.template:
-            logging.info(f"Processing template {template_file}")
-            name = Path(template_file).stem
-            logging.debug(f"Base name: {name}")
-            logging.debug(f"Reading template {template_file}")
-            with open(template_file, "r") as f:
-                template = f.read()
-            logging.debug(f"Instantiating template:\n {template}")
-            instantiated_template = instantiator.instantiate(
-                template, args.module_directory
-            )
-            logging.debug(f"Instantiation:\n {instantiated_template}")
-            output = Path(args.output) / f"{name}.md"
-            logging.debug(f"Saving to {output}")
-            with open(output, "w") as f:
-                f.write(instantiated_template)
+            instantiate(instantiator, template_file, args.module_directory, args.output)
 
     return 0
 

From 6212c6f32489c913ac3d014fbc67f37e5dbd4299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurowski?= <mkurowski@n7space.com>
Date: Thu, 11 Dec 2025 15:45:18 +0100
Subject: [PATCH 28/28] Review fixes

---
 examples/generate_ecss_demo.sh | 8 ++++++++
 examples/generate_so_list.sh   | 2 +-
 templateprocessor/cli.py       | 6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/examples/generate_ecss_demo.sh b/examples/generate_ecss_demo.sh
index 84ce76a..ba562eb 100755
--- a/examples/generate_ecss_demo.sh
+++ b/examples/generate_ecss_demo.sh
@@ -1,18 +1,26 @@
 #!/bin/bash
 mkdir -p output
+
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_4_1_software_static_architecture.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_4_1_software_static_architecture.pdf output/ecss-e-st-40c_4_1_software_static_architecture.md
+
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_4_2_software_dynamic_architecture.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_4_2_software_dynamic_architecture.pdf output/ecss-e-st-40c_4_2_software_dynamic_architecture.md
+
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_4_4_interfaces_context.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_4_4_interfaces_context.pdf output/ecss-e-st-40c_4_4_interfaces_context.md
+
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_2_overall_architecture.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_2_overall_architecture.pdf output/ecss-e-st-40c_5_2_overall_architecture.md
+
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_3_software_components_design.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_3_software_components_design.pdf output/ecss-e-st-40c_5_3_software_components_design.md
+
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_4_aspects_of_each_component.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_4_aspects_of_each_component.pdf output/ecss-e-st-40c_5_4_aspects_of_each_component.md
+
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_5_5_internal_interface_design.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_5_5_internal_interface_design.pdf output/ecss-e-st-40c_5_5_internal_interface_design.md
+
 template-processor --verbosity info --value TARGET=ASW --iv demo-project/interfaceview.xml --dv demo-project/deploymentview.dv.xml -o output -t ../data/ecss-template/ecss-e-st-40c_6_requirement_traceability.tmplt
 pandoc --pdf-engine=pdfroff --output=output/ecss-e-st-40c_6_requirement_traceability.pdf output/ecss-e-st-40c_6_requirement_traceability.md
\ No newline at end of file
diff --git a/examples/generate_so_list.sh b/examples/generate_so_list.sh
index 9fef728..49ad0eb 100755
--- a/examples/generate_so_list.sh
+++ b/examples/generate_so_list.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 mkdir -p output
-template-processor --verbosity info --sos ../data/events.csv -o output -t so_list.tmplt
+template-processor --verbosity info --system-objects ../data/events.csv -o output -t so_list.tmplt
 pandoc --pdf-engine=pdfroff --output=output/so_list.pdf output/so_list.md
\ No newline at end of file
diff --git a/templateprocessor/cli.py b/templateprocessor/cli.py
index feb3c5d..e8a18ea 100644
--- a/templateprocessor/cli.py
+++ b/templateprocessor/cli.py
@@ -42,7 +42,7 @@ def parse_arguments() -> argparse.Namespace:
 
     parser.add_argument(
         "-s",
-        "--sos",
+        "--system-objects",
         help="Input System Objects provided as CSV files (each as a separate argument)",
         metavar="FILE",
         action="append",
@@ -177,7 +177,7 @@ def main():
     logging.info("Template Processor")
     logging.debug(f"Interface View: {args.iv}")
     logging.debug(f"Deployment View: {args.dv}")
-    logging.debug(f"System Objects: {args.sos}")
+    logging.debug(f"System Objects: {args.system_objects}")
     logging.debug(f"Values: {args.value}")
     logging.debug(f"Templates: {args.template}")
     logging.debug(f"Output Directory: {args.output}")
@@ -190,7 +190,7 @@ def main():
     dv = DVReader().read(args.dv) if args.dv else DeploymentView()
 
     logging.info(f"Reading provided System Objects")
-    sots = read_sots(args.sos) if args.sos else {}
+    sots = read_sots(args.system_objects) if args.system_objects else {}
 
     logging.info(f"Parsing values from {args.value}")
     values = get_values_dictionary(args.value)