From 6fa1b4ccf72419d3f5b6677f7e5d3a41ea0296d4 Mon Sep 17 00:00:00 2001
From: Cristi <thiess.cristi@gmail.com>
Date: Fri, 5 Dec 2025 08:52:08 +0200
Subject: [PATCH 1/2] Fixed issue with ComponentPostProcessor

---
 include/rexsapi/ModelHelper.hxx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/rexsapi/ModelHelper.hxx b/include/rexsapi/ModelHelper.hxx
index 4d3ca01..6397d59 100644
--- a/include/rexsapi/ModelHelper.hxx
+++ b/include/rexsapi/ModelHelper.hxx
@@ -160,12 +160,17 @@ namespace rexsapi::detail
     void process(TResult& result, const detail::TModeAdapter& mode, const rexsapi::TComponents& components,
                  const ComponentMapping& componentMapping) noexcept
     {
+      static const std::unordered_set<std::string> EXCLUDED_REFERENCE_ATTRIBUTES = {
+          "referenced_component_id",
+          "reference_component_for_position"
+      };
       for (const auto& component : components) {
         TAttributes attributes;
         for (const auto& attribute : component.getAttributes()) {
           // TODO: maybe add new value type REFERENCE_EXTERNAL_COMPONENT
-          if (attribute.getValueType() == TValueType::REFERENCE_COMPONENT && attribute.hasValue() &&
-              attribute.getAttributeId() != "referenced_component_id") {
+          if (attribute.getValueType() == TValueType::REFERENCE_COMPONENT &&
+              attribute.hasValue() &&
+              EXCLUDED_REFERENCE_ATTRIBUTES.find(attribute.getAttributeId()) == EXCLUDED_REFERENCE_ATTRIBUTES.end()) {
             auto id = attribute.getValue<TReferenceComponentType>();
             const auto* comp = componentMapping.getComponent(static_cast<uint64_t>(id), components);
             if (comp == nullptr) {

From 81ccfd12052a96f83c144d45c55a7f1e739cf13f Mon Sep 17 00:00:00 2001
From: Cristi <thiess.cristi@gmail.com>
Date: Fri, 5 Dec 2025 08:53:38 +0200
Subject: [PATCH 2/2] Added include

---
 include/rexsapi/ModelHelper.hxx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/rexsapi/ModelHelper.hxx b/include/rexsapi/ModelHelper.hxx
index 6397d59..20466b4 100644
--- a/include/rexsapi/ModelHelper.hxx
+++ b/include/rexsapi/ModelHelper.hxx
@@ -24,6 +24,7 @@
 
 #include <algorithm>
 #include <unordered_map>
+#include <unordered_set>
 
 namespace rexsapi::detail
 {