diff --git a/backend/condition/domain/mapping/lbwf/lbwf_element_map.py b/backend/condition/domain/mapping/lbwf/lbwf_element_map.py
index a547fe5c..bf54c5bb 100644
--- a/backend/condition/domain/mapping/lbwf/lbwf_element_map.py
+++ b/backend/condition/domain/mapping/lbwf/lbwf_element_map.py
@@ -165,17 +165,14 @@ LBWF_ELEMENT_MAP: dict[str, ElementMapping] = {
     "EXTWALLSTR": ElementMapping(
         elementType=ElementType.EXTERNAL_WALL,
         aspect_type=AspectType.STRUCTURE,
-        element_instance=1,
     ),
     "EXTWALLFN1": ElementMapping(
         elementType=ElementType.EXTERNAL_WALL,
         aspect_type=AspectType.FINISH,
-        element_instance=1,
     ),
     "EXTWALLFN2": ElementMapping(
         elementType=ElementType.EXTERNAL_WALL,
         aspect_type=AspectType.FINISH,
-        element_instance=1,
         aspect_instance=2,
     ),
     "EXTWALLINS": ElementMapping(
@@ -200,32 +197,30 @@ LBWF_ELEMENT_MAP: dict[str, ElementMapping] = {
     "EXTRFSTR1": ElementMapping(
         elementType=ElementType.ROOF,
         aspect_type=AspectType.STRUCTURE,
-        element_instance=1,
     ),
     "EXTRFSTR2": ElementMapping(
         elementType=ElementType.ROOF,
         aspect_type=AspectType.STRUCTURE,
-        element_instance=2,
+        aspect_instance=2,
     ),
     "EXTRFSTR3": ElementMapping(
         elementType=ElementType.ROOF,
         aspect_type=AspectType.STRUCTURE,
-        element_instance=3,
+        aspect_instance=3,
     ),
     "EXTROOF1": ElementMapping(
         elementType=ElementType.ROOF,
-        aspect_type=AspectType.COVERING,
-        element_instance=1,
+        aspect_type=AspectType.MATERIAL,
     ),
     "EXTROOF2": ElementMapping(
         elementType=ElementType.ROOF,
-        aspect_type=AspectType.COVERING,
-        element_instance=2,
+        aspect_type=AspectType.MATERIAL,
+        aspect_instance=2,
     ),
     "EXTROOF3": ElementMapping(
         elementType=ElementType.ROOF,
-        aspect_type=AspectType.COVERING,
-        element_instance=3,
+        aspect_type=AspectType.MATERIAL,
+        aspect_instance=3,
     ),
     "EXTCHIMNEY": ElementMapping(
         elementType=ElementType.CHIMNEY,
@@ -265,12 +260,11 @@ LBWF_ELEMENT_MAP: dict[str, ElementMapping] = {
     "EXTBKSDDR1": ElementMapping(
         elementType=ElementType.EXTERNAL_DOOR,
         aspect_type=AspectType.TYPE,
-        element_instance=1,
     ),
     "EXTBKSDDR2": ElementMapping(
         elementType=ElementType.EXTERNAL_DOOR,
         aspect_type=AspectType.TYPE,
-        element_instance=2,
+        aspect_instance=2,
     ),
     "INTWDWTYPE": ElementMapping(
         elementType=ElementType.EXTERNAL_WINDOWS,
@@ -279,12 +273,11 @@ LBWF_ELEMENT_MAP: dict[str, ElementMapping] = {
     "EXTWNDWS1": ElementMapping(
         elementType=ElementType.EXTERNAL_WINDOWS,
         aspect_type=AspectType.TYPE,
-        element_instance=1,
     ),
     "EXTWNDWS2": ElementMapping(
         elementType=ElementType.EXTERNAL_WINDOWS,
         aspect_type=AspectType.TYPE,
-        element_instance=2,
+        aspect_instance=2,
     ),
     "EXTGARDOOR": ElementMapping(
         elementType=ElementType.GARAGE_DOOR,
@@ -317,7 +310,6 @@ LBWF_ELEMENT_MAP: dict[str, ElementMapping] = {
     "EXTPTFRDR1": ElementMapping(
         elementType=ElementType.PATIO_FRENCH_DOOR,
         aspect_type=AspectType.MATERIAL,
-        element_instance=1,
     ),
     # ==========================================================
     # EXTERNAL AREAS
diff --git a/backend/condition/domain/mapping/peabody/peabody_element_map.py b/backend/condition/domain/mapping/peabody/peabody_element_map.py
index 2281a17c..ce344b9a 100644
--- a/backend/condition/domain/mapping/peabody/peabody_element_map.py
+++ b/backend/condition/domain/mapping/peabody/peabody_element_map.py
@@ -8,62 +8,81 @@ PEABODY_ELEMENT_MAP = {
     # PROPERTY / GENERAL
     # ==========================================================
     (100, 1): ElementMapping(
-        elementType=ElementType.PROPERTY, aspect_type=AspectType.TYPE
+        elementType=ElementType.PROPERTY,
+        aspect_type=AspectType.TYPE,
     ),
     # (100, 3): ElementMapping(element=Element.PROPERTY, aspect_type=AspectType.AGE),
     # (100, 14): ElementMapping(element="property", aspect_type="construction_type"),
     (50, 2): ElementMapping(
-        elementType=ElementType.CARBON_MONOXIDE_DETECTION, aspect_type=AspectType.TYPE
+        elementType=ElementType.CARBON_MONOXIDE_DETECTION,
+        aspect_type=AspectType.TYPE,
+    ),
+    (50, 3): ElementMapping(
+        elementType=ElementType.CCU,
+        aspect_type=AspectType.TYPE,
     ),
-    (50, 3): ElementMapping(elementType=ElementType.CCU, aspect_type=AspectType.TYPE),
     (50, 7): ElementMapping(
-        elementType=ElementType.DISABLED_HOIST_TRACKING, aspect_type=AspectType.PRESENCE
+        elementType=ElementType.DISABLED_HOIST_TRACKING,
+        aspect_type=AspectType.PRESENCE,
     ),
     (50, 11): ElementMapping(
-        elementType=ElementType.HEAT_DETECTION, aspect_type=AspectType.TYPE
+        elementType=ElementType.HEAT_DETECTION,
+        aspect_type=AspectType.TYPE,
     ),
     (50, 21): ElementMapping(
-        elementType=ElementType.SMOKE_DETECTION, aspect_type=AspectType.TYPE
+        elementType=ElementType.SMOKE_DETECTION,
+        aspect_type=AspectType.TYPE,
     ),
     (50, 22): ElementMapping(
-        elementType=ElementType.STAIRLIFT, aspect_type=AspectType.PRESENCE
+        elementType=ElementType.STAIRLIFT,
+        aspect_type=AspectType.PRESENCE,
     ),
     (50, 26): ElementMapping(
-        elementType=ElementType.DISABLED_FACILITIES, aspect_type=AspectType.TYPE
+        elementType=ElementType.DISABLED_FACILITIES,
+        aspect_type=AspectType.TYPE,
     ),
     (100, 3): ElementMapping(
-        elementType=ElementType.PROPERTY, aspect_type=AspectType.AGE_BAND
+        elementType=ElementType.PROPERTY,
+        aspect_type=AspectType.AGE_BAND,
     ),
     (100, 14): ElementMapping(
-        elementType=ElementType.PROPERTY, aspect_type=AspectType.CONSTRUCTION_TYPE
+        elementType=ElementType.PROPERTY,
+        aspect_type=AspectType.CONSTRUCTION_TYPE,
     ),
     (100, 16): ElementMapping(
-        elementType=ElementType.PROPERTY, aspect_type=AspectType.CLASSIFICATION
+        elementType=ElementType.PROPERTY,
+        aspect_type=AspectType.CLASSIFICATION,
     ),
     (210, 2): ElementMapping(
-        elementType=ElementType.PASSENGER_LIFT, aspect_type=AspectType.TYPE
+        elementType=ElementType.PASSENGER_LIFT,
+        aspect_type=AspectType.TYPE,
     ),
     # ==========================================================
     # EXTERNAL – WALLS
     # ==========================================================
     (50, 16): ElementMapping(
-        elementType=ElementType.PARTY_WALL_FIRE_BREAK, aspect_type=AspectType.PRESENCE
+        elementType=ElementType.PARTY_WALL_FIRE_BREAK,
+        aspect_type=AspectType.PRESENCE,
     ),
     (53, 1): ElementMapping(
-        elementType=ElementType.BOUNDARY_WALLS, aspect_type=AspectType.PRESENCE
+        elementType=ElementType.BOUNDARY_WALLS,
+        aspect_type=AspectType.PRESENCE,
     ),
     (53, 4): ElementMapping(
-        elementType=ElementType.EXTERNAL_DECORATION, aspect_type=AspectType.PRESENCE
+        elementType=ElementType.EXTERNAL_DECORATION,
+        aspect_type=AspectType.PRESENCE,
     ),
     (53, 5): ElementMapping(
         elementType=ElementType.EXTERNAL_NOISE_INSULATION,
         aspect_type=AspectType.ADEQUACY,
     ),
     (53, 14): ElementMapping(
-        elementType=ElementType.GARAGE_WALLS, aspect_type=AspectType.MATERIAL
+        elementType=ElementType.GARAGE_WALLS,
+        aspect_type=AspectType.MATERIAL,
     ),
     (53, 23): ElementMapping(
-        elementType=ElementType.EXTERNAL_WALL, aspect_type=AspectType.FINISH
+        elementType=ElementType.EXTERNAL_WALL,
+        aspect_type=AspectType.FINISH,
     ),
     (53, 30): ElementMapping(
         elementType=ElementType.EXTERNAL_WALL,
@@ -71,25 +90,32 @@ PEABODY_ELEMENT_MAP = {
         aspect_instance=2,
     ),
     (53, 36): ElementMapping(
-        elementType=ElementType.EXTERNAL_WALL, aspect_type=AspectType.INSULATION
+        elementType=ElementType.EXTERNAL_WALL,
+        aspect_type=AspectType.INSULATION,
     ),
     (53, 40): ElementMapping(
-        elementType=ElementType.SPANDREL_PANELS, aspect_type=AspectType.MATERIAL
+        elementType=ElementType.SPANDREL_PANELS,
+        aspect_type=AspectType.MATERIAL,
     ),
     (53, 41): ElementMapping(
-        elementType=ElementType.CLADDING, aspect_type=AspectType.MATERIAL
+        elementType=ElementType.CLADDING,
+        aspect_type=AspectType.MATERIAL,
     ),
     (100, 15): ElementMapping(
-        elementType=ElementType.EXTERNAL_DECORATION, aspect_type=AspectType.CONDITION
+        elementType=ElementType.EXTERNAL_DECORATION,
+        aspect_type=AspectType.CONDITION,
     ),
     (120, 1): ElementMapping(
-        elementType=ElementType.EXTERNAL_WALL, aspect_type=AspectType.STRUCTURE
+        elementType=ElementType.EXTERNAL_WALL,
+        aspect_type=AspectType.STRUCTURE,
     ),
     (120, 2): ElementMapping(
-        elementType=ElementType.EXTERNAL_WALL, aspect_type=AspectType.FINISH
+        elementType=ElementType.EXTERNAL_WALL,
+        aspect_type=AspectType.FINISH,
     ),
     (120, 3): ElementMapping(
-        elementType=ElementType.EXTERNAL_WALL, aspect_type=AspectType.INSULATION
+        elementType=ElementType.EXTERNAL_WALL,
+        aspect_type=AspectType.INSULATION,
     ),
     # ==========================================================
     # EXTERNAL – ROOFS
@@ -133,12 +159,11 @@ PEABODY_ELEMENT_MAP = {
     (110, 1): ElementMapping(
         elementType=ElementType.ROOF,
         aspect_type=AspectType.MATERIAL,
-        element_instance=1,
     ),
     (110, 2): ElementMapping(
         elementType=ElementType.ROOF,
         aspect_type=AspectType.MATERIAL,
-        element_instance=1,
+        aspect_instance=1,
     ),
     (110, 3): ElementMapping(
         elementType=ElementType.CHIMNEY,
@@ -202,12 +227,11 @@ PEABODY_ELEMENT_MAP = {
     (53, 38): ElementMapping(
         elementType=ElementType.EXTERNAL_WINDOWS,
         aspect_type=AspectType.TYPE,
-        element_instance=1,
     ),
     (53, 39): ElementMapping(
         elementType=ElementType.EXTERNAL_WINDOWS,
         aspect_type=AspectType.TYPE,
-        element_instance=2,
+        aspect_instance=2,
     ),
     (53, 43): ElementMapping(
         elementType=ElementType.FRONT_DOOR,