From 1b5f6a891e66f87139b5204953c2296634817f3b Mon Sep 17 00:00:00 2001
From: Tony Xiang <tony.xiang@alliander.com>
Date: Thu, 15 Aug 2024 08:56:12 +0200
Subject: [PATCH 1/7] move trait

Signed-off-by: Tony Xiang <tony.xiang@alliander.com>
---
 .../include/power_grid_model/auxiliary/meta_data.hpp       | 6 ------
 .../power_grid_model/auxiliary/meta_gen/gen_getters.hpp    | 7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp
index bbb0fe658..4f06e3c44 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp
@@ -16,12 +16,6 @@
 
 namespace power_grid_model::meta_data {
 
-// pointer to member
-template <class T> struct trait_pointer_to_member;
-template <class StructType, class ValueType> struct trait_pointer_to_member<ValueType StructType::*> {
-    using value_type = ValueType;
-};
-
 // primary template to get the attribute list of a component
 // the specializations will contain static constexpr "value" field
 //    which is a std::array
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
index b297a4f72..62296dd6f 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
@@ -10,6 +10,13 @@
 
 namespace power_grid_model::meta_data::meta_data_gen {
 
+// pointer to member
+template <class T> struct trait_pointer_to_member;
+template <class StructType, class ValueType> struct trait_pointer_to_member<ValueType StructType::*> {
+    using value_type = ValueType;
+    using struct_type = StructType;
+};
+
 // getter for meta attribute
 template <class StructType, auto member_ptr, size_t offset, auto attribute_name_getter> struct get_meta_attribute {
     using ValueType = typename trait_pointer_to_member<decltype(member_ptr)>::value_type;

From 2b1dcf048ae73cea0ae05719cd528b84b84c5647 Mon Sep 17 00:00:00 2001
From: Tony Xiang <tony.xiang@alliander.com>
Date: Thu, 15 Aug 2024 09:40:05 +0200
Subject: [PATCH 2/7] first refactor

Signed-off-by: Tony Xiang <tony.xiang@alliander.com>
---
 .../meta_gen/attribute_classes.hpp.jinja      |   2 +-
 .../auxiliary/meta_gen/gen_getters.hpp        |  10 +-
 .../auxiliary/meta_gen/input.hpp              | 362 +++++++++---------
 .../auxiliary/meta_gen/output.hpp             | 172 ++++-----
 .../auxiliary/meta_gen/update.hpp             | 116 +++---
 tests/cpp_unit_tests/test_dataset.cpp         |  46 +--
 6 files changed, 350 insertions(+), 358 deletions(-)

diff --git a/code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/attribute_classes.hpp.jinja b/code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/attribute_classes.hpp.jinja
index 5c8519bc7..9373d55be 100644
--- a/code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/attribute_classes.hpp.jinja
+++ b/code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/attribute_classes.hpp.jinja
@@ -34,7 +34,7 @@ struct get_attributes_list<{{ attribute_class.name }}> {
     static constexpr std::array<MetaAttribute, {{ attribute_class.full_attributes|length }}> value{
             // all attributes including base class
             {% for attribute in attribute_class.full_attributes %}
-            meta_data_gen::get_meta_attribute<{{ attribute_class.full_name }}, &{{ attribute_class.full_name }}::{{ attribute.names }}, offsetof({{ attribute_class.full_name }}, {{ attribute.names }}), []{ return "{{ attribute.names }}"; }>::value,
+            meta_data_gen::get_meta_attribute<&{{ attribute_class.full_name }}::{{ attribute.names }}>(offsetof({{ attribute_class.full_name }}, {{ attribute.names }}), "{{ attribute.names }}"),
             {%- endfor %}
     };
 };
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
index 62296dd6f..595e60d40 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
@@ -18,11 +18,13 @@ template <class StructType, class ValueType> struct trait_pointer_to_member<Valu
 };
 
 // getter for meta attribute
-template <class StructType, auto member_ptr, size_t offset, auto attribute_name_getter> struct get_meta_attribute {
-    using ValueType = typename trait_pointer_to_member<decltype(member_ptr)>::value_type;
+template <auto member_ptr, class MemberPtr = decltype(member_ptr)>
+constexpr MetaAttribute get_meta_attribute(size_t offset, char const* attribute_name) {
+    using ValueType = typename trait_pointer_to_member<MemberPtr>::value_type;
+    using StructType = typename trait_pointer_to_member<MemberPtr>::struct_type;
 
-    static constexpr MetaAttribute value{
-        .name = attribute_name_getter(),
+    return MetaAttribute{
+        .name = attribute_name,
         .ctype = ctype_v<ValueType>,
         .offset = offset,
         .size = sizeof(ValueType),
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/input.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/input.hpp
index a439b49a9..dfc3f2f31 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/input.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/input.hpp
@@ -26,7 +26,7 @@ struct get_attributes_list<BaseInput> {
     static constexpr std::array<MetaAttribute, 1> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<BaseInput, &BaseInput::id, offsetof(BaseInput, id), []{ return "id"; }>::value,
+            meta_data_gen::get_meta_attribute<&BaseInput::id>(offsetof(BaseInput, id), "id"),
     };
 };
 
@@ -35,8 +35,8 @@ struct get_attributes_list<NodeInput> {
     static constexpr std::array<MetaAttribute, 2> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<NodeInput, &NodeInput::id, offsetof(NodeInput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<NodeInput, &NodeInput::u_rated, offsetof(NodeInput, u_rated), []{ return "u_rated"; }>::value,
+            meta_data_gen::get_meta_attribute<&NodeInput::id>(offsetof(NodeInput, id), "id"),
+            meta_data_gen::get_meta_attribute<&NodeInput::u_rated>(offsetof(NodeInput, u_rated), "u_rated"),
     };
 };
 
@@ -45,11 +45,11 @@ struct get_attributes_list<BranchInput> {
     static constexpr std::array<MetaAttribute, 5> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<BranchInput, &BranchInput::id, offsetof(BranchInput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchInput, &BranchInput::from_node, offsetof(BranchInput, from_node), []{ return "from_node"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchInput, &BranchInput::to_node, offsetof(BranchInput, to_node), []{ return "to_node"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchInput, &BranchInput::from_status, offsetof(BranchInput, from_status), []{ return "from_status"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchInput, &BranchInput::to_status, offsetof(BranchInput, to_status), []{ return "to_status"; }>::value,
+            meta_data_gen::get_meta_attribute<&BranchInput::id>(offsetof(BranchInput, id), "id"),
+            meta_data_gen::get_meta_attribute<&BranchInput::from_node>(offsetof(BranchInput, from_node), "from_node"),
+            meta_data_gen::get_meta_attribute<&BranchInput::to_node>(offsetof(BranchInput, to_node), "to_node"),
+            meta_data_gen::get_meta_attribute<&BranchInput::from_status>(offsetof(BranchInput, from_status), "from_status"),
+            meta_data_gen::get_meta_attribute<&BranchInput::to_status>(offsetof(BranchInput, to_status), "to_status"),
     };
 };
 
@@ -58,13 +58,13 @@ struct get_attributes_list<Branch3Input> {
     static constexpr std::array<MetaAttribute, 7> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<Branch3Input, &Branch3Input::id, offsetof(Branch3Input, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Input, &Branch3Input::node_1, offsetof(Branch3Input, node_1), []{ return "node_1"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Input, &Branch3Input::node_2, offsetof(Branch3Input, node_2), []{ return "node_2"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Input, &Branch3Input::node_3, offsetof(Branch3Input, node_3), []{ return "node_3"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Input, &Branch3Input::status_1, offsetof(Branch3Input, status_1), []{ return "status_1"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Input, &Branch3Input::status_2, offsetof(Branch3Input, status_2), []{ return "status_2"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Input, &Branch3Input::status_3, offsetof(Branch3Input, status_3), []{ return "status_3"; }>::value,
+            meta_data_gen::get_meta_attribute<&Branch3Input::id>(offsetof(Branch3Input, id), "id"),
+            meta_data_gen::get_meta_attribute<&Branch3Input::node_1>(offsetof(Branch3Input, node_1), "node_1"),
+            meta_data_gen::get_meta_attribute<&Branch3Input::node_2>(offsetof(Branch3Input, node_2), "node_2"),
+            meta_data_gen::get_meta_attribute<&Branch3Input::node_3>(offsetof(Branch3Input, node_3), "node_3"),
+            meta_data_gen::get_meta_attribute<&Branch3Input::status_1>(offsetof(Branch3Input, status_1), "status_1"),
+            meta_data_gen::get_meta_attribute<&Branch3Input::status_2>(offsetof(Branch3Input, status_2), "status_2"),
+            meta_data_gen::get_meta_attribute<&Branch3Input::status_3>(offsetof(Branch3Input, status_3), "status_3"),
     };
 };
 
@@ -73,8 +73,8 @@ struct get_attributes_list<SensorInput> {
     static constexpr std::array<MetaAttribute, 2> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<SensorInput, &SensorInput::id, offsetof(SensorInput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<SensorInput, &SensorInput::measured_object, offsetof(SensorInput, measured_object), []{ return "measured_object"; }>::value,
+            meta_data_gen::get_meta_attribute<&SensorInput::id>(offsetof(SensorInput, id), "id"),
+            meta_data_gen::get_meta_attribute<&SensorInput::measured_object>(offsetof(SensorInput, measured_object), "measured_object"),
     };
 };
 
@@ -83,9 +83,9 @@ struct get_attributes_list<ApplianceInput> {
     static constexpr std::array<MetaAttribute, 3> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<ApplianceInput, &ApplianceInput::id, offsetof(ApplianceInput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<ApplianceInput, &ApplianceInput::node, offsetof(ApplianceInput, node), []{ return "node"; }>::value,
-            meta_data_gen::get_meta_attribute<ApplianceInput, &ApplianceInput::status, offsetof(ApplianceInput, status), []{ return "status"; }>::value,
+            meta_data_gen::get_meta_attribute<&ApplianceInput::id>(offsetof(ApplianceInput, id), "id"),
+            meta_data_gen::get_meta_attribute<&ApplianceInput::node>(offsetof(ApplianceInput, node), "node"),
+            meta_data_gen::get_meta_attribute<&ApplianceInput::status>(offsetof(ApplianceInput, status), "status"),
     };
 };
 
@@ -94,20 +94,20 @@ struct get_attributes_list<LineInput> {
     static constexpr std::array<MetaAttribute, 14> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<LineInput, &LineInput::id, offsetof(LineInput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<LineInput, &LineInput::from_node, offsetof(LineInput, from_node), []{ return "from_node"; }>::value,
-            meta_data_gen::get_meta_attribute<LineInput, &LineInput::to_node, offsetof(LineInput, to_node), []{ return "to_node"; }>::value,
-            meta_data_gen::get_meta_attribute<LineInput, &LineInput::from_status, offsetof(LineInput, from_status), []{ return "from_status"; }>::value,
-            meta_data_gen::get_meta_attribute<LineInput, &LineInput::to_status, offsetof(LineInput, to_status), []{ return "to_status"; }>::value,
-            meta_data_gen::get_meta_attribute<LineInput, &LineInput::r1, offsetof(LineInput, r1), []{ return "r1"; }>::value,
-            meta_data_gen::get_meta_attribute<LineInput, &LineInput::x1, offsetof(LineInput, x1), []{ return "x1"; }>::value,
-            meta_data_gen::get_meta_attribute<LineInput, &LineInput::c1, offsetof(LineInput, c1), []{ return "c1"; }>::value,
-            meta_data_gen::get_meta_attribute<LineInput, &LineInput::tan1, offsetof(LineInput, tan1), []{ return "tan1"; }>::value,
-            meta_data_gen::get_meta_attribute<LineInput, &LineInput::r0, offsetof(LineInput, r0), []{ return "r0"; }>::value,
-            meta_data_gen::get_meta_attribute<LineInput, &LineInput::x0, offsetof(LineInput, x0), []{ return "x0"; }>::value,
-            meta_data_gen::get_meta_attribute<LineInput, &LineInput::c0, offsetof(LineInput, c0), []{ return "c0"; }>::value,
-            meta_data_gen::get_meta_attribute<LineInput, &LineInput::tan0, offsetof(LineInput, tan0), []{ return "tan0"; }>::value,
-            meta_data_gen::get_meta_attribute<LineInput, &LineInput::i_n, offsetof(LineInput, i_n), []{ return "i_n"; }>::value,
+            meta_data_gen::get_meta_attribute<&LineInput::id>(offsetof(LineInput, id), "id"),
+            meta_data_gen::get_meta_attribute<&LineInput::from_node>(offsetof(LineInput, from_node), "from_node"),
+            meta_data_gen::get_meta_attribute<&LineInput::to_node>(offsetof(LineInput, to_node), "to_node"),
+            meta_data_gen::get_meta_attribute<&LineInput::from_status>(offsetof(LineInput, from_status), "from_status"),
+            meta_data_gen::get_meta_attribute<&LineInput::to_status>(offsetof(LineInput, to_status), "to_status"),
+            meta_data_gen::get_meta_attribute<&LineInput::r1>(offsetof(LineInput, r1), "r1"),
+            meta_data_gen::get_meta_attribute<&LineInput::x1>(offsetof(LineInput, x1), "x1"),
+            meta_data_gen::get_meta_attribute<&LineInput::c1>(offsetof(LineInput, c1), "c1"),
+            meta_data_gen::get_meta_attribute<&LineInput::tan1>(offsetof(LineInput, tan1), "tan1"),
+            meta_data_gen::get_meta_attribute<&LineInput::r0>(offsetof(LineInput, r0), "r0"),
+            meta_data_gen::get_meta_attribute<&LineInput::x0>(offsetof(LineInput, x0), "x0"),
+            meta_data_gen::get_meta_attribute<&LineInput::c0>(offsetof(LineInput, c0), "c0"),
+            meta_data_gen::get_meta_attribute<&LineInput::tan0>(offsetof(LineInput, tan0), "tan0"),
+            meta_data_gen::get_meta_attribute<&LineInput::i_n>(offsetof(LineInput, i_n), "i_n"),
     };
 };
 
@@ -116,11 +116,11 @@ struct get_attributes_list<LinkInput> {
     static constexpr std::array<MetaAttribute, 5> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<LinkInput, &LinkInput::id, offsetof(LinkInput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<LinkInput, &LinkInput::from_node, offsetof(LinkInput, from_node), []{ return "from_node"; }>::value,
-            meta_data_gen::get_meta_attribute<LinkInput, &LinkInput::to_node, offsetof(LinkInput, to_node), []{ return "to_node"; }>::value,
-            meta_data_gen::get_meta_attribute<LinkInput, &LinkInput::from_status, offsetof(LinkInput, from_status), []{ return "from_status"; }>::value,
-            meta_data_gen::get_meta_attribute<LinkInput, &LinkInput::to_status, offsetof(LinkInput, to_status), []{ return "to_status"; }>::value,
+            meta_data_gen::get_meta_attribute<&LinkInput::id>(offsetof(LinkInput, id), "id"),
+            meta_data_gen::get_meta_attribute<&LinkInput::from_node>(offsetof(LinkInput, from_node), "from_node"),
+            meta_data_gen::get_meta_attribute<&LinkInput::to_node>(offsetof(LinkInput, to_node), "to_node"),
+            meta_data_gen::get_meta_attribute<&LinkInput::from_status>(offsetof(LinkInput, from_status), "from_status"),
+            meta_data_gen::get_meta_attribute<&LinkInput::to_status>(offsetof(LinkInput, to_status), "to_status"),
     };
 };
 
@@ -129,35 +129,35 @@ struct get_attributes_list<TransformerInput> {
     static constexpr std::array<MetaAttribute, 29> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::id, offsetof(TransformerInput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::from_node, offsetof(TransformerInput, from_node), []{ return "from_node"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::to_node, offsetof(TransformerInput, to_node), []{ return "to_node"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::from_status, offsetof(TransformerInput, from_status), []{ return "from_status"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::to_status, offsetof(TransformerInput, to_status), []{ return "to_status"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::u1, offsetof(TransformerInput, u1), []{ return "u1"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::u2, offsetof(TransformerInput, u2), []{ return "u2"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::sn, offsetof(TransformerInput, sn), []{ return "sn"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::uk, offsetof(TransformerInput, uk), []{ return "uk"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::pk, offsetof(TransformerInput, pk), []{ return "pk"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::i0, offsetof(TransformerInput, i0), []{ return "i0"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::p0, offsetof(TransformerInput, p0), []{ return "p0"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::winding_from, offsetof(TransformerInput, winding_from), []{ return "winding_from"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::winding_to, offsetof(TransformerInput, winding_to), []{ return "winding_to"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::clock, offsetof(TransformerInput, clock), []{ return "clock"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::tap_side, offsetof(TransformerInput, tap_side), []{ return "tap_side"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::tap_pos, offsetof(TransformerInput, tap_pos), []{ return "tap_pos"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::tap_min, offsetof(TransformerInput, tap_min), []{ return "tap_min"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::tap_max, offsetof(TransformerInput, tap_max), []{ return "tap_max"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::tap_nom, offsetof(TransformerInput, tap_nom), []{ return "tap_nom"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::tap_size, offsetof(TransformerInput, tap_size), []{ return "tap_size"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::uk_min, offsetof(TransformerInput, uk_min), []{ return "uk_min"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::uk_max, offsetof(TransformerInput, uk_max), []{ return "uk_max"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::pk_min, offsetof(TransformerInput, pk_min), []{ return "pk_min"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::pk_max, offsetof(TransformerInput, pk_max), []{ return "pk_max"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::r_grounding_from, offsetof(TransformerInput, r_grounding_from), []{ return "r_grounding_from"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::x_grounding_from, offsetof(TransformerInput, x_grounding_from), []{ return "x_grounding_from"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::r_grounding_to, offsetof(TransformerInput, r_grounding_to), []{ return "r_grounding_to"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerInput, &TransformerInput::x_grounding_to, offsetof(TransformerInput, x_grounding_to), []{ return "x_grounding_to"; }>::value,
+            meta_data_gen::get_meta_attribute<&TransformerInput::id>(offsetof(TransformerInput, id), "id"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::from_node>(offsetof(TransformerInput, from_node), "from_node"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::to_node>(offsetof(TransformerInput, to_node), "to_node"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::from_status>(offsetof(TransformerInput, from_status), "from_status"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::to_status>(offsetof(TransformerInput, to_status), "to_status"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::u1>(offsetof(TransformerInput, u1), "u1"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::u2>(offsetof(TransformerInput, u2), "u2"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::sn>(offsetof(TransformerInput, sn), "sn"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::uk>(offsetof(TransformerInput, uk), "uk"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::pk>(offsetof(TransformerInput, pk), "pk"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::i0>(offsetof(TransformerInput, i0), "i0"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::p0>(offsetof(TransformerInput, p0), "p0"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::winding_from>(offsetof(TransformerInput, winding_from), "winding_from"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::winding_to>(offsetof(TransformerInput, winding_to), "winding_to"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::clock>(offsetof(TransformerInput, clock), "clock"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::tap_side>(offsetof(TransformerInput, tap_side), "tap_side"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::tap_pos>(offsetof(TransformerInput, tap_pos), "tap_pos"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::tap_min>(offsetof(TransformerInput, tap_min), "tap_min"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::tap_max>(offsetof(TransformerInput, tap_max), "tap_max"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::tap_nom>(offsetof(TransformerInput, tap_nom), "tap_nom"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::tap_size>(offsetof(TransformerInput, tap_size), "tap_size"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::uk_min>(offsetof(TransformerInput, uk_min), "uk_min"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::uk_max>(offsetof(TransformerInput, uk_max), "uk_max"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::pk_min>(offsetof(TransformerInput, pk_min), "pk_min"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::pk_max>(offsetof(TransformerInput, pk_max), "pk_max"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::r_grounding_from>(offsetof(TransformerInput, r_grounding_from), "r_grounding_from"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::x_grounding_from>(offsetof(TransformerInput, x_grounding_from), "x_grounding_from"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::r_grounding_to>(offsetof(TransformerInput, r_grounding_to), "r_grounding_to"),
+            meta_data_gen::get_meta_attribute<&TransformerInput::x_grounding_to>(offsetof(TransformerInput, x_grounding_to), "x_grounding_to"),
     };
 };
 
@@ -166,56 +166,56 @@ struct get_attributes_list<ThreeWindingTransformerInput> {
     static constexpr std::array<MetaAttribute, 50> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::id, offsetof(ThreeWindingTransformerInput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::node_1, offsetof(ThreeWindingTransformerInput, node_1), []{ return "node_1"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::node_2, offsetof(ThreeWindingTransformerInput, node_2), []{ return "node_2"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::node_3, offsetof(ThreeWindingTransformerInput, node_3), []{ return "node_3"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::status_1, offsetof(ThreeWindingTransformerInput, status_1), []{ return "status_1"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::status_2, offsetof(ThreeWindingTransformerInput, status_2), []{ return "status_2"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::status_3, offsetof(ThreeWindingTransformerInput, status_3), []{ return "status_3"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::u1, offsetof(ThreeWindingTransformerInput, u1), []{ return "u1"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::u2, offsetof(ThreeWindingTransformerInput, u2), []{ return "u2"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::u3, offsetof(ThreeWindingTransformerInput, u3), []{ return "u3"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::sn_1, offsetof(ThreeWindingTransformerInput, sn_1), []{ return "sn_1"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::sn_2, offsetof(ThreeWindingTransformerInput, sn_2), []{ return "sn_2"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::sn_3, offsetof(ThreeWindingTransformerInput, sn_3), []{ return "sn_3"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::uk_12, offsetof(ThreeWindingTransformerInput, uk_12), []{ return "uk_12"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::uk_13, offsetof(ThreeWindingTransformerInput, uk_13), []{ return "uk_13"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::uk_23, offsetof(ThreeWindingTransformerInput, uk_23), []{ return "uk_23"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::pk_12, offsetof(ThreeWindingTransformerInput, pk_12), []{ return "pk_12"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::pk_13, offsetof(ThreeWindingTransformerInput, pk_13), []{ return "pk_13"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::pk_23, offsetof(ThreeWindingTransformerInput, pk_23), []{ return "pk_23"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::i0, offsetof(ThreeWindingTransformerInput, i0), []{ return "i0"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::p0, offsetof(ThreeWindingTransformerInput, p0), []{ return "p0"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::winding_1, offsetof(ThreeWindingTransformerInput, winding_1), []{ return "winding_1"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::winding_2, offsetof(ThreeWindingTransformerInput, winding_2), []{ return "winding_2"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::winding_3, offsetof(ThreeWindingTransformerInput, winding_3), []{ return "winding_3"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::clock_12, offsetof(ThreeWindingTransformerInput, clock_12), []{ return "clock_12"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::clock_13, offsetof(ThreeWindingTransformerInput, clock_13), []{ return "clock_13"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::tap_side, offsetof(ThreeWindingTransformerInput, tap_side), []{ return "tap_side"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::tap_pos, offsetof(ThreeWindingTransformerInput, tap_pos), []{ return "tap_pos"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::tap_min, offsetof(ThreeWindingTransformerInput, tap_min), []{ return "tap_min"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::tap_max, offsetof(ThreeWindingTransformerInput, tap_max), []{ return "tap_max"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::tap_nom, offsetof(ThreeWindingTransformerInput, tap_nom), []{ return "tap_nom"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::tap_size, offsetof(ThreeWindingTransformerInput, tap_size), []{ return "tap_size"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::uk_12_min, offsetof(ThreeWindingTransformerInput, uk_12_min), []{ return "uk_12_min"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::uk_12_max, offsetof(ThreeWindingTransformerInput, uk_12_max), []{ return "uk_12_max"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::uk_13_min, offsetof(ThreeWindingTransformerInput, uk_13_min), []{ return "uk_13_min"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::uk_13_max, offsetof(ThreeWindingTransformerInput, uk_13_max), []{ return "uk_13_max"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::uk_23_min, offsetof(ThreeWindingTransformerInput, uk_23_min), []{ return "uk_23_min"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::uk_23_max, offsetof(ThreeWindingTransformerInput, uk_23_max), []{ return "uk_23_max"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::pk_12_min, offsetof(ThreeWindingTransformerInput, pk_12_min), []{ return "pk_12_min"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::pk_12_max, offsetof(ThreeWindingTransformerInput, pk_12_max), []{ return "pk_12_max"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::pk_13_min, offsetof(ThreeWindingTransformerInput, pk_13_min), []{ return "pk_13_min"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::pk_13_max, offsetof(ThreeWindingTransformerInput, pk_13_max), []{ return "pk_13_max"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::pk_23_min, offsetof(ThreeWindingTransformerInput, pk_23_min), []{ return "pk_23_min"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::pk_23_max, offsetof(ThreeWindingTransformerInput, pk_23_max), []{ return "pk_23_max"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::r_grounding_1, offsetof(ThreeWindingTransformerInput, r_grounding_1), []{ return "r_grounding_1"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::x_grounding_1, offsetof(ThreeWindingTransformerInput, x_grounding_1), []{ return "x_grounding_1"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::r_grounding_2, offsetof(ThreeWindingTransformerInput, r_grounding_2), []{ return "r_grounding_2"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::x_grounding_2, offsetof(ThreeWindingTransformerInput, x_grounding_2), []{ return "x_grounding_2"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::r_grounding_3, offsetof(ThreeWindingTransformerInput, r_grounding_3), []{ return "r_grounding_3"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerInput, &ThreeWindingTransformerInput::x_grounding_3, offsetof(ThreeWindingTransformerInput, x_grounding_3), []{ return "x_grounding_3"; }>::value,
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::id>(offsetof(ThreeWindingTransformerInput, id), "id"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::node_1>(offsetof(ThreeWindingTransformerInput, node_1), "node_1"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::node_2>(offsetof(ThreeWindingTransformerInput, node_2), "node_2"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::node_3>(offsetof(ThreeWindingTransformerInput, node_3), "node_3"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::status_1>(offsetof(ThreeWindingTransformerInput, status_1), "status_1"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::status_2>(offsetof(ThreeWindingTransformerInput, status_2), "status_2"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::status_3>(offsetof(ThreeWindingTransformerInput, status_3), "status_3"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::u1>(offsetof(ThreeWindingTransformerInput, u1), "u1"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::u2>(offsetof(ThreeWindingTransformerInput, u2), "u2"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::u3>(offsetof(ThreeWindingTransformerInput, u3), "u3"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::sn_1>(offsetof(ThreeWindingTransformerInput, sn_1), "sn_1"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::sn_2>(offsetof(ThreeWindingTransformerInput, sn_2), "sn_2"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::sn_3>(offsetof(ThreeWindingTransformerInput, sn_3), "sn_3"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::uk_12>(offsetof(ThreeWindingTransformerInput, uk_12), "uk_12"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::uk_13>(offsetof(ThreeWindingTransformerInput, uk_13), "uk_13"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::uk_23>(offsetof(ThreeWindingTransformerInput, uk_23), "uk_23"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::pk_12>(offsetof(ThreeWindingTransformerInput, pk_12), "pk_12"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::pk_13>(offsetof(ThreeWindingTransformerInput, pk_13), "pk_13"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::pk_23>(offsetof(ThreeWindingTransformerInput, pk_23), "pk_23"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::i0>(offsetof(ThreeWindingTransformerInput, i0), "i0"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::p0>(offsetof(ThreeWindingTransformerInput, p0), "p0"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::winding_1>(offsetof(ThreeWindingTransformerInput, winding_1), "winding_1"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::winding_2>(offsetof(ThreeWindingTransformerInput, winding_2), "winding_2"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::winding_3>(offsetof(ThreeWindingTransformerInput, winding_3), "winding_3"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::clock_12>(offsetof(ThreeWindingTransformerInput, clock_12), "clock_12"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::clock_13>(offsetof(ThreeWindingTransformerInput, clock_13), "clock_13"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::tap_side>(offsetof(ThreeWindingTransformerInput, tap_side), "tap_side"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::tap_pos>(offsetof(ThreeWindingTransformerInput, tap_pos), "tap_pos"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::tap_min>(offsetof(ThreeWindingTransformerInput, tap_min), "tap_min"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::tap_max>(offsetof(ThreeWindingTransformerInput, tap_max), "tap_max"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::tap_nom>(offsetof(ThreeWindingTransformerInput, tap_nom), "tap_nom"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::tap_size>(offsetof(ThreeWindingTransformerInput, tap_size), "tap_size"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::uk_12_min>(offsetof(ThreeWindingTransformerInput, uk_12_min), "uk_12_min"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::uk_12_max>(offsetof(ThreeWindingTransformerInput, uk_12_max), "uk_12_max"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::uk_13_min>(offsetof(ThreeWindingTransformerInput, uk_13_min), "uk_13_min"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::uk_13_max>(offsetof(ThreeWindingTransformerInput, uk_13_max), "uk_13_max"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::uk_23_min>(offsetof(ThreeWindingTransformerInput, uk_23_min), "uk_23_min"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::uk_23_max>(offsetof(ThreeWindingTransformerInput, uk_23_max), "uk_23_max"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::pk_12_min>(offsetof(ThreeWindingTransformerInput, pk_12_min), "pk_12_min"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::pk_12_max>(offsetof(ThreeWindingTransformerInput, pk_12_max), "pk_12_max"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::pk_13_min>(offsetof(ThreeWindingTransformerInput, pk_13_min), "pk_13_min"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::pk_13_max>(offsetof(ThreeWindingTransformerInput, pk_13_max), "pk_13_max"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::pk_23_min>(offsetof(ThreeWindingTransformerInput, pk_23_min), "pk_23_min"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::pk_23_max>(offsetof(ThreeWindingTransformerInput, pk_23_max), "pk_23_max"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::r_grounding_1>(offsetof(ThreeWindingTransformerInput, r_grounding_1), "r_grounding_1"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::x_grounding_1>(offsetof(ThreeWindingTransformerInput, x_grounding_1), "x_grounding_1"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::r_grounding_2>(offsetof(ThreeWindingTransformerInput, r_grounding_2), "r_grounding_2"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::x_grounding_2>(offsetof(ThreeWindingTransformerInput, x_grounding_2), "x_grounding_2"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::r_grounding_3>(offsetof(ThreeWindingTransformerInput, r_grounding_3), "r_grounding_3"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerInput::x_grounding_3>(offsetof(ThreeWindingTransformerInput, x_grounding_3), "x_grounding_3"),
     };
 };
 
@@ -224,10 +224,10 @@ struct get_attributes_list<GenericLoadGenInput> {
     static constexpr std::array<MetaAttribute, 4> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<GenericLoadGenInput, &GenericLoadGenInput::id, offsetof(GenericLoadGenInput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<GenericLoadGenInput, &GenericLoadGenInput::node, offsetof(GenericLoadGenInput, node), []{ return "node"; }>::value,
-            meta_data_gen::get_meta_attribute<GenericLoadGenInput, &GenericLoadGenInput::status, offsetof(GenericLoadGenInput, status), []{ return "status"; }>::value,
-            meta_data_gen::get_meta_attribute<GenericLoadGenInput, &GenericLoadGenInput::type, offsetof(GenericLoadGenInput, type), []{ return "type"; }>::value,
+            meta_data_gen::get_meta_attribute<&GenericLoadGenInput::id>(offsetof(GenericLoadGenInput, id), "id"),
+            meta_data_gen::get_meta_attribute<&GenericLoadGenInput::node>(offsetof(GenericLoadGenInput, node), "node"),
+            meta_data_gen::get_meta_attribute<&GenericLoadGenInput::status>(offsetof(GenericLoadGenInput, status), "status"),
+            meta_data_gen::get_meta_attribute<&GenericLoadGenInput::type>(offsetof(GenericLoadGenInput, type), "type"),
     };
 };
 
@@ -238,12 +238,12 @@ struct get_attributes_list<LoadGenInput<sym_type>> {
     static constexpr std::array<MetaAttribute, 6> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<LoadGenInput<sym>, &LoadGenInput<sym>::id, offsetof(LoadGenInput<sym>, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<LoadGenInput<sym>, &LoadGenInput<sym>::node, offsetof(LoadGenInput<sym>, node), []{ return "node"; }>::value,
-            meta_data_gen::get_meta_attribute<LoadGenInput<sym>, &LoadGenInput<sym>::status, offsetof(LoadGenInput<sym>, status), []{ return "status"; }>::value,
-            meta_data_gen::get_meta_attribute<LoadGenInput<sym>, &LoadGenInput<sym>::type, offsetof(LoadGenInput<sym>, type), []{ return "type"; }>::value,
-            meta_data_gen::get_meta_attribute<LoadGenInput<sym>, &LoadGenInput<sym>::p_specified, offsetof(LoadGenInput<sym>, p_specified), []{ return "p_specified"; }>::value,
-            meta_data_gen::get_meta_attribute<LoadGenInput<sym>, &LoadGenInput<sym>::q_specified, offsetof(LoadGenInput<sym>, q_specified), []{ return "q_specified"; }>::value,
+            meta_data_gen::get_meta_attribute<&LoadGenInput<sym>::id>(offsetof(LoadGenInput<sym>, id), "id"),
+            meta_data_gen::get_meta_attribute<&LoadGenInput<sym>::node>(offsetof(LoadGenInput<sym>, node), "node"),
+            meta_data_gen::get_meta_attribute<&LoadGenInput<sym>::status>(offsetof(LoadGenInput<sym>, status), "status"),
+            meta_data_gen::get_meta_attribute<&LoadGenInput<sym>::type>(offsetof(LoadGenInput<sym>, type), "type"),
+            meta_data_gen::get_meta_attribute<&LoadGenInput<sym>::p_specified>(offsetof(LoadGenInput<sym>, p_specified), "p_specified"),
+            meta_data_gen::get_meta_attribute<&LoadGenInput<sym>::q_specified>(offsetof(LoadGenInput<sym>, q_specified), "q_specified"),
     };
 };
 
@@ -252,13 +252,13 @@ struct get_attributes_list<ShuntInput> {
     static constexpr std::array<MetaAttribute, 7> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<ShuntInput, &ShuntInput::id, offsetof(ShuntInput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<ShuntInput, &ShuntInput::node, offsetof(ShuntInput, node), []{ return "node"; }>::value,
-            meta_data_gen::get_meta_attribute<ShuntInput, &ShuntInput::status, offsetof(ShuntInput, status), []{ return "status"; }>::value,
-            meta_data_gen::get_meta_attribute<ShuntInput, &ShuntInput::g1, offsetof(ShuntInput, g1), []{ return "g1"; }>::value,
-            meta_data_gen::get_meta_attribute<ShuntInput, &ShuntInput::b1, offsetof(ShuntInput, b1), []{ return "b1"; }>::value,
-            meta_data_gen::get_meta_attribute<ShuntInput, &ShuntInput::g0, offsetof(ShuntInput, g0), []{ return "g0"; }>::value,
-            meta_data_gen::get_meta_attribute<ShuntInput, &ShuntInput::b0, offsetof(ShuntInput, b0), []{ return "b0"; }>::value,
+            meta_data_gen::get_meta_attribute<&ShuntInput::id>(offsetof(ShuntInput, id), "id"),
+            meta_data_gen::get_meta_attribute<&ShuntInput::node>(offsetof(ShuntInput, node), "node"),
+            meta_data_gen::get_meta_attribute<&ShuntInput::status>(offsetof(ShuntInput, status), "status"),
+            meta_data_gen::get_meta_attribute<&ShuntInput::g1>(offsetof(ShuntInput, g1), "g1"),
+            meta_data_gen::get_meta_attribute<&ShuntInput::b1>(offsetof(ShuntInput, b1), "b1"),
+            meta_data_gen::get_meta_attribute<&ShuntInput::g0>(offsetof(ShuntInput, g0), "g0"),
+            meta_data_gen::get_meta_attribute<&ShuntInput::b0>(offsetof(ShuntInput, b0), "b0"),
     };
 };
 
@@ -267,14 +267,14 @@ struct get_attributes_list<SourceInput> {
     static constexpr std::array<MetaAttribute, 8> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<SourceInput, &SourceInput::id, offsetof(SourceInput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<SourceInput, &SourceInput::node, offsetof(SourceInput, node), []{ return "node"; }>::value,
-            meta_data_gen::get_meta_attribute<SourceInput, &SourceInput::status, offsetof(SourceInput, status), []{ return "status"; }>::value,
-            meta_data_gen::get_meta_attribute<SourceInput, &SourceInput::u_ref, offsetof(SourceInput, u_ref), []{ return "u_ref"; }>::value,
-            meta_data_gen::get_meta_attribute<SourceInput, &SourceInput::u_ref_angle, offsetof(SourceInput, u_ref_angle), []{ return "u_ref_angle"; }>::value,
-            meta_data_gen::get_meta_attribute<SourceInput, &SourceInput::sk, offsetof(SourceInput, sk), []{ return "sk"; }>::value,
-            meta_data_gen::get_meta_attribute<SourceInput, &SourceInput::rx_ratio, offsetof(SourceInput, rx_ratio), []{ return "rx_ratio"; }>::value,
-            meta_data_gen::get_meta_attribute<SourceInput, &SourceInput::z01_ratio, offsetof(SourceInput, z01_ratio), []{ return "z01_ratio"; }>::value,
+            meta_data_gen::get_meta_attribute<&SourceInput::id>(offsetof(SourceInput, id), "id"),
+            meta_data_gen::get_meta_attribute<&SourceInput::node>(offsetof(SourceInput, node), "node"),
+            meta_data_gen::get_meta_attribute<&SourceInput::status>(offsetof(SourceInput, status), "status"),
+            meta_data_gen::get_meta_attribute<&SourceInput::u_ref>(offsetof(SourceInput, u_ref), "u_ref"),
+            meta_data_gen::get_meta_attribute<&SourceInput::u_ref_angle>(offsetof(SourceInput, u_ref_angle), "u_ref_angle"),
+            meta_data_gen::get_meta_attribute<&SourceInput::sk>(offsetof(SourceInput, sk), "sk"),
+            meta_data_gen::get_meta_attribute<&SourceInput::rx_ratio>(offsetof(SourceInput, rx_ratio), "rx_ratio"),
+            meta_data_gen::get_meta_attribute<&SourceInput::z01_ratio>(offsetof(SourceInput, z01_ratio), "z01_ratio"),
     };
 };
 
@@ -283,9 +283,9 @@ struct get_attributes_list<GenericVoltageSensorInput> {
     static constexpr std::array<MetaAttribute, 3> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<GenericVoltageSensorInput, &GenericVoltageSensorInput::id, offsetof(GenericVoltageSensorInput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<GenericVoltageSensorInput, &GenericVoltageSensorInput::measured_object, offsetof(GenericVoltageSensorInput, measured_object), []{ return "measured_object"; }>::value,
-            meta_data_gen::get_meta_attribute<GenericVoltageSensorInput, &GenericVoltageSensorInput::u_sigma, offsetof(GenericVoltageSensorInput, u_sigma), []{ return "u_sigma"; }>::value,
+            meta_data_gen::get_meta_attribute<&GenericVoltageSensorInput::id>(offsetof(GenericVoltageSensorInput, id), "id"),
+            meta_data_gen::get_meta_attribute<&GenericVoltageSensorInput::measured_object>(offsetof(GenericVoltageSensorInput, measured_object), "measured_object"),
+            meta_data_gen::get_meta_attribute<&GenericVoltageSensorInput::u_sigma>(offsetof(GenericVoltageSensorInput, u_sigma), "u_sigma"),
     };
 };
 
@@ -296,11 +296,11 @@ struct get_attributes_list<VoltageSensorInput<sym_type>> {
     static constexpr std::array<MetaAttribute, 5> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<VoltageSensorInput<sym>, &VoltageSensorInput<sym>::id, offsetof(VoltageSensorInput<sym>, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<VoltageSensorInput<sym>, &VoltageSensorInput<sym>::measured_object, offsetof(VoltageSensorInput<sym>, measured_object), []{ return "measured_object"; }>::value,
-            meta_data_gen::get_meta_attribute<VoltageSensorInput<sym>, &VoltageSensorInput<sym>::u_sigma, offsetof(VoltageSensorInput<sym>, u_sigma), []{ return "u_sigma"; }>::value,
-            meta_data_gen::get_meta_attribute<VoltageSensorInput<sym>, &VoltageSensorInput<sym>::u_measured, offsetof(VoltageSensorInput<sym>, u_measured), []{ return "u_measured"; }>::value,
-            meta_data_gen::get_meta_attribute<VoltageSensorInput<sym>, &VoltageSensorInput<sym>::u_angle_measured, offsetof(VoltageSensorInput<sym>, u_angle_measured), []{ return "u_angle_measured"; }>::value,
+            meta_data_gen::get_meta_attribute<&VoltageSensorInput<sym>::id>(offsetof(VoltageSensorInput<sym>, id), "id"),
+            meta_data_gen::get_meta_attribute<&VoltageSensorInput<sym>::measured_object>(offsetof(VoltageSensorInput<sym>, measured_object), "measured_object"),
+            meta_data_gen::get_meta_attribute<&VoltageSensorInput<sym>::u_sigma>(offsetof(VoltageSensorInput<sym>, u_sigma), "u_sigma"),
+            meta_data_gen::get_meta_attribute<&VoltageSensorInput<sym>::u_measured>(offsetof(VoltageSensorInput<sym>, u_measured), "u_measured"),
+            meta_data_gen::get_meta_attribute<&VoltageSensorInput<sym>::u_angle_measured>(offsetof(VoltageSensorInput<sym>, u_angle_measured), "u_angle_measured"),
     };
 };
 
@@ -309,10 +309,10 @@ struct get_attributes_list<GenericPowerSensorInput> {
     static constexpr std::array<MetaAttribute, 4> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<GenericPowerSensorInput, &GenericPowerSensorInput::id, offsetof(GenericPowerSensorInput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<GenericPowerSensorInput, &GenericPowerSensorInput::measured_object, offsetof(GenericPowerSensorInput, measured_object), []{ return "measured_object"; }>::value,
-            meta_data_gen::get_meta_attribute<GenericPowerSensorInput, &GenericPowerSensorInput::measured_terminal_type, offsetof(GenericPowerSensorInput, measured_terminal_type), []{ return "measured_terminal_type"; }>::value,
-            meta_data_gen::get_meta_attribute<GenericPowerSensorInput, &GenericPowerSensorInput::power_sigma, offsetof(GenericPowerSensorInput, power_sigma), []{ return "power_sigma"; }>::value,
+            meta_data_gen::get_meta_attribute<&GenericPowerSensorInput::id>(offsetof(GenericPowerSensorInput, id), "id"),
+            meta_data_gen::get_meta_attribute<&GenericPowerSensorInput::measured_object>(offsetof(GenericPowerSensorInput, measured_object), "measured_object"),
+            meta_data_gen::get_meta_attribute<&GenericPowerSensorInput::measured_terminal_type>(offsetof(GenericPowerSensorInput, measured_terminal_type), "measured_terminal_type"),
+            meta_data_gen::get_meta_attribute<&GenericPowerSensorInput::power_sigma>(offsetof(GenericPowerSensorInput, power_sigma), "power_sigma"),
     };
 };
 
@@ -323,14 +323,14 @@ struct get_attributes_list<PowerSensorInput<sym_type>> {
     static constexpr std::array<MetaAttribute, 8> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<PowerSensorInput<sym>, &PowerSensorInput<sym>::id, offsetof(PowerSensorInput<sym>, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<PowerSensorInput<sym>, &PowerSensorInput<sym>::measured_object, offsetof(PowerSensorInput<sym>, measured_object), []{ return "measured_object"; }>::value,
-            meta_data_gen::get_meta_attribute<PowerSensorInput<sym>, &PowerSensorInput<sym>::measured_terminal_type, offsetof(PowerSensorInput<sym>, measured_terminal_type), []{ return "measured_terminal_type"; }>::value,
-            meta_data_gen::get_meta_attribute<PowerSensorInput<sym>, &PowerSensorInput<sym>::power_sigma, offsetof(PowerSensorInput<sym>, power_sigma), []{ return "power_sigma"; }>::value,
-            meta_data_gen::get_meta_attribute<PowerSensorInput<sym>, &PowerSensorInput<sym>::p_measured, offsetof(PowerSensorInput<sym>, p_measured), []{ return "p_measured"; }>::value,
-            meta_data_gen::get_meta_attribute<PowerSensorInput<sym>, &PowerSensorInput<sym>::q_measured, offsetof(PowerSensorInput<sym>, q_measured), []{ return "q_measured"; }>::value,
-            meta_data_gen::get_meta_attribute<PowerSensorInput<sym>, &PowerSensorInput<sym>::p_sigma, offsetof(PowerSensorInput<sym>, p_sigma), []{ return "p_sigma"; }>::value,
-            meta_data_gen::get_meta_attribute<PowerSensorInput<sym>, &PowerSensorInput<sym>::q_sigma, offsetof(PowerSensorInput<sym>, q_sigma), []{ return "q_sigma"; }>::value,
+            meta_data_gen::get_meta_attribute<&PowerSensorInput<sym>::id>(offsetof(PowerSensorInput<sym>, id), "id"),
+            meta_data_gen::get_meta_attribute<&PowerSensorInput<sym>::measured_object>(offsetof(PowerSensorInput<sym>, measured_object), "measured_object"),
+            meta_data_gen::get_meta_attribute<&PowerSensorInput<sym>::measured_terminal_type>(offsetof(PowerSensorInput<sym>, measured_terminal_type), "measured_terminal_type"),
+            meta_data_gen::get_meta_attribute<&PowerSensorInput<sym>::power_sigma>(offsetof(PowerSensorInput<sym>, power_sigma), "power_sigma"),
+            meta_data_gen::get_meta_attribute<&PowerSensorInput<sym>::p_measured>(offsetof(PowerSensorInput<sym>, p_measured), "p_measured"),
+            meta_data_gen::get_meta_attribute<&PowerSensorInput<sym>::q_measured>(offsetof(PowerSensorInput<sym>, q_measured), "q_measured"),
+            meta_data_gen::get_meta_attribute<&PowerSensorInput<sym>::p_sigma>(offsetof(PowerSensorInput<sym>, p_sigma), "p_sigma"),
+            meta_data_gen::get_meta_attribute<&PowerSensorInput<sym>::q_sigma>(offsetof(PowerSensorInput<sym>, q_sigma), "q_sigma"),
     };
 };
 
@@ -339,13 +339,13 @@ struct get_attributes_list<FaultInput> {
     static constexpr std::array<MetaAttribute, 7> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<FaultInput, &FaultInput::id, offsetof(FaultInput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<FaultInput, &FaultInput::status, offsetof(FaultInput, status), []{ return "status"; }>::value,
-            meta_data_gen::get_meta_attribute<FaultInput, &FaultInput::fault_type, offsetof(FaultInput, fault_type), []{ return "fault_type"; }>::value,
-            meta_data_gen::get_meta_attribute<FaultInput, &FaultInput::fault_phase, offsetof(FaultInput, fault_phase), []{ return "fault_phase"; }>::value,
-            meta_data_gen::get_meta_attribute<FaultInput, &FaultInput::fault_object, offsetof(FaultInput, fault_object), []{ return "fault_object"; }>::value,
-            meta_data_gen::get_meta_attribute<FaultInput, &FaultInput::r_f, offsetof(FaultInput, r_f), []{ return "r_f"; }>::value,
-            meta_data_gen::get_meta_attribute<FaultInput, &FaultInput::x_f, offsetof(FaultInput, x_f), []{ return "x_f"; }>::value,
+            meta_data_gen::get_meta_attribute<&FaultInput::id>(offsetof(FaultInput, id), "id"),
+            meta_data_gen::get_meta_attribute<&FaultInput::status>(offsetof(FaultInput, status), "status"),
+            meta_data_gen::get_meta_attribute<&FaultInput::fault_type>(offsetof(FaultInput, fault_type), "fault_type"),
+            meta_data_gen::get_meta_attribute<&FaultInput::fault_phase>(offsetof(FaultInput, fault_phase), "fault_phase"),
+            meta_data_gen::get_meta_attribute<&FaultInput::fault_object>(offsetof(FaultInput, fault_object), "fault_object"),
+            meta_data_gen::get_meta_attribute<&FaultInput::r_f>(offsetof(FaultInput, r_f), "r_f"),
+            meta_data_gen::get_meta_attribute<&FaultInput::x_f>(offsetof(FaultInput, x_f), "x_f"),
     };
 };
 
@@ -354,9 +354,9 @@ struct get_attributes_list<RegulatorInput> {
     static constexpr std::array<MetaAttribute, 3> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<RegulatorInput, &RegulatorInput::id, offsetof(RegulatorInput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<RegulatorInput, &RegulatorInput::regulated_object, offsetof(RegulatorInput, regulated_object), []{ return "regulated_object"; }>::value,
-            meta_data_gen::get_meta_attribute<RegulatorInput, &RegulatorInput::status, offsetof(RegulatorInput, status), []{ return "status"; }>::value,
+            meta_data_gen::get_meta_attribute<&RegulatorInput::id>(offsetof(RegulatorInput, id), "id"),
+            meta_data_gen::get_meta_attribute<&RegulatorInput::regulated_object>(offsetof(RegulatorInput, regulated_object), "regulated_object"),
+            meta_data_gen::get_meta_attribute<&RegulatorInput::status>(offsetof(RegulatorInput, status), "status"),
     };
 };
 
@@ -365,14 +365,14 @@ struct get_attributes_list<TransformerTapRegulatorInput> {
     static constexpr std::array<MetaAttribute, 8> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorInput, &TransformerTapRegulatorInput::id, offsetof(TransformerTapRegulatorInput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorInput, &TransformerTapRegulatorInput::regulated_object, offsetof(TransformerTapRegulatorInput, regulated_object), []{ return "regulated_object"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorInput, &TransformerTapRegulatorInput::status, offsetof(TransformerTapRegulatorInput, status), []{ return "status"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorInput, &TransformerTapRegulatorInput::control_side, offsetof(TransformerTapRegulatorInput, control_side), []{ return "control_side"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorInput, &TransformerTapRegulatorInput::u_set, offsetof(TransformerTapRegulatorInput, u_set), []{ return "u_set"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorInput, &TransformerTapRegulatorInput::u_band, offsetof(TransformerTapRegulatorInput, u_band), []{ return "u_band"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorInput, &TransformerTapRegulatorInput::line_drop_compensation_r, offsetof(TransformerTapRegulatorInput, line_drop_compensation_r), []{ return "line_drop_compensation_r"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorInput, &TransformerTapRegulatorInput::line_drop_compensation_x, offsetof(TransformerTapRegulatorInput, line_drop_compensation_x), []{ return "line_drop_compensation_x"; }>::value,
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorInput::id>(offsetof(TransformerTapRegulatorInput, id), "id"),
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorInput::regulated_object>(offsetof(TransformerTapRegulatorInput, regulated_object), "regulated_object"),
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorInput::status>(offsetof(TransformerTapRegulatorInput, status), "status"),
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorInput::control_side>(offsetof(TransformerTapRegulatorInput, control_side), "control_side"),
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorInput::u_set>(offsetof(TransformerTapRegulatorInput, u_set), "u_set"),
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorInput::u_band>(offsetof(TransformerTapRegulatorInput, u_band), "u_band"),
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorInput::line_drop_compensation_r>(offsetof(TransformerTapRegulatorInput, line_drop_compensation_r), "line_drop_compensation_r"),
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorInput::line_drop_compensation_x>(offsetof(TransformerTapRegulatorInput, line_drop_compensation_x), "line_drop_compensation_x"),
     };
 };
 
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/output.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/output.hpp
index 1e2686752..3d4b62e96 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/output.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/output.hpp
@@ -26,8 +26,8 @@ struct get_attributes_list<BaseOutput> {
     static constexpr std::array<MetaAttribute, 2> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<BaseOutput, &BaseOutput::id, offsetof(BaseOutput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<BaseOutput, &BaseOutput::energized, offsetof(BaseOutput, energized), []{ return "energized"; }>::value,
+            meta_data_gen::get_meta_attribute<&BaseOutput::id>(offsetof(BaseOutput, id), "id"),
+            meta_data_gen::get_meta_attribute<&BaseOutput::energized>(offsetof(BaseOutput, energized), "energized"),
     };
 };
 
@@ -38,13 +38,13 @@ struct get_attributes_list<NodeOutput<sym_type>> {
     static constexpr std::array<MetaAttribute, 7> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<NodeOutput<sym>, &NodeOutput<sym>::id, offsetof(NodeOutput<sym>, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<NodeOutput<sym>, &NodeOutput<sym>::energized, offsetof(NodeOutput<sym>, energized), []{ return "energized"; }>::value,
-            meta_data_gen::get_meta_attribute<NodeOutput<sym>, &NodeOutput<sym>::u_pu, offsetof(NodeOutput<sym>, u_pu), []{ return "u_pu"; }>::value,
-            meta_data_gen::get_meta_attribute<NodeOutput<sym>, &NodeOutput<sym>::u, offsetof(NodeOutput<sym>, u), []{ return "u"; }>::value,
-            meta_data_gen::get_meta_attribute<NodeOutput<sym>, &NodeOutput<sym>::u_angle, offsetof(NodeOutput<sym>, u_angle), []{ return "u_angle"; }>::value,
-            meta_data_gen::get_meta_attribute<NodeOutput<sym>, &NodeOutput<sym>::p, offsetof(NodeOutput<sym>, p), []{ return "p"; }>::value,
-            meta_data_gen::get_meta_attribute<NodeOutput<sym>, &NodeOutput<sym>::q, offsetof(NodeOutput<sym>, q), []{ return "q"; }>::value,
+            meta_data_gen::get_meta_attribute<&NodeOutput<sym>::id>(offsetof(NodeOutput<sym>, id), "id"),
+            meta_data_gen::get_meta_attribute<&NodeOutput<sym>::energized>(offsetof(NodeOutput<sym>, energized), "energized"),
+            meta_data_gen::get_meta_attribute<&NodeOutput<sym>::u_pu>(offsetof(NodeOutput<sym>, u_pu), "u_pu"),
+            meta_data_gen::get_meta_attribute<&NodeOutput<sym>::u>(offsetof(NodeOutput<sym>, u), "u"),
+            meta_data_gen::get_meta_attribute<&NodeOutput<sym>::u_angle>(offsetof(NodeOutput<sym>, u_angle), "u_angle"),
+            meta_data_gen::get_meta_attribute<&NodeOutput<sym>::p>(offsetof(NodeOutput<sym>, p), "p"),
+            meta_data_gen::get_meta_attribute<&NodeOutput<sym>::q>(offsetof(NodeOutput<sym>, q), "q"),
     };
 };
 
@@ -55,17 +55,17 @@ struct get_attributes_list<BranchOutput<sym_type>> {
     static constexpr std::array<MetaAttribute, 11> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<BranchOutput<sym>, &BranchOutput<sym>::id, offsetof(BranchOutput<sym>, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchOutput<sym>, &BranchOutput<sym>::energized, offsetof(BranchOutput<sym>, energized), []{ return "energized"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchOutput<sym>, &BranchOutput<sym>::loading, offsetof(BranchOutput<sym>, loading), []{ return "loading"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchOutput<sym>, &BranchOutput<sym>::p_from, offsetof(BranchOutput<sym>, p_from), []{ return "p_from"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchOutput<sym>, &BranchOutput<sym>::q_from, offsetof(BranchOutput<sym>, q_from), []{ return "q_from"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchOutput<sym>, &BranchOutput<sym>::i_from, offsetof(BranchOutput<sym>, i_from), []{ return "i_from"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchOutput<sym>, &BranchOutput<sym>::s_from, offsetof(BranchOutput<sym>, s_from), []{ return "s_from"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchOutput<sym>, &BranchOutput<sym>::p_to, offsetof(BranchOutput<sym>, p_to), []{ return "p_to"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchOutput<sym>, &BranchOutput<sym>::q_to, offsetof(BranchOutput<sym>, q_to), []{ return "q_to"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchOutput<sym>, &BranchOutput<sym>::i_to, offsetof(BranchOutput<sym>, i_to), []{ return "i_to"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchOutput<sym>, &BranchOutput<sym>::s_to, offsetof(BranchOutput<sym>, s_to), []{ return "s_to"; }>::value,
+            meta_data_gen::get_meta_attribute<&BranchOutput<sym>::id>(offsetof(BranchOutput<sym>, id), "id"),
+            meta_data_gen::get_meta_attribute<&BranchOutput<sym>::energized>(offsetof(BranchOutput<sym>, energized), "energized"),
+            meta_data_gen::get_meta_attribute<&BranchOutput<sym>::loading>(offsetof(BranchOutput<sym>, loading), "loading"),
+            meta_data_gen::get_meta_attribute<&BranchOutput<sym>::p_from>(offsetof(BranchOutput<sym>, p_from), "p_from"),
+            meta_data_gen::get_meta_attribute<&BranchOutput<sym>::q_from>(offsetof(BranchOutput<sym>, q_from), "q_from"),
+            meta_data_gen::get_meta_attribute<&BranchOutput<sym>::i_from>(offsetof(BranchOutput<sym>, i_from), "i_from"),
+            meta_data_gen::get_meta_attribute<&BranchOutput<sym>::s_from>(offsetof(BranchOutput<sym>, s_from), "s_from"),
+            meta_data_gen::get_meta_attribute<&BranchOutput<sym>::p_to>(offsetof(BranchOutput<sym>, p_to), "p_to"),
+            meta_data_gen::get_meta_attribute<&BranchOutput<sym>::q_to>(offsetof(BranchOutput<sym>, q_to), "q_to"),
+            meta_data_gen::get_meta_attribute<&BranchOutput<sym>::i_to>(offsetof(BranchOutput<sym>, i_to), "i_to"),
+            meta_data_gen::get_meta_attribute<&BranchOutput<sym>::s_to>(offsetof(BranchOutput<sym>, s_to), "s_to"),
     };
 };
 
@@ -76,21 +76,21 @@ struct get_attributes_list<Branch3Output<sym_type>> {
     static constexpr std::array<MetaAttribute, 15> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<Branch3Output<sym>, &Branch3Output<sym>::id, offsetof(Branch3Output<sym>, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Output<sym>, &Branch3Output<sym>::energized, offsetof(Branch3Output<sym>, energized), []{ return "energized"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Output<sym>, &Branch3Output<sym>::loading, offsetof(Branch3Output<sym>, loading), []{ return "loading"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Output<sym>, &Branch3Output<sym>::p_1, offsetof(Branch3Output<sym>, p_1), []{ return "p_1"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Output<sym>, &Branch3Output<sym>::q_1, offsetof(Branch3Output<sym>, q_1), []{ return "q_1"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Output<sym>, &Branch3Output<sym>::i_1, offsetof(Branch3Output<sym>, i_1), []{ return "i_1"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Output<sym>, &Branch3Output<sym>::s_1, offsetof(Branch3Output<sym>, s_1), []{ return "s_1"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Output<sym>, &Branch3Output<sym>::p_2, offsetof(Branch3Output<sym>, p_2), []{ return "p_2"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Output<sym>, &Branch3Output<sym>::q_2, offsetof(Branch3Output<sym>, q_2), []{ return "q_2"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Output<sym>, &Branch3Output<sym>::i_2, offsetof(Branch3Output<sym>, i_2), []{ return "i_2"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Output<sym>, &Branch3Output<sym>::s_2, offsetof(Branch3Output<sym>, s_2), []{ return "s_2"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Output<sym>, &Branch3Output<sym>::p_3, offsetof(Branch3Output<sym>, p_3), []{ return "p_3"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Output<sym>, &Branch3Output<sym>::q_3, offsetof(Branch3Output<sym>, q_3), []{ return "q_3"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Output<sym>, &Branch3Output<sym>::i_3, offsetof(Branch3Output<sym>, i_3), []{ return "i_3"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Output<sym>, &Branch3Output<sym>::s_3, offsetof(Branch3Output<sym>, s_3), []{ return "s_3"; }>::value,
+            meta_data_gen::get_meta_attribute<&Branch3Output<sym>::id>(offsetof(Branch3Output<sym>, id), "id"),
+            meta_data_gen::get_meta_attribute<&Branch3Output<sym>::energized>(offsetof(Branch3Output<sym>, energized), "energized"),
+            meta_data_gen::get_meta_attribute<&Branch3Output<sym>::loading>(offsetof(Branch3Output<sym>, loading), "loading"),
+            meta_data_gen::get_meta_attribute<&Branch3Output<sym>::p_1>(offsetof(Branch3Output<sym>, p_1), "p_1"),
+            meta_data_gen::get_meta_attribute<&Branch3Output<sym>::q_1>(offsetof(Branch3Output<sym>, q_1), "q_1"),
+            meta_data_gen::get_meta_attribute<&Branch3Output<sym>::i_1>(offsetof(Branch3Output<sym>, i_1), "i_1"),
+            meta_data_gen::get_meta_attribute<&Branch3Output<sym>::s_1>(offsetof(Branch3Output<sym>, s_1), "s_1"),
+            meta_data_gen::get_meta_attribute<&Branch3Output<sym>::p_2>(offsetof(Branch3Output<sym>, p_2), "p_2"),
+            meta_data_gen::get_meta_attribute<&Branch3Output<sym>::q_2>(offsetof(Branch3Output<sym>, q_2), "q_2"),
+            meta_data_gen::get_meta_attribute<&Branch3Output<sym>::i_2>(offsetof(Branch3Output<sym>, i_2), "i_2"),
+            meta_data_gen::get_meta_attribute<&Branch3Output<sym>::s_2>(offsetof(Branch3Output<sym>, s_2), "s_2"),
+            meta_data_gen::get_meta_attribute<&Branch3Output<sym>::p_3>(offsetof(Branch3Output<sym>, p_3), "p_3"),
+            meta_data_gen::get_meta_attribute<&Branch3Output<sym>::q_3>(offsetof(Branch3Output<sym>, q_3), "q_3"),
+            meta_data_gen::get_meta_attribute<&Branch3Output<sym>::i_3>(offsetof(Branch3Output<sym>, i_3), "i_3"),
+            meta_data_gen::get_meta_attribute<&Branch3Output<sym>::s_3>(offsetof(Branch3Output<sym>, s_3), "s_3"),
     };
 };
 
@@ -101,13 +101,13 @@ struct get_attributes_list<ApplianceOutput<sym_type>> {
     static constexpr std::array<MetaAttribute, 7> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<ApplianceOutput<sym>, &ApplianceOutput<sym>::id, offsetof(ApplianceOutput<sym>, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<ApplianceOutput<sym>, &ApplianceOutput<sym>::energized, offsetof(ApplianceOutput<sym>, energized), []{ return "energized"; }>::value,
-            meta_data_gen::get_meta_attribute<ApplianceOutput<sym>, &ApplianceOutput<sym>::p, offsetof(ApplianceOutput<sym>, p), []{ return "p"; }>::value,
-            meta_data_gen::get_meta_attribute<ApplianceOutput<sym>, &ApplianceOutput<sym>::q, offsetof(ApplianceOutput<sym>, q), []{ return "q"; }>::value,
-            meta_data_gen::get_meta_attribute<ApplianceOutput<sym>, &ApplianceOutput<sym>::i, offsetof(ApplianceOutput<sym>, i), []{ return "i"; }>::value,
-            meta_data_gen::get_meta_attribute<ApplianceOutput<sym>, &ApplianceOutput<sym>::s, offsetof(ApplianceOutput<sym>, s), []{ return "s"; }>::value,
-            meta_data_gen::get_meta_attribute<ApplianceOutput<sym>, &ApplianceOutput<sym>::pf, offsetof(ApplianceOutput<sym>, pf), []{ return "pf"; }>::value,
+            meta_data_gen::get_meta_attribute<&ApplianceOutput<sym>::id>(offsetof(ApplianceOutput<sym>, id), "id"),
+            meta_data_gen::get_meta_attribute<&ApplianceOutput<sym>::energized>(offsetof(ApplianceOutput<sym>, energized), "energized"),
+            meta_data_gen::get_meta_attribute<&ApplianceOutput<sym>::p>(offsetof(ApplianceOutput<sym>, p), "p"),
+            meta_data_gen::get_meta_attribute<&ApplianceOutput<sym>::q>(offsetof(ApplianceOutput<sym>, q), "q"),
+            meta_data_gen::get_meta_attribute<&ApplianceOutput<sym>::i>(offsetof(ApplianceOutput<sym>, i), "i"),
+            meta_data_gen::get_meta_attribute<&ApplianceOutput<sym>::s>(offsetof(ApplianceOutput<sym>, s), "s"),
+            meta_data_gen::get_meta_attribute<&ApplianceOutput<sym>::pf>(offsetof(ApplianceOutput<sym>, pf), "pf"),
     };
 };
 
@@ -118,10 +118,10 @@ struct get_attributes_list<VoltageSensorOutput<sym_type>> {
     static constexpr std::array<MetaAttribute, 4> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<VoltageSensorOutput<sym>, &VoltageSensorOutput<sym>::id, offsetof(VoltageSensorOutput<sym>, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<VoltageSensorOutput<sym>, &VoltageSensorOutput<sym>::energized, offsetof(VoltageSensorOutput<sym>, energized), []{ return "energized"; }>::value,
-            meta_data_gen::get_meta_attribute<VoltageSensorOutput<sym>, &VoltageSensorOutput<sym>::u_residual, offsetof(VoltageSensorOutput<sym>, u_residual), []{ return "u_residual"; }>::value,
-            meta_data_gen::get_meta_attribute<VoltageSensorOutput<sym>, &VoltageSensorOutput<sym>::u_angle_residual, offsetof(VoltageSensorOutput<sym>, u_angle_residual), []{ return "u_angle_residual"; }>::value,
+            meta_data_gen::get_meta_attribute<&VoltageSensorOutput<sym>::id>(offsetof(VoltageSensorOutput<sym>, id), "id"),
+            meta_data_gen::get_meta_attribute<&VoltageSensorOutput<sym>::energized>(offsetof(VoltageSensorOutput<sym>, energized), "energized"),
+            meta_data_gen::get_meta_attribute<&VoltageSensorOutput<sym>::u_residual>(offsetof(VoltageSensorOutput<sym>, u_residual), "u_residual"),
+            meta_data_gen::get_meta_attribute<&VoltageSensorOutput<sym>::u_angle_residual>(offsetof(VoltageSensorOutput<sym>, u_angle_residual), "u_angle_residual"),
     };
 };
 
@@ -132,10 +132,10 @@ struct get_attributes_list<PowerSensorOutput<sym_type>> {
     static constexpr std::array<MetaAttribute, 4> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<PowerSensorOutput<sym>, &PowerSensorOutput<sym>::id, offsetof(PowerSensorOutput<sym>, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<PowerSensorOutput<sym>, &PowerSensorOutput<sym>::energized, offsetof(PowerSensorOutput<sym>, energized), []{ return "energized"; }>::value,
-            meta_data_gen::get_meta_attribute<PowerSensorOutput<sym>, &PowerSensorOutput<sym>::p_residual, offsetof(PowerSensorOutput<sym>, p_residual), []{ return "p_residual"; }>::value,
-            meta_data_gen::get_meta_attribute<PowerSensorOutput<sym>, &PowerSensorOutput<sym>::q_residual, offsetof(PowerSensorOutput<sym>, q_residual), []{ return "q_residual"; }>::value,
+            meta_data_gen::get_meta_attribute<&PowerSensorOutput<sym>::id>(offsetof(PowerSensorOutput<sym>, id), "id"),
+            meta_data_gen::get_meta_attribute<&PowerSensorOutput<sym>::energized>(offsetof(PowerSensorOutput<sym>, energized), "energized"),
+            meta_data_gen::get_meta_attribute<&PowerSensorOutput<sym>::p_residual>(offsetof(PowerSensorOutput<sym>, p_residual), "p_residual"),
+            meta_data_gen::get_meta_attribute<&PowerSensorOutput<sym>::q_residual>(offsetof(PowerSensorOutput<sym>, q_residual), "q_residual"),
     };
 };
 
@@ -144,8 +144,8 @@ struct get_attributes_list<FaultOutput> {
     static constexpr std::array<MetaAttribute, 2> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<FaultOutput, &FaultOutput::id, offsetof(FaultOutput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<FaultOutput, &FaultOutput::energized, offsetof(FaultOutput, energized), []{ return "energized"; }>::value,
+            meta_data_gen::get_meta_attribute<&FaultOutput::id>(offsetof(FaultOutput, id), "id"),
+            meta_data_gen::get_meta_attribute<&FaultOutput::energized>(offsetof(FaultOutput, energized), "energized"),
     };
 };
 
@@ -154,10 +154,10 @@ struct get_attributes_list<FaultShortCircuitOutput> {
     static constexpr std::array<MetaAttribute, 4> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<FaultShortCircuitOutput, &FaultShortCircuitOutput::id, offsetof(FaultShortCircuitOutput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<FaultShortCircuitOutput, &FaultShortCircuitOutput::energized, offsetof(FaultShortCircuitOutput, energized), []{ return "energized"; }>::value,
-            meta_data_gen::get_meta_attribute<FaultShortCircuitOutput, &FaultShortCircuitOutput::i_f, offsetof(FaultShortCircuitOutput, i_f), []{ return "i_f"; }>::value,
-            meta_data_gen::get_meta_attribute<FaultShortCircuitOutput, &FaultShortCircuitOutput::i_f_angle, offsetof(FaultShortCircuitOutput, i_f_angle), []{ return "i_f_angle"; }>::value,
+            meta_data_gen::get_meta_attribute<&FaultShortCircuitOutput::id>(offsetof(FaultShortCircuitOutput, id), "id"),
+            meta_data_gen::get_meta_attribute<&FaultShortCircuitOutput::energized>(offsetof(FaultShortCircuitOutput, energized), "energized"),
+            meta_data_gen::get_meta_attribute<&FaultShortCircuitOutput::i_f>(offsetof(FaultShortCircuitOutput, i_f), "i_f"),
+            meta_data_gen::get_meta_attribute<&FaultShortCircuitOutput::i_f_angle>(offsetof(FaultShortCircuitOutput, i_f_angle), "i_f_angle"),
     };
 };
 
@@ -166,11 +166,11 @@ struct get_attributes_list<NodeShortCircuitOutput> {
     static constexpr std::array<MetaAttribute, 5> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<NodeShortCircuitOutput, &NodeShortCircuitOutput::id, offsetof(NodeShortCircuitOutput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<NodeShortCircuitOutput, &NodeShortCircuitOutput::energized, offsetof(NodeShortCircuitOutput, energized), []{ return "energized"; }>::value,
-            meta_data_gen::get_meta_attribute<NodeShortCircuitOutput, &NodeShortCircuitOutput::u_pu, offsetof(NodeShortCircuitOutput, u_pu), []{ return "u_pu"; }>::value,
-            meta_data_gen::get_meta_attribute<NodeShortCircuitOutput, &NodeShortCircuitOutput::u, offsetof(NodeShortCircuitOutput, u), []{ return "u"; }>::value,
-            meta_data_gen::get_meta_attribute<NodeShortCircuitOutput, &NodeShortCircuitOutput::u_angle, offsetof(NodeShortCircuitOutput, u_angle), []{ return "u_angle"; }>::value,
+            meta_data_gen::get_meta_attribute<&NodeShortCircuitOutput::id>(offsetof(NodeShortCircuitOutput, id), "id"),
+            meta_data_gen::get_meta_attribute<&NodeShortCircuitOutput::energized>(offsetof(NodeShortCircuitOutput, energized), "energized"),
+            meta_data_gen::get_meta_attribute<&NodeShortCircuitOutput::u_pu>(offsetof(NodeShortCircuitOutput, u_pu), "u_pu"),
+            meta_data_gen::get_meta_attribute<&NodeShortCircuitOutput::u>(offsetof(NodeShortCircuitOutput, u), "u"),
+            meta_data_gen::get_meta_attribute<&NodeShortCircuitOutput::u_angle>(offsetof(NodeShortCircuitOutput, u_angle), "u_angle"),
     };
 };
 
@@ -179,12 +179,12 @@ struct get_attributes_list<BranchShortCircuitOutput> {
     static constexpr std::array<MetaAttribute, 6> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<BranchShortCircuitOutput, &BranchShortCircuitOutput::id, offsetof(BranchShortCircuitOutput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchShortCircuitOutput, &BranchShortCircuitOutput::energized, offsetof(BranchShortCircuitOutput, energized), []{ return "energized"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchShortCircuitOutput, &BranchShortCircuitOutput::i_from, offsetof(BranchShortCircuitOutput, i_from), []{ return "i_from"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchShortCircuitOutput, &BranchShortCircuitOutput::i_from_angle, offsetof(BranchShortCircuitOutput, i_from_angle), []{ return "i_from_angle"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchShortCircuitOutput, &BranchShortCircuitOutput::i_to, offsetof(BranchShortCircuitOutput, i_to), []{ return "i_to"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchShortCircuitOutput, &BranchShortCircuitOutput::i_to_angle, offsetof(BranchShortCircuitOutput, i_to_angle), []{ return "i_to_angle"; }>::value,
+            meta_data_gen::get_meta_attribute<&BranchShortCircuitOutput::id>(offsetof(BranchShortCircuitOutput, id), "id"),
+            meta_data_gen::get_meta_attribute<&BranchShortCircuitOutput::energized>(offsetof(BranchShortCircuitOutput, energized), "energized"),
+            meta_data_gen::get_meta_attribute<&BranchShortCircuitOutput::i_from>(offsetof(BranchShortCircuitOutput, i_from), "i_from"),
+            meta_data_gen::get_meta_attribute<&BranchShortCircuitOutput::i_from_angle>(offsetof(BranchShortCircuitOutput, i_from_angle), "i_from_angle"),
+            meta_data_gen::get_meta_attribute<&BranchShortCircuitOutput::i_to>(offsetof(BranchShortCircuitOutput, i_to), "i_to"),
+            meta_data_gen::get_meta_attribute<&BranchShortCircuitOutput::i_to_angle>(offsetof(BranchShortCircuitOutput, i_to_angle), "i_to_angle"),
     };
 };
 
@@ -193,14 +193,14 @@ struct get_attributes_list<Branch3ShortCircuitOutput> {
     static constexpr std::array<MetaAttribute, 8> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<Branch3ShortCircuitOutput, &Branch3ShortCircuitOutput::id, offsetof(Branch3ShortCircuitOutput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3ShortCircuitOutput, &Branch3ShortCircuitOutput::energized, offsetof(Branch3ShortCircuitOutput, energized), []{ return "energized"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3ShortCircuitOutput, &Branch3ShortCircuitOutput::i_1, offsetof(Branch3ShortCircuitOutput, i_1), []{ return "i_1"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3ShortCircuitOutput, &Branch3ShortCircuitOutput::i_1_angle, offsetof(Branch3ShortCircuitOutput, i_1_angle), []{ return "i_1_angle"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3ShortCircuitOutput, &Branch3ShortCircuitOutput::i_2, offsetof(Branch3ShortCircuitOutput, i_2), []{ return "i_2"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3ShortCircuitOutput, &Branch3ShortCircuitOutput::i_2_angle, offsetof(Branch3ShortCircuitOutput, i_2_angle), []{ return "i_2_angle"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3ShortCircuitOutput, &Branch3ShortCircuitOutput::i_3, offsetof(Branch3ShortCircuitOutput, i_3), []{ return "i_3"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3ShortCircuitOutput, &Branch3ShortCircuitOutput::i_3_angle, offsetof(Branch3ShortCircuitOutput, i_3_angle), []{ return "i_3_angle"; }>::value,
+            meta_data_gen::get_meta_attribute<&Branch3ShortCircuitOutput::id>(offsetof(Branch3ShortCircuitOutput, id), "id"),
+            meta_data_gen::get_meta_attribute<&Branch3ShortCircuitOutput::energized>(offsetof(Branch3ShortCircuitOutput, energized), "energized"),
+            meta_data_gen::get_meta_attribute<&Branch3ShortCircuitOutput::i_1>(offsetof(Branch3ShortCircuitOutput, i_1), "i_1"),
+            meta_data_gen::get_meta_attribute<&Branch3ShortCircuitOutput::i_1_angle>(offsetof(Branch3ShortCircuitOutput, i_1_angle), "i_1_angle"),
+            meta_data_gen::get_meta_attribute<&Branch3ShortCircuitOutput::i_2>(offsetof(Branch3ShortCircuitOutput, i_2), "i_2"),
+            meta_data_gen::get_meta_attribute<&Branch3ShortCircuitOutput::i_2_angle>(offsetof(Branch3ShortCircuitOutput, i_2_angle), "i_2_angle"),
+            meta_data_gen::get_meta_attribute<&Branch3ShortCircuitOutput::i_3>(offsetof(Branch3ShortCircuitOutput, i_3), "i_3"),
+            meta_data_gen::get_meta_attribute<&Branch3ShortCircuitOutput::i_3_angle>(offsetof(Branch3ShortCircuitOutput, i_3_angle), "i_3_angle"),
     };
 };
 
@@ -209,10 +209,10 @@ struct get_attributes_list<ApplianceShortCircuitOutput> {
     static constexpr std::array<MetaAttribute, 4> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<ApplianceShortCircuitOutput, &ApplianceShortCircuitOutput::id, offsetof(ApplianceShortCircuitOutput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<ApplianceShortCircuitOutput, &ApplianceShortCircuitOutput::energized, offsetof(ApplianceShortCircuitOutput, energized), []{ return "energized"; }>::value,
-            meta_data_gen::get_meta_attribute<ApplianceShortCircuitOutput, &ApplianceShortCircuitOutput::i, offsetof(ApplianceShortCircuitOutput, i), []{ return "i"; }>::value,
-            meta_data_gen::get_meta_attribute<ApplianceShortCircuitOutput, &ApplianceShortCircuitOutput::i_angle, offsetof(ApplianceShortCircuitOutput, i_angle), []{ return "i_angle"; }>::value,
+            meta_data_gen::get_meta_attribute<&ApplianceShortCircuitOutput::id>(offsetof(ApplianceShortCircuitOutput, id), "id"),
+            meta_data_gen::get_meta_attribute<&ApplianceShortCircuitOutput::energized>(offsetof(ApplianceShortCircuitOutput, energized), "energized"),
+            meta_data_gen::get_meta_attribute<&ApplianceShortCircuitOutput::i>(offsetof(ApplianceShortCircuitOutput, i), "i"),
+            meta_data_gen::get_meta_attribute<&ApplianceShortCircuitOutput::i_angle>(offsetof(ApplianceShortCircuitOutput, i_angle), "i_angle"),
     };
 };
 
@@ -221,8 +221,8 @@ struct get_attributes_list<SensorShortCircuitOutput> {
     static constexpr std::array<MetaAttribute, 2> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<SensorShortCircuitOutput, &SensorShortCircuitOutput::id, offsetof(SensorShortCircuitOutput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<SensorShortCircuitOutput, &SensorShortCircuitOutput::energized, offsetof(SensorShortCircuitOutput, energized), []{ return "energized"; }>::value,
+            meta_data_gen::get_meta_attribute<&SensorShortCircuitOutput::id>(offsetof(SensorShortCircuitOutput, id), "id"),
+            meta_data_gen::get_meta_attribute<&SensorShortCircuitOutput::energized>(offsetof(SensorShortCircuitOutput, energized), "energized"),
     };
 };
 
@@ -231,9 +231,9 @@ struct get_attributes_list<TransformerTapRegulatorOutput> {
     static constexpr std::array<MetaAttribute, 3> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorOutput, &TransformerTapRegulatorOutput::id, offsetof(TransformerTapRegulatorOutput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorOutput, &TransformerTapRegulatorOutput::energized, offsetof(TransformerTapRegulatorOutput, energized), []{ return "energized"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorOutput, &TransformerTapRegulatorOutput::tap_pos, offsetof(TransformerTapRegulatorOutput, tap_pos), []{ return "tap_pos"; }>::value,
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorOutput::id>(offsetof(TransformerTapRegulatorOutput, id), "id"),
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorOutput::energized>(offsetof(TransformerTapRegulatorOutput, energized), "energized"),
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorOutput::tap_pos>(offsetof(TransformerTapRegulatorOutput, tap_pos), "tap_pos"),
     };
 };
 
@@ -242,8 +242,8 @@ struct get_attributes_list<RegulatorShortCircuitOutput> {
     static constexpr std::array<MetaAttribute, 2> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<RegulatorShortCircuitOutput, &RegulatorShortCircuitOutput::id, offsetof(RegulatorShortCircuitOutput, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<RegulatorShortCircuitOutput, &RegulatorShortCircuitOutput::energized, offsetof(RegulatorShortCircuitOutput, energized), []{ return "energized"; }>::value,
+            meta_data_gen::get_meta_attribute<&RegulatorShortCircuitOutput::id>(offsetof(RegulatorShortCircuitOutput, id), "id"),
+            meta_data_gen::get_meta_attribute<&RegulatorShortCircuitOutput::energized>(offsetof(RegulatorShortCircuitOutput, energized), "energized"),
     };
 };
 
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/update.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/update.hpp
index 01d5e3641..d4781bfe8 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/update.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/update.hpp
@@ -26,7 +26,7 @@ struct get_attributes_list<BaseUpdate> {
     static constexpr std::array<MetaAttribute, 1> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<BaseUpdate, &BaseUpdate::id, offsetof(BaseUpdate, id), []{ return "id"; }>::value,
+            meta_data_gen::get_meta_attribute<&BaseUpdate::id>(offsetof(BaseUpdate, id), "id"),
     };
 };
 
@@ -35,9 +35,9 @@ struct get_attributes_list<BranchUpdate> {
     static constexpr std::array<MetaAttribute, 3> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<BranchUpdate, &BranchUpdate::id, offsetof(BranchUpdate, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchUpdate, &BranchUpdate::from_status, offsetof(BranchUpdate, from_status), []{ return "from_status"; }>::value,
-            meta_data_gen::get_meta_attribute<BranchUpdate, &BranchUpdate::to_status, offsetof(BranchUpdate, to_status), []{ return "to_status"; }>::value,
+            meta_data_gen::get_meta_attribute<&BranchUpdate::id>(offsetof(BranchUpdate, id), "id"),
+            meta_data_gen::get_meta_attribute<&BranchUpdate::from_status>(offsetof(BranchUpdate, from_status), "from_status"),
+            meta_data_gen::get_meta_attribute<&BranchUpdate::to_status>(offsetof(BranchUpdate, to_status), "to_status"),
     };
 };
 
@@ -46,10 +46,10 @@ struct get_attributes_list<Branch3Update> {
     static constexpr std::array<MetaAttribute, 4> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<Branch3Update, &Branch3Update::id, offsetof(Branch3Update, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Update, &Branch3Update::status_1, offsetof(Branch3Update, status_1), []{ return "status_1"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Update, &Branch3Update::status_2, offsetof(Branch3Update, status_2), []{ return "status_2"; }>::value,
-            meta_data_gen::get_meta_attribute<Branch3Update, &Branch3Update::status_3, offsetof(Branch3Update, status_3), []{ return "status_3"; }>::value,
+            meta_data_gen::get_meta_attribute<&Branch3Update::id>(offsetof(Branch3Update, id), "id"),
+            meta_data_gen::get_meta_attribute<&Branch3Update::status_1>(offsetof(Branch3Update, status_1), "status_1"),
+            meta_data_gen::get_meta_attribute<&Branch3Update::status_2>(offsetof(Branch3Update, status_2), "status_2"),
+            meta_data_gen::get_meta_attribute<&Branch3Update::status_3>(offsetof(Branch3Update, status_3), "status_3"),
     };
 };
 
@@ -58,8 +58,8 @@ struct get_attributes_list<ApplianceUpdate> {
     static constexpr std::array<MetaAttribute, 2> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<ApplianceUpdate, &ApplianceUpdate::id, offsetof(ApplianceUpdate, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<ApplianceUpdate, &ApplianceUpdate::status, offsetof(ApplianceUpdate, status), []{ return "status"; }>::value,
+            meta_data_gen::get_meta_attribute<&ApplianceUpdate::id>(offsetof(ApplianceUpdate, id), "id"),
+            meta_data_gen::get_meta_attribute<&ApplianceUpdate::status>(offsetof(ApplianceUpdate, status), "status"),
     };
 };
 
@@ -68,10 +68,10 @@ struct get_attributes_list<TransformerUpdate> {
     static constexpr std::array<MetaAttribute, 4> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<TransformerUpdate, &TransformerUpdate::id, offsetof(TransformerUpdate, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerUpdate, &TransformerUpdate::from_status, offsetof(TransformerUpdate, from_status), []{ return "from_status"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerUpdate, &TransformerUpdate::to_status, offsetof(TransformerUpdate, to_status), []{ return "to_status"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerUpdate, &TransformerUpdate::tap_pos, offsetof(TransformerUpdate, tap_pos), []{ return "tap_pos"; }>::value,
+            meta_data_gen::get_meta_attribute<&TransformerUpdate::id>(offsetof(TransformerUpdate, id), "id"),
+            meta_data_gen::get_meta_attribute<&TransformerUpdate::from_status>(offsetof(TransformerUpdate, from_status), "from_status"),
+            meta_data_gen::get_meta_attribute<&TransformerUpdate::to_status>(offsetof(TransformerUpdate, to_status), "to_status"),
+            meta_data_gen::get_meta_attribute<&TransformerUpdate::tap_pos>(offsetof(TransformerUpdate, tap_pos), "tap_pos"),
     };
 };
 
@@ -80,11 +80,11 @@ struct get_attributes_list<ThreeWindingTransformerUpdate> {
     static constexpr std::array<MetaAttribute, 5> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerUpdate, &ThreeWindingTransformerUpdate::id, offsetof(ThreeWindingTransformerUpdate, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerUpdate, &ThreeWindingTransformerUpdate::status_1, offsetof(ThreeWindingTransformerUpdate, status_1), []{ return "status_1"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerUpdate, &ThreeWindingTransformerUpdate::status_2, offsetof(ThreeWindingTransformerUpdate, status_2), []{ return "status_2"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerUpdate, &ThreeWindingTransformerUpdate::status_3, offsetof(ThreeWindingTransformerUpdate, status_3), []{ return "status_3"; }>::value,
-            meta_data_gen::get_meta_attribute<ThreeWindingTransformerUpdate, &ThreeWindingTransformerUpdate::tap_pos, offsetof(ThreeWindingTransformerUpdate, tap_pos), []{ return "tap_pos"; }>::value,
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerUpdate::id>(offsetof(ThreeWindingTransformerUpdate, id), "id"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerUpdate::status_1>(offsetof(ThreeWindingTransformerUpdate, status_1), "status_1"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerUpdate::status_2>(offsetof(ThreeWindingTransformerUpdate, status_2), "status_2"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerUpdate::status_3>(offsetof(ThreeWindingTransformerUpdate, status_3), "status_3"),
+            meta_data_gen::get_meta_attribute<&ThreeWindingTransformerUpdate::tap_pos>(offsetof(ThreeWindingTransformerUpdate, tap_pos), "tap_pos"),
     };
 };
 
@@ -95,10 +95,10 @@ struct get_attributes_list<LoadGenUpdate<sym_type>> {
     static constexpr std::array<MetaAttribute, 4> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<LoadGenUpdate<sym>, &LoadGenUpdate<sym>::id, offsetof(LoadGenUpdate<sym>, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<LoadGenUpdate<sym>, &LoadGenUpdate<sym>::status, offsetof(LoadGenUpdate<sym>, status), []{ return "status"; }>::value,
-            meta_data_gen::get_meta_attribute<LoadGenUpdate<sym>, &LoadGenUpdate<sym>::p_specified, offsetof(LoadGenUpdate<sym>, p_specified), []{ return "p_specified"; }>::value,
-            meta_data_gen::get_meta_attribute<LoadGenUpdate<sym>, &LoadGenUpdate<sym>::q_specified, offsetof(LoadGenUpdate<sym>, q_specified), []{ return "q_specified"; }>::value,
+            meta_data_gen::get_meta_attribute<&LoadGenUpdate<sym>::id>(offsetof(LoadGenUpdate<sym>, id), "id"),
+            meta_data_gen::get_meta_attribute<&LoadGenUpdate<sym>::status>(offsetof(LoadGenUpdate<sym>, status), "status"),
+            meta_data_gen::get_meta_attribute<&LoadGenUpdate<sym>::p_specified>(offsetof(LoadGenUpdate<sym>, p_specified), "p_specified"),
+            meta_data_gen::get_meta_attribute<&LoadGenUpdate<sym>::q_specified>(offsetof(LoadGenUpdate<sym>, q_specified), "q_specified"),
     };
 };
 
@@ -107,10 +107,10 @@ struct get_attributes_list<SourceUpdate> {
     static constexpr std::array<MetaAttribute, 4> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<SourceUpdate, &SourceUpdate::id, offsetof(SourceUpdate, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<SourceUpdate, &SourceUpdate::status, offsetof(SourceUpdate, status), []{ return "status"; }>::value,
-            meta_data_gen::get_meta_attribute<SourceUpdate, &SourceUpdate::u_ref, offsetof(SourceUpdate, u_ref), []{ return "u_ref"; }>::value,
-            meta_data_gen::get_meta_attribute<SourceUpdate, &SourceUpdate::u_ref_angle, offsetof(SourceUpdate, u_ref_angle), []{ return "u_ref_angle"; }>::value,
+            meta_data_gen::get_meta_attribute<&SourceUpdate::id>(offsetof(SourceUpdate, id), "id"),
+            meta_data_gen::get_meta_attribute<&SourceUpdate::status>(offsetof(SourceUpdate, status), "status"),
+            meta_data_gen::get_meta_attribute<&SourceUpdate::u_ref>(offsetof(SourceUpdate, u_ref), "u_ref"),
+            meta_data_gen::get_meta_attribute<&SourceUpdate::u_ref_angle>(offsetof(SourceUpdate, u_ref_angle), "u_ref_angle"),
     };
 };
 
@@ -119,12 +119,12 @@ struct get_attributes_list<ShuntUpdate> {
     static constexpr std::array<MetaAttribute, 6> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<ShuntUpdate, &ShuntUpdate::id, offsetof(ShuntUpdate, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<ShuntUpdate, &ShuntUpdate::status, offsetof(ShuntUpdate, status), []{ return "status"; }>::value,
-            meta_data_gen::get_meta_attribute<ShuntUpdate, &ShuntUpdate::g1, offsetof(ShuntUpdate, g1), []{ return "g1"; }>::value,
-            meta_data_gen::get_meta_attribute<ShuntUpdate, &ShuntUpdate::b1, offsetof(ShuntUpdate, b1), []{ return "b1"; }>::value,
-            meta_data_gen::get_meta_attribute<ShuntUpdate, &ShuntUpdate::g0, offsetof(ShuntUpdate, g0), []{ return "g0"; }>::value,
-            meta_data_gen::get_meta_attribute<ShuntUpdate, &ShuntUpdate::b0, offsetof(ShuntUpdate, b0), []{ return "b0"; }>::value,
+            meta_data_gen::get_meta_attribute<&ShuntUpdate::id>(offsetof(ShuntUpdate, id), "id"),
+            meta_data_gen::get_meta_attribute<&ShuntUpdate::status>(offsetof(ShuntUpdate, status), "status"),
+            meta_data_gen::get_meta_attribute<&ShuntUpdate::g1>(offsetof(ShuntUpdate, g1), "g1"),
+            meta_data_gen::get_meta_attribute<&ShuntUpdate::b1>(offsetof(ShuntUpdate, b1), "b1"),
+            meta_data_gen::get_meta_attribute<&ShuntUpdate::g0>(offsetof(ShuntUpdate, g0), "g0"),
+            meta_data_gen::get_meta_attribute<&ShuntUpdate::b0>(offsetof(ShuntUpdate, b0), "b0"),
     };
 };
 
@@ -135,10 +135,10 @@ struct get_attributes_list<VoltageSensorUpdate<sym_type>> {
     static constexpr std::array<MetaAttribute, 4> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<VoltageSensorUpdate<sym>, &VoltageSensorUpdate<sym>::id, offsetof(VoltageSensorUpdate<sym>, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<VoltageSensorUpdate<sym>, &VoltageSensorUpdate<sym>::u_sigma, offsetof(VoltageSensorUpdate<sym>, u_sigma), []{ return "u_sigma"; }>::value,
-            meta_data_gen::get_meta_attribute<VoltageSensorUpdate<sym>, &VoltageSensorUpdate<sym>::u_measured, offsetof(VoltageSensorUpdate<sym>, u_measured), []{ return "u_measured"; }>::value,
-            meta_data_gen::get_meta_attribute<VoltageSensorUpdate<sym>, &VoltageSensorUpdate<sym>::u_angle_measured, offsetof(VoltageSensorUpdate<sym>, u_angle_measured), []{ return "u_angle_measured"; }>::value,
+            meta_data_gen::get_meta_attribute<&VoltageSensorUpdate<sym>::id>(offsetof(VoltageSensorUpdate<sym>, id), "id"),
+            meta_data_gen::get_meta_attribute<&VoltageSensorUpdate<sym>::u_sigma>(offsetof(VoltageSensorUpdate<sym>, u_sigma), "u_sigma"),
+            meta_data_gen::get_meta_attribute<&VoltageSensorUpdate<sym>::u_measured>(offsetof(VoltageSensorUpdate<sym>, u_measured), "u_measured"),
+            meta_data_gen::get_meta_attribute<&VoltageSensorUpdate<sym>::u_angle_measured>(offsetof(VoltageSensorUpdate<sym>, u_angle_measured), "u_angle_measured"),
     };
 };
 
@@ -149,12 +149,12 @@ struct get_attributes_list<PowerSensorUpdate<sym_type>> {
     static constexpr std::array<MetaAttribute, 6> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<PowerSensorUpdate<sym>, &PowerSensorUpdate<sym>::id, offsetof(PowerSensorUpdate<sym>, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<PowerSensorUpdate<sym>, &PowerSensorUpdate<sym>::power_sigma, offsetof(PowerSensorUpdate<sym>, power_sigma), []{ return "power_sigma"; }>::value,
-            meta_data_gen::get_meta_attribute<PowerSensorUpdate<sym>, &PowerSensorUpdate<sym>::p_measured, offsetof(PowerSensorUpdate<sym>, p_measured), []{ return "p_measured"; }>::value,
-            meta_data_gen::get_meta_attribute<PowerSensorUpdate<sym>, &PowerSensorUpdate<sym>::q_measured, offsetof(PowerSensorUpdate<sym>, q_measured), []{ return "q_measured"; }>::value,
-            meta_data_gen::get_meta_attribute<PowerSensorUpdate<sym>, &PowerSensorUpdate<sym>::p_sigma, offsetof(PowerSensorUpdate<sym>, p_sigma), []{ return "p_sigma"; }>::value,
-            meta_data_gen::get_meta_attribute<PowerSensorUpdate<sym>, &PowerSensorUpdate<sym>::q_sigma, offsetof(PowerSensorUpdate<sym>, q_sigma), []{ return "q_sigma"; }>::value,
+            meta_data_gen::get_meta_attribute<&PowerSensorUpdate<sym>::id>(offsetof(PowerSensorUpdate<sym>, id), "id"),
+            meta_data_gen::get_meta_attribute<&PowerSensorUpdate<sym>::power_sigma>(offsetof(PowerSensorUpdate<sym>, power_sigma), "power_sigma"),
+            meta_data_gen::get_meta_attribute<&PowerSensorUpdate<sym>::p_measured>(offsetof(PowerSensorUpdate<sym>, p_measured), "p_measured"),
+            meta_data_gen::get_meta_attribute<&PowerSensorUpdate<sym>::q_measured>(offsetof(PowerSensorUpdate<sym>, q_measured), "q_measured"),
+            meta_data_gen::get_meta_attribute<&PowerSensorUpdate<sym>::p_sigma>(offsetof(PowerSensorUpdate<sym>, p_sigma), "p_sigma"),
+            meta_data_gen::get_meta_attribute<&PowerSensorUpdate<sym>::q_sigma>(offsetof(PowerSensorUpdate<sym>, q_sigma), "q_sigma"),
     };
 };
 
@@ -163,13 +163,13 @@ struct get_attributes_list<FaultUpdate> {
     static constexpr std::array<MetaAttribute, 7> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<FaultUpdate, &FaultUpdate::id, offsetof(FaultUpdate, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<FaultUpdate, &FaultUpdate::status, offsetof(FaultUpdate, status), []{ return "status"; }>::value,
-            meta_data_gen::get_meta_attribute<FaultUpdate, &FaultUpdate::fault_type, offsetof(FaultUpdate, fault_type), []{ return "fault_type"; }>::value,
-            meta_data_gen::get_meta_attribute<FaultUpdate, &FaultUpdate::fault_phase, offsetof(FaultUpdate, fault_phase), []{ return "fault_phase"; }>::value,
-            meta_data_gen::get_meta_attribute<FaultUpdate, &FaultUpdate::fault_object, offsetof(FaultUpdate, fault_object), []{ return "fault_object"; }>::value,
-            meta_data_gen::get_meta_attribute<FaultUpdate, &FaultUpdate::r_f, offsetof(FaultUpdate, r_f), []{ return "r_f"; }>::value,
-            meta_data_gen::get_meta_attribute<FaultUpdate, &FaultUpdate::x_f, offsetof(FaultUpdate, x_f), []{ return "x_f"; }>::value,
+            meta_data_gen::get_meta_attribute<&FaultUpdate::id>(offsetof(FaultUpdate, id), "id"),
+            meta_data_gen::get_meta_attribute<&FaultUpdate::status>(offsetof(FaultUpdate, status), "status"),
+            meta_data_gen::get_meta_attribute<&FaultUpdate::fault_type>(offsetof(FaultUpdate, fault_type), "fault_type"),
+            meta_data_gen::get_meta_attribute<&FaultUpdate::fault_phase>(offsetof(FaultUpdate, fault_phase), "fault_phase"),
+            meta_data_gen::get_meta_attribute<&FaultUpdate::fault_object>(offsetof(FaultUpdate, fault_object), "fault_object"),
+            meta_data_gen::get_meta_attribute<&FaultUpdate::r_f>(offsetof(FaultUpdate, r_f), "r_f"),
+            meta_data_gen::get_meta_attribute<&FaultUpdate::x_f>(offsetof(FaultUpdate, x_f), "x_f"),
     };
 };
 
@@ -178,8 +178,8 @@ struct get_attributes_list<RegulatorUpdate> {
     static constexpr std::array<MetaAttribute, 2> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<RegulatorUpdate, &RegulatorUpdate::id, offsetof(RegulatorUpdate, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<RegulatorUpdate, &RegulatorUpdate::status, offsetof(RegulatorUpdate, status), []{ return "status"; }>::value,
+            meta_data_gen::get_meta_attribute<&RegulatorUpdate::id>(offsetof(RegulatorUpdate, id), "id"),
+            meta_data_gen::get_meta_attribute<&RegulatorUpdate::status>(offsetof(RegulatorUpdate, status), "status"),
     };
 };
 
@@ -188,12 +188,12 @@ struct get_attributes_list<TransformerTapRegulatorUpdate> {
     static constexpr std::array<MetaAttribute, 6> value{
             // all attributes including base class
             
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorUpdate, &TransformerTapRegulatorUpdate::id, offsetof(TransformerTapRegulatorUpdate, id), []{ return "id"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorUpdate, &TransformerTapRegulatorUpdate::status, offsetof(TransformerTapRegulatorUpdate, status), []{ return "status"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorUpdate, &TransformerTapRegulatorUpdate::u_set, offsetof(TransformerTapRegulatorUpdate, u_set), []{ return "u_set"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorUpdate, &TransformerTapRegulatorUpdate::u_band, offsetof(TransformerTapRegulatorUpdate, u_band), []{ return "u_band"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorUpdate, &TransformerTapRegulatorUpdate::line_drop_compensation_r, offsetof(TransformerTapRegulatorUpdate, line_drop_compensation_r), []{ return "line_drop_compensation_r"; }>::value,
-            meta_data_gen::get_meta_attribute<TransformerTapRegulatorUpdate, &TransformerTapRegulatorUpdate::line_drop_compensation_x, offsetof(TransformerTapRegulatorUpdate, line_drop_compensation_x), []{ return "line_drop_compensation_x"; }>::value,
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorUpdate::id>(offsetof(TransformerTapRegulatorUpdate, id), "id"),
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorUpdate::status>(offsetof(TransformerTapRegulatorUpdate, status), "status"),
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorUpdate::u_set>(offsetof(TransformerTapRegulatorUpdate, u_set), "u_set"),
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorUpdate::u_band>(offsetof(TransformerTapRegulatorUpdate, u_band), "u_band"),
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorUpdate::line_drop_compensation_r>(offsetof(TransformerTapRegulatorUpdate, line_drop_compensation_r), "line_drop_compensation_r"),
+            meta_data_gen::get_meta_attribute<&TransformerTapRegulatorUpdate::line_drop_compensation_x>(offsetof(TransformerTapRegulatorUpdate, line_drop_compensation_x), "line_drop_compensation_x"),
     };
 };
 
diff --git a/tests/cpp_unit_tests/test_dataset.cpp b/tests/cpp_unit_tests/test_dataset.cpp
index e5d855e8f..e0be018b4 100644
--- a/tests/cpp_unit_tests/test_dataset.cpp
+++ b/tests/cpp_unit_tests/test_dataset.cpp
@@ -58,50 +58,40 @@ struct BScOutput {};
 
 template <> struct get_attributes_list<AInput> {
     static constexpr std::array<MetaAttribute, 3> value{
-        meta_data_gen::get_meta_attribute<AInput, &AInput::id, offsetof(AInput, id),
-                                          [] { return AInput::id_name; }>::value,
-        meta_data_gen::get_meta_attribute<AInput, &AInput::a0, offsetof(AInput, a0),
-                                          [] { return AInput::a0_name; }>::value,
-        meta_data_gen::get_meta_attribute<AInput, &AInput::a1, offsetof(AInput, a1),
-                                          [] { return AInput::a1_name; }>::value,
+        meta_data_gen::get_meta_attribute<&AInput::id>(offsetof(AInput, id), AInput::id_name),
+        meta_data_gen::get_meta_attribute<&AInput::a0>(offsetof(AInput, a0), AInput::a0_name),
+        meta_data_gen::get_meta_attribute<&AInput::a1>(offsetof(AInput, a1), AInput::a1_name),
     };
 };
 template <> struct get_attributes_list<AUpdate> {
     static constexpr std::array<MetaAttribute, 2> value{
-        meta_data_gen::get_meta_attribute<AUpdate, &AUpdate::id, offsetof(AUpdate, id),
-                                          [] { return AUpdate::id_name; }>::value,
-        meta_data_gen::get_meta_attribute<AUpdate, &AUpdate::a0, offsetof(AUpdate, a0),
-                                          [] { return AUpdate::a0_name; }>::value,
+        meta_data_gen::get_meta_attribute<&AUpdate::id>(offsetof(AUpdate, id), AUpdate::id_name),
+        meta_data_gen::get_meta_attribute<&AUpdate::a0>(offsetof(AUpdate, a0), AUpdate::a0_name),
     };
 };
 template <> struct get_attributes_list<AOutput<symmetric_t>> {
     static constexpr std::array<MetaAttribute, 3> value{
-        meta_data_gen::get_meta_attribute<AOutput<symmetric_t>, &AOutput<symmetric_t>::id,
-                                          offsetof(AOutput<symmetric_t>, id), [] { return AInput::id_name; }>::value,
-        meta_data_gen::get_meta_attribute<AOutput<symmetric_t>, &AOutput<symmetric_t>::a2,
-                                          offsetof(AOutput<symmetric_t>, a2),
-                                          [] { return AOutput<symmetric_t>::a2_name; }>::value,
-        meta_data_gen::get_meta_attribute<AOutput<symmetric_t>, &AOutput<symmetric_t>::a3,
-                                          offsetof(AOutput<symmetric_t>, a3),
-                                          [] { return AOutput<symmetric_t>::a3_name; }>::value,
+        meta_data_gen::get_meta_attribute<&AOutput<symmetric_t>::id>(offsetof(AOutput<symmetric_t>, id),
+                                                                     AOutput<symmetric_t>::id_name),
+        meta_data_gen::get_meta_attribute<&AOutput<symmetric_t>::a2>(offsetof(AOutput<symmetric_t>, a2),
+                                                                     AOutput<symmetric_t>::a2_name),
+        meta_data_gen::get_meta_attribute<&AOutput<symmetric_t>::a3>(offsetof(AOutput<symmetric_t>, a3),
+                                                                     AOutput<symmetric_t>::a3_name),
     };
 };
 template <> struct get_attributes_list<AOutput<asymmetric_t>> {
     static constexpr std::array<MetaAttribute, 3> value{
-        meta_data_gen::get_meta_attribute<AOutput<asymmetric_t>, &AOutput<asymmetric_t>::id,
-                                          offsetof(AOutput<asymmetric_t>, id), [] { return AInput::id_name; }>::value,
-        meta_data_gen::get_meta_attribute<AOutput<asymmetric_t>, &AOutput<asymmetric_t>::a2,
-                                          offsetof(AOutput<asymmetric_t>, a2),
-                                          [] { return AOutput<asymmetric_t>::a2_name; }>::value,
-        meta_data_gen::get_meta_attribute<AOutput<asymmetric_t>, &AOutput<asymmetric_t>::a3,
-                                          offsetof(AOutput<asymmetric_t>, a3),
-                                          [] { return AOutput<asymmetric_t>::a3_name; }>::value,
+        meta_data_gen::get_meta_attribute<&AOutput<asymmetric_t>::id>(offsetof(AOutput<asymmetric_t>, id),
+                                                                      AOutput<asymmetric_t>::id_name),
+        meta_data_gen::get_meta_attribute<&AOutput<asymmetric_t>::a2>(offsetof(AOutput<asymmetric_t>, a2),
+                                                                      AOutput<asymmetric_t>::a2_name),
+        meta_data_gen::get_meta_attribute<&AOutput<asymmetric_t>::a3>(offsetof(AOutput<asymmetric_t>, a3),
+                                                                      AOutput<asymmetric_t>::a3_name),
     };
 };
 template <> struct get_attributes_list<AScOutput> {
     static constexpr std::array<MetaAttribute, 1> value{
-        meta_data_gen::get_meta_attribute<AScOutput, &AScOutput::id, offsetof(AScOutput, id),
-                                          [] { return AScOutput::id_name; }>::value,
+        meta_data_gen::get_meta_attribute<&AScOutput::id>(offsetof(AScOutput, id), AScOutput::id_name),
     };
 };
 template <> struct get_attributes_list<BInput> {

From bc56a8e4bfcf027d9d42d6f54d118175383cf178 Mon Sep 17 00:00:00 2001
From: Tony Xiang <tony.xiang@alliander.com>
Date: Thu, 15 Aug 2024 09:49:00 +0200
Subject: [PATCH 3/7] refactor component meta

Signed-off-by: Tony Xiang <tony.xiang@alliander.com>
---
 .../power_grid_model/auxiliary/meta_gen/gen_getters.hpp   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
index 595e60d40..c482c4e8f 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
@@ -62,9 +62,9 @@ constexpr MetaAttribute get_meta_attribute(size_t offset, char const* attribute_
 };
 
 // getter for meta component
-template <class StructType, auto component_name_getter> struct get_meta_component {
-    static constexpr MetaComponent value{
-        .name = component_name_getter(),
+template <class StructType> constexpr MetaComponent get_meta_component(char const* component_name) {
+    return MetaComponent{
+        .name = component_name,
         .size = sizeof(StructType),
         .alignment = alignof(StructType),
         .attributes = get_attributes_list<StructType>::value,
@@ -84,7 +84,7 @@ template <auto dataset_name_getter, template <class> class struct_getter, class.
 struct get_meta_dataset<dataset_name_getter, struct_getter, ComponentList<ComponentType...>> {
     static constexpr size_t n_components = sizeof...(ComponentType);
     static constexpr std::array<MetaComponent, n_components> components{
-        get_meta_component<typename struct_getter<ComponentType>::type, [] { return ComponentType::name; }>::value...};
+        get_meta_component<typename struct_getter<ComponentType>::type>(ComponentType::name)...};
     static constexpr MetaDataset value{
         .name = dataset_name_getter(),
         .components = components,

From 404c3e11eac8d0fbf77b7666f6db284675e85b4c Mon Sep 17 00:00:00 2001
From: Tony Xiang <tony.xiang@alliander.com>
Date: Thu, 15 Aug 2024 10:00:11 +0200
Subject: [PATCH 4/7] not working yet

Signed-off-by: Tony Xiang <tony.xiang@alliander.com>
---
 .../power_grid_model/auxiliary/dataset.hpp    | 16 ++++++------
 .../power_grid_model/auxiliary/meta_data.hpp  | 25 +++++++++++--------
 .../auxiliary/meta_data_gen.hpp               | 13 ++++------
 .../auxiliary/meta_gen/gen_getters.hpp        | 19 ++++++--------
 4 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp
index 6b2434aee..ef87d5671 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp
@@ -304,8 +304,8 @@ template <dataset_type_tag dataset_type_> class Dataset {
     }
 
     // get buffer by component type
-    template <template <class> class type_getter, class ComponentType,
-              class StructType = DataStruct<typename type_getter<ComponentType>::type>>
+    template <class type_getter, class ComponentType,
+              class StructType = DataStruct<typename type_getter::template type<ComponentType>>>
     std::span<StructType> get_buffer_span(Idx scenario = invalid_index) const {
         assert(scenario < batch_size());
 
@@ -317,8 +317,8 @@ template <dataset_type_tag dataset_type_> class Dataset {
         return get_buffer_span_impl<StructType>(scenario, idx);
     }
 
-    template <template <class> class type_getter, class ComponentType,
-              class StructType = DataStruct<typename type_getter<ComponentType>::type>>
+    template <class type_getter, class ComponentType,
+              class StructType = DataStruct<type_getter::template type<ComponentType>>>
     RangeObject<StructType> get_columnar_buffer_span(Idx scenario = invalid_index) const {
         assert(scenario < batch_size());
 
@@ -331,8 +331,8 @@ template <dataset_type_tag dataset_type_> class Dataset {
     }
 
     // get buffer by component type for all scenarios in vector span
-    template <template <class> class type_getter, class ComponentType,
-              class StructType = DataStruct<typename type_getter<ComponentType>::type>>
+    template <class type_getter, class ComponentType,
+              class StructType = DataStruct<type_getter::template type<ComponentType>>>
     std::vector<std::span<StructType>> get_buffer_span_all_scenarios() const {
         Idx const idx = find_component(ComponentType::name, false);
         std::vector<std::span<StructType>> result(batch_size());
@@ -342,8 +342,8 @@ template <dataset_type_tag dataset_type_> class Dataset {
         return result;
     }
 
-    template <template <class> class type_getter, class ComponentType,
-              class StructType = DataStruct<typename type_getter<ComponentType>::type>>
+    template <class type_getter, class ComponentType,
+              class StructType = DataStruct<type_getter::template type<ComponentType>>>
     std::vector<RangeObject<StructType>> get_columnar_buffer_span_all_scenarios() const {
         Idx const idx = find_component(ComponentType::name, false);
         std::vector<RangeObject<StructType>> result(batch_size());
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp
index 4f06e3c44..80344594f 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp
@@ -179,20 +179,25 @@ struct MetaData {
 constexpr bool is_little_endian() { return std::endian::native == std::endian::little; }
 
 // list of all dataset names
-template <class T> struct input_getter_s {
-    using type = typename T::InputType;
+struct input_getter_s {
+    static constexpr char const* value = "input";
+    template <class T> using type = typename T::InputType;
 };
-template <class T> struct update_getter_s {
-    using type = typename T::UpdateType;
+struct update_getter_s {
+    static constexpr char const* value = "update";
+    template <class T> using type = typename T::UpdateType;
 };
-template <class T> struct sym_output_getter_s {
-    using type = typename T::template OutputType<symmetric_t>;
+struct sym_output_getter_s {
+    static constexpr char const* value = "sym_output";
+    template <class T> using type = typename T::template OutputType<symmetric_t>;
 };
-template <class T> struct asym_output_getter_s {
-    using type = typename T::template OutputType<asymmetric_t>;
+struct asym_output_getter_s {
+    static constexpr char const* value = "asym_output";
+    template <class T> using type = typename T::template OutputType<asymmetric_t>;
 };
-template <class T> struct sc_output_getter_s {
-    using type = typename T::ShortCircuitOutputType;
+struct sc_output_getter_s {
+    static constexpr char const* value = "sc_output";
+    template <class T> using type = typename T::ShortCircuitOutputType;
 };
 
 } // namespace power_grid_model::meta_data
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data_gen.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data_gen.hpp
index 25cd8e7be..315490e7e 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data_gen.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data_gen.hpp
@@ -23,13 +23,10 @@
 namespace power_grid_model::meta_data::meta_data_gen {
 
 // generate meta data
-constexpr MetaData meta_data = get_meta_data<AllComponents, // all components list
-                                             dataset_mark<[] { return "input"; }, input_getter_s>,
-                                             dataset_mark<[] { return "update"; }, update_getter_s>,
-                                             dataset_mark<[] { return "sym_output"; }, sym_output_getter_s>,
-                                             dataset_mark<[] { return "asym_output"; }, asym_output_getter_s>,
-                                             dataset_mark<[] { return "sc_output"; }, sc_output_getter_s>
-                                             // end list of all marks
-                                             >::value;
+constexpr MetaData meta_data =
+    get_meta_data<AllComponents, // all components list
+                  input_getter_s, update_getter_s, sym_output_getter_s, asym_output_getter_s, sc_output_getter_s
+                  // end list of all marks
+                  >::value;
 
 } // namespace power_grid_model::meta_data::meta_data_gen
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
index c482c4e8f..65a9728cc 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
@@ -79,25 +79,22 @@ template <class StructType> constexpr MetaComponent get_meta_component(char cons
 };
 
 // getter for meta dataset
-template <auto dataset_name_getter, template <class> class struct_getter, class comp_list> struct get_meta_dataset;
-template <auto dataset_name_getter, template <class> class struct_getter, class... ComponentType>
-struct get_meta_dataset<dataset_name_getter, struct_getter, ComponentList<ComponentType...>> {
+template <class struct_getter, class comp_list> struct get_meta_dataset;
+template <class struct_getter, class... ComponentType>
+struct get_meta_dataset<struct_getter, ComponentList<ComponentType...>> {
     static constexpr size_t n_components = sizeof...(ComponentType);
     static constexpr std::array<MetaComponent, n_components> components{
-        get_meta_component<typename struct_getter<ComponentType>::type>(ComponentType::name)...};
+        get_meta_component<struct_getter::type<ComponentType>>(ComponentType::name)...};
     static constexpr MetaDataset value{
-        .name = dataset_name_getter(),
+        .name = struct_getter::name,
         .components = components,
     };
 };
 
 // get meta data
-template <auto dataset_name_getter, template <class> class struct_getter> struct dataset_mark;
-template <class comp_list, class... T> struct get_meta_data;
-template <class comp_list, auto... dataset_name_getter, template <class> class... struct_getter>
-struct get_meta_data<comp_list, dataset_mark<dataset_name_getter, struct_getter>...> {
-    static constexpr std::array<MetaDataset, sizeof...(dataset_name_getter)> datasets{
-        get_meta_dataset<dataset_name_getter, struct_getter, comp_list>::value...};
+template <class comp_list, class... struct_getter> struct get_meta_data {
+    static constexpr std::array<MetaDataset, sizeof...(struct_getter)> datasets{
+        get_meta_dataset<struct_getter, comp_list>::value...};
     static constexpr MetaData value{
         .datasets = datasets,
     };

From 9e98b03de3c9e896eb2aef9b54fcaca8f58e5f80 Mon Sep 17 00:00:00 2001
From: Tony Xiang <tony.xiang@alliander.com>
Date: Thu, 15 Aug 2024 12:48:00 +0200
Subject: [PATCH 5/7] all test pass

Signed-off-by: Tony Xiang <tony.xiang@alliander.com>
---
 .../include/power_grid_model/auxiliary/dataset.hpp |  6 +++---
 .../power_grid_model/auxiliary/meta_data.hpp       | 10 +++++-----
 .../auxiliary/meta_gen/gen_getters.hpp             |  2 +-
 tests/cpp_unit_tests/test_dataset.cpp              | 14 +++++++-------
 tests/cpp_unit_tests/test_optimizer.cpp            |  2 +-
 .../cpp_unit_tests/test_tap_position_optimizer.cpp |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp
index ef87d5671..cf9ca8cd8 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp
@@ -318,7 +318,7 @@ template <dataset_type_tag dataset_type_> class Dataset {
     }
 
     template <class type_getter, class ComponentType,
-              class StructType = DataStruct<type_getter::template type<ComponentType>>>
+              class StructType = DataStruct<typename type_getter::template type<ComponentType>>>
     RangeObject<StructType> get_columnar_buffer_span(Idx scenario = invalid_index) const {
         assert(scenario < batch_size());
 
@@ -332,7 +332,7 @@ template <dataset_type_tag dataset_type_> class Dataset {
 
     // get buffer by component type for all scenarios in vector span
     template <class type_getter, class ComponentType,
-              class StructType = DataStruct<type_getter::template type<ComponentType>>>
+              class StructType = DataStruct<typename type_getter::template type<ComponentType>>>
     std::vector<std::span<StructType>> get_buffer_span_all_scenarios() const {
         Idx const idx = find_component(ComponentType::name, false);
         std::vector<std::span<StructType>> result(batch_size());
@@ -343,7 +343,7 @@ template <dataset_type_tag dataset_type_> class Dataset {
     }
 
     template <class type_getter, class ComponentType,
-              class StructType = DataStruct<type_getter::template type<ComponentType>>>
+              class StructType = DataStruct<typename type_getter::template type<ComponentType>>>
     std::vector<RangeObject<StructType>> get_columnar_buffer_span_all_scenarios() const {
         Idx const idx = find_component(ComponentType::name, false);
         std::vector<RangeObject<StructType>> result(batch_size());
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp
index 80344594f..1a2e7496e 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp
@@ -180,23 +180,23 @@ constexpr bool is_little_endian() { return std::endian::native == std::endian::l
 
 // list of all dataset names
 struct input_getter_s {
-    static constexpr char const* value = "input";
+    static constexpr char const* name = "input";
     template <class T> using type = typename T::InputType;
 };
 struct update_getter_s {
-    static constexpr char const* value = "update";
+    static constexpr char const* name = "update";
     template <class T> using type = typename T::UpdateType;
 };
 struct sym_output_getter_s {
-    static constexpr char const* value = "sym_output";
+    static constexpr char const* name = "sym_output";
     template <class T> using type = typename T::template OutputType<symmetric_t>;
 };
 struct asym_output_getter_s {
-    static constexpr char const* value = "asym_output";
+    static constexpr char const* name = "asym_output";
     template <class T> using type = typename T::template OutputType<asymmetric_t>;
 };
 struct sc_output_getter_s {
-    static constexpr char const* value = "sc_output";
+    static constexpr char const* name = "sc_output";
     template <class T> using type = typename T::ShortCircuitOutputType;
 };
 
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
index 65a9728cc..4764fec07 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
@@ -84,7 +84,7 @@ template <class struct_getter, class... ComponentType>
 struct get_meta_dataset<struct_getter, ComponentList<ComponentType...>> {
     static constexpr size_t n_components = sizeof...(ComponentType);
     static constexpr std::array<MetaComponent, n_components> components{
-        get_meta_component<struct_getter::type<ComponentType>>(ComponentType::name)...};
+        get_meta_component<typename struct_getter::template type<ComponentType>>(ComponentType::name)...};
     static constexpr MetaDataset value{
         .name = struct_getter::name,
         .components = components,
diff --git a/tests/cpp_unit_tests/test_dataset.cpp b/tests/cpp_unit_tests/test_dataset.cpp
index e0be018b4..6223e8e58 100644
--- a/tests/cpp_unit_tests/test_dataset.cpp
+++ b/tests/cpp_unit_tests/test_dataset.cpp
@@ -130,18 +130,18 @@ struct B {
 
 constexpr MetaData test_meta_data =
     meta_data_gen::get_meta_data<ComponentList<A, B>, // all components list
-                                 meta_data_gen::dataset_mark<[] { return "input"; }, input_getter_s>,
-                                 meta_data_gen::dataset_mark<[] { return "update"; }, update_getter_s>
+                                 input_getter_s,
+                                 update_getter_s
                                  // end list of all marks
                                  >::value;
 
 constexpr MetaData test_meta_data_all =
     meta_data_gen::get_meta_data<ComponentList<A, B>, // all components list
-                                 meta_data_gen::dataset_mark<[] { return "input"; }, input_getter_s>,
-                                 meta_data_gen::dataset_mark<[] { return "update"; }, update_getter_s>,
-                                 meta_data_gen::dataset_mark<[] { return "sym_output"; }, sym_output_getter_s>,
-                                 meta_data_gen::dataset_mark<[] { return "asym_output"; }, asym_output_getter_s>,
-                                 meta_data_gen::dataset_mark<[] { return "sc_output"; }, sc_output_getter_s>
+                                 input_getter_s,
+                                 update_getter_s,
+                                 sym_output_getter_s,
+                                 asym_output_getter_s,
+                                 sc_output_getter_s
                                  // end list of all marks
                                  >::value;
 } // namespace
diff --git a/tests/cpp_unit_tests/test_optimizer.cpp b/tests/cpp_unit_tests/test_optimizer.cpp
index 64909f863..c5cc1a730 100644
--- a/tests/cpp_unit_tests/test_optimizer.cpp
+++ b/tests/cpp_unit_tests/test_optimizer.cpp
@@ -11,7 +11,7 @@ namespace {
 namespace meta_gen = meta_data::meta_data_gen;
 constexpr auto meta_data = meta_data::meta_data_gen::get_meta_data<
     ComponentList<Line, Link, Node, Transformer, ThreeWindingTransformer, TransformerTapRegulator, Source>,
-    meta_data::meta_data_gen::dataset_mark<[] { return "update"; }, meta_data::update_getter_s>>::value;
+    meta_data::update_getter_s>::value;
 } // namespace
 
 TEST_CASE("Test construct no-op optimizer") {
diff --git a/tests/cpp_unit_tests/test_tap_position_optimizer.cpp b/tests/cpp_unit_tests/test_tap_position_optimizer.cpp
index 11f4ff0a6..ec4f04156 100644
--- a/tests/cpp_unit_tests/test_tap_position_optimizer.cpp
+++ b/tests/cpp_unit_tests/test_tap_position_optimizer.cpp
@@ -645,7 +645,7 @@ TEST_CASE("Test Tap position optimizer") {
 
     auto const& meta_data =
         meta_gen::get_meta_data<ComponentList<MockTransformer, TransformerTapRegulator>,
-                                meta_gen::dataset_mark<[] { return "update"; }, meta_data::update_getter_s>>::value;
+                                meta_data::update_getter_s>::value;
 
     MockState state;
 

From 76ef1646f1cfa1bb7ca77962621dcc6cea1445d5 Mon Sep 17 00:00:00 2001
From: Tony Xiang <tony.xiang@alliander.com>
Date: Thu, 15 Aug 2024 12:57:20 +0200
Subject: [PATCH 6/7] fix all target

Signed-off-by: Tony Xiang <tony.xiang@alliander.com>
---
 .../power_grid_model/main_model_impl.hpp      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp
index 2576fb2ec..1e341db1b 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp
@@ -48,13 +48,13 @@ namespace power_grid_model {
 
 template <solver_output_type SolverOutputType> struct output_type_getter;
 template <short_circuit_solver_output_type SolverOutputType> struct output_type_getter<SolverOutputType> {
-    template <class T> using type = meta_data::sc_output_getter_s<T>;
+    using type = meta_data::sc_output_getter_s;
 };
 template <> struct output_type_getter<SolverOutput<symmetric_t>> {
-    template <class T> using type = meta_data::sym_output_getter_s<T>;
+    using type = meta_data::sym_output_getter_s;
 };
 template <> struct output_type_getter<SolverOutput<asymmetric_t>> {
-    template <class T> using type = meta_data::asym_output_getter_s<T>;
+    using type = meta_data::asym_output_getter_s;
 };
 
 struct power_flow_t {};
@@ -103,11 +103,11 @@ decltype(auto) calculation_type_symmetry_func_selector(CalculationType calculati
     calculation_type_func_selector(
         calculation_type,
         []<calculation_type_tag calculation_type, typename Functor_, typename... Args_>(
-            CalculationSymmetry calculation_symmetry_, Functor_ && f_, Args_ && ... args_) {
+            CalculationSymmetry calculation_symmetry_, Functor_&& f_, Args_&&... args_) {
             calculation_symmetry_func_selector(
                 calculation_symmetry_,
-                []<symmetry_tag sym, typename SubFunctor, typename... SubArgs>(SubFunctor && sub_f,
-                                                                               SubArgs && ... sub_args) {
+                []<symmetry_tag sym, typename SubFunctor, typename... SubArgs>(SubFunctor&& sub_f,
+                                                                               SubArgs&&... sub_args) {
                     std::forward<SubFunctor>(sub_f).template operator()<calculation_type, sym>(
                         std::forward<SubArgs>(sub_args)...);
                 },
@@ -153,7 +153,7 @@ class MainModelImpl<ExtraRetrievableTypes<ExtraRetrievableType...>, ComponentLis
         (functor.template operator()<ComponentType>(), ...);
     }
     template <class Functor> static constexpr auto run_functor_with_all_types_return_array(Functor functor) {
-        return std::array{functor.template operator()<ComponentType>()...};
+        return std::array { functor.template operator()<ComponentType>()... };
     }
 
   public:
@@ -795,7 +795,7 @@ class MainModelImpl<ExtraRetrievableTypes<ExtraRetrievableType...>, ComponentLis
                        Idx pos = 0) const {
         auto const output_func = [this, &math_output, &result_data, pos]<typename CT>() {
             // output
-            auto const span = result_data.get_buffer_span<output_type_getter<SolverOutputType>::template type, CT>(pos);
+            auto const span = result_data.get_buffer_span<typename output_type_getter<SolverOutputType>::type, CT>(pos);
             if (span.empty()) {
                 return;
             }
@@ -1096,8 +1096,8 @@ class MainModelImpl<ExtraRetrievableTypes<ExtraRetrievableType...>, ComponentLis
     template <calculation_input_type CalcInputType>
     static auto calculate_param(auto const& c, auto const&... extra_args)
         requires requires {
-                     { c.calc_param(extra_args...) };
-                 }
+            { c.calc_param(extra_args...) };
+        }
     {
         return c.calc_param(extra_args...);
     }
@@ -1105,8 +1105,8 @@ class MainModelImpl<ExtraRetrievableTypes<ExtraRetrievableType...>, ComponentLis
     template <calculation_input_type CalcInputType>
     static auto calculate_param(auto const& c, auto const&... extra_args)
         requires requires {
-                     { c.template calc_param<typename CalcInputType::sym>(extra_args...) };
-                 }
+            { c.template calc_param<typename CalcInputType::sym>(extra_args...) };
+        }
     {
         return c.template calc_param<typename CalcInputType::sym>(extra_args...);
     }

From bf26853cac90de4d0b0ca0e7773c751522469212 Mon Sep 17 00:00:00 2001
From: Tony Xiang <tony.xiang@alliander.com>
Date: Thu, 15 Aug 2024 13:00:04 +0200
Subject: [PATCH 7/7] formatting

Signed-off-by: Tony Xiang <tony.xiang@alliander.com>
---
 .../include/power_grid_model/main_model_impl.hpp | 16 ++++++++--------
 tests/cpp_unit_tests/test_dataset.cpp            | 15 +++++----------
 .../test_tap_position_optimizer.cpp              |  5 ++---
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp
index 1e341db1b..45dd6366c 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp
@@ -103,11 +103,11 @@ decltype(auto) calculation_type_symmetry_func_selector(CalculationType calculati
     calculation_type_func_selector(
         calculation_type,
         []<calculation_type_tag calculation_type, typename Functor_, typename... Args_>(
-            CalculationSymmetry calculation_symmetry_, Functor_&& f_, Args_&&... args_) {
+            CalculationSymmetry calculation_symmetry_, Functor_ && f_, Args_ && ... args_) {
             calculation_symmetry_func_selector(
                 calculation_symmetry_,
-                []<symmetry_tag sym, typename SubFunctor, typename... SubArgs>(SubFunctor&& sub_f,
-                                                                               SubArgs&&... sub_args) {
+                []<symmetry_tag sym, typename SubFunctor, typename... SubArgs>(SubFunctor && sub_f,
+                                                                               SubArgs && ... sub_args) {
                     std::forward<SubFunctor>(sub_f).template operator()<calculation_type, sym>(
                         std::forward<SubArgs>(sub_args)...);
                 },
@@ -153,7 +153,7 @@ class MainModelImpl<ExtraRetrievableTypes<ExtraRetrievableType...>, ComponentLis
         (functor.template operator()<ComponentType>(), ...);
     }
     template <class Functor> static constexpr auto run_functor_with_all_types_return_array(Functor functor) {
-        return std::array { functor.template operator()<ComponentType>()... };
+        return std::array{functor.template operator()<ComponentType>()...};
     }
 
   public:
@@ -1096,8 +1096,8 @@ class MainModelImpl<ExtraRetrievableTypes<ExtraRetrievableType...>, ComponentLis
     template <calculation_input_type CalcInputType>
     static auto calculate_param(auto const& c, auto const&... extra_args)
         requires requires {
-            { c.calc_param(extra_args...) };
-        }
+                     { c.calc_param(extra_args...) };
+                 }
     {
         return c.calc_param(extra_args...);
     }
@@ -1105,8 +1105,8 @@ class MainModelImpl<ExtraRetrievableTypes<ExtraRetrievableType...>, ComponentLis
     template <calculation_input_type CalcInputType>
     static auto calculate_param(auto const& c, auto const&... extra_args)
         requires requires {
-            { c.template calc_param<typename CalcInputType::sym>(extra_args...) };
-        }
+                     { c.template calc_param<typename CalcInputType::sym>(extra_args...) };
+                 }
     {
         return c.template calc_param<typename CalcInputType::sym>(extra_args...);
     }
diff --git a/tests/cpp_unit_tests/test_dataset.cpp b/tests/cpp_unit_tests/test_dataset.cpp
index 6223e8e58..45763ce1c 100644
--- a/tests/cpp_unit_tests/test_dataset.cpp
+++ b/tests/cpp_unit_tests/test_dataset.cpp
@@ -128,19 +128,14 @@ struct B {
     static constexpr auto name = "B";
 };
 
-constexpr MetaData test_meta_data =
-    meta_data_gen::get_meta_data<ComponentList<A, B>, // all components list
-                                 input_getter_s,
-                                 update_getter_s
-                                 // end list of all marks
-                                 >::value;
+constexpr MetaData test_meta_data = meta_data_gen::get_meta_data<ComponentList<A, B>, // all components list
+                                                                 input_getter_s, update_getter_s
+                                                                 // end list of all marks
+                                                                 >::value;
 
 constexpr MetaData test_meta_data_all =
     meta_data_gen::get_meta_data<ComponentList<A, B>, // all components list
-                                 input_getter_s,
-                                 update_getter_s,
-                                 sym_output_getter_s,
-                                 asym_output_getter_s,
+                                 input_getter_s, update_getter_s, sym_output_getter_s, asym_output_getter_s,
                                  sc_output_getter_s
                                  // end list of all marks
                                  >::value;
diff --git a/tests/cpp_unit_tests/test_tap_position_optimizer.cpp b/tests/cpp_unit_tests/test_tap_position_optimizer.cpp
index ec4f04156..4f541fe1e 100644
--- a/tests/cpp_unit_tests/test_tap_position_optimizer.cpp
+++ b/tests/cpp_unit_tests/test_tap_position_optimizer.cpp
@@ -643,9 +643,8 @@ TEST_CASE("Test Tap position optimizer") {
     using MockStateCalculator = test::MockStateCalculator<MockContainer>;
     using MockTransformerRanker = test::MockTransformerRanker<MockState>;
 
-    auto const& meta_data =
-        meta_gen::get_meta_data<ComponentList<MockTransformer, TransformerTapRegulator>,
-                                meta_data::update_getter_s>::value;
+    auto const& meta_data = meta_gen::get_meta_data<ComponentList<MockTransformer, TransformerTapRegulator>,
+                                                    meta_data::update_getter_s>::value;
 
     MockState state;