diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/power_direction_kind.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/power_direction_kind.py
index 580fea670..1befce3b8 100644
--- a/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/power_direction_kind.py
+++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/power_direction_kind.py
@@ -5,13 +5,12 @@
 
 __all__ = ["PowerDirectionKind"]
 
-from enum import Enum, unique
+from enum import Enum
 
 from zepben.ewb.model.cim.extensions.zbex import zbex
 
 
 @zbex
-@unique
 class PowerDirectionKind(Enum):
     """
     [ZBEX]
diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/protection_kind.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/protection_kind.py
index 236ab7ada..f7931c6d5 100644
--- a/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/protection_kind.py
+++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/protection_kind.py
@@ -5,13 +5,12 @@
 
 __all__ = ["ProtectionKind"]
 
-from enum import Enum, unique
+from enum import Enum
 
 from zepben.ewb.model.cim.extensions.zbex import zbex
 
 
 @zbex
-@unique
 class ProtectionKind(Enum):
     """
     [ZBEX]
diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/wires/battery_control_mode.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/wires/battery_control_mode.py
index 2cc448959..9f06ab8e5 100644
--- a/src/zepben/ewb/model/cim/extensions/iec61970/base/wires/battery_control_mode.py
+++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/wires/battery_control_mode.py
@@ -5,13 +5,12 @@
 
 __all__ = ["BatteryControlMode"]
 
-from enum import Enum, unique
+from enum import Enum
 
 from zepben.ewb.model.cim.extensions.zbex import zbex
 
 
 @zbex
-@unique
 class BatteryControlMode(Enum):
     """
     [ZBEX]
diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/wires/transformer_cooling_type.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/wires/transformer_cooling_type.py
index 7f2e81b56..02469abc9 100644
--- a/src/zepben/ewb/model/cim/extensions/iec61970/base/wires/transformer_cooling_type.py
+++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/wires/transformer_cooling_type.py
@@ -5,13 +5,12 @@
 
 __all__ = ["TransformerCoolingType"]
 
-from enum import Enum, unique
+from enum import Enum
 
 from zepben.ewb.model.cim.extensions.zbex import zbex
 
 
 @zbex
-@unique
 class TransformerCoolingType(Enum):
     """
     [ZBEX]
diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/wires/vector_group.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/wires/vector_group.py
index ab8810ec0..69d2fde18 100644
--- a/src/zepben/ewb/model/cim/extensions/iec61970/base/wires/vector_group.py
+++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/wires/vector_group.py
@@ -5,13 +5,12 @@
 
 __all__ = ["VectorGroup"]
 
-from enum import Enum, unique
+from enum import Enum
 
 from zepben.ewb.model.cim.extensions.zbex import zbex
 
 
 @zbex
-@unique
 class VectorGroup(Enum):
     """
     [ZBEX]
diff --git a/src/zepben/ewb/model/cim/iec61968/assetinfo/wire_material_kind.py b/src/zepben/ewb/model/cim/iec61968/assetinfo/wire_material_kind.py
index 37b39d293..74b7fb228 100644
--- a/src/zepben/ewb/model/cim/iec61968/assetinfo/wire_material_kind.py
+++ b/src/zepben/ewb/model/cim/iec61968/assetinfo/wire_material_kind.py
@@ -5,10 +5,9 @@
 
 __all__ = ["WireMaterialKind"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class WireMaterialKind(Enum):
     """
     Kind of wire material.
diff --git a/src/zepben/ewb/model/cim/iec61968/customers/customer_kind.py b/src/zepben/ewb/model/cim/iec61968/customers/customer_kind.py
index f013d8e41..40a56714d 100644
--- a/src/zepben/ewb/model/cim/iec61968/customers/customer_kind.py
+++ b/src/zepben/ewb/model/cim/iec61968/customers/customer_kind.py
@@ -5,10 +5,9 @@
 
 __all__ = ["CustomerKind"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class CustomerKind(Enum):
     """
     Kind of customer.
diff --git a/src/zepben/ewb/model/cim/iec61968/infiec61968/infassetinfo/transformer_construction_kind.py b/src/zepben/ewb/model/cim/iec61968/infiec61968/infassetinfo/transformer_construction_kind.py
index 68933a55f..29df75a1b 100644
--- a/src/zepben/ewb/model/cim/iec61968/infiec61968/infassetinfo/transformer_construction_kind.py
+++ b/src/zepben/ewb/model/cim/iec61968/infiec61968/infassetinfo/transformer_construction_kind.py
@@ -5,10 +5,9 @@
 
 __all__ = ["TransformerConstructionKind"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class TransformerConstructionKind(Enum):
     """
     Kind of transformer construction.
diff --git a/src/zepben/ewb/model/cim/iec61968/infiec61968/infassetinfo/transformer_function_kind.py b/src/zepben/ewb/model/cim/iec61968/infiec61968/infassetinfo/transformer_function_kind.py
index ab61579a9..7e2006bc5 100644
--- a/src/zepben/ewb/model/cim/iec61968/infiec61968/infassetinfo/transformer_function_kind.py
+++ b/src/zepben/ewb/model/cim/iec61968/infiec61968/infassetinfo/transformer_function_kind.py
@@ -5,10 +5,9 @@
 
 __all__ = ["TransformerFunctionKind"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class TransformerFunctionKind(Enum):
     """
     Function of a transformer.
diff --git a/src/zepben/ewb/model/cim/iec61968/infiec61968/infassets/streetlight_lamp_kind.py b/src/zepben/ewb/model/cim/iec61968/infiec61968/infassets/streetlight_lamp_kind.py
index 65c5c6918..5fc554ea1 100644
--- a/src/zepben/ewb/model/cim/iec61968/infiec61968/infassets/streetlight_lamp_kind.py
+++ b/src/zepben/ewb/model/cim/iec61968/infiec61968/infassets/streetlight_lamp_kind.py
@@ -5,10 +5,9 @@
 
 __all__ = ["StreetlightLampKind"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class StreetlightLampKind(Enum):
     """
     Kind of lamp for a `Streetlight`
diff --git a/src/zepben/ewb/model/cim/iec61968/metering/controlled_appliance.py b/src/zepben/ewb/model/cim/iec61968/metering/controlled_appliance.py
index 3e133f110..d91920f0d 100644
--- a/src/zepben/ewb/model/cim/iec61968/metering/controlled_appliance.py
+++ b/src/zepben/ewb/model/cim/iec61968/metering/controlled_appliance.py
@@ -8,11 +8,10 @@
 __all__ = ["ControlledAppliance", "Appliance"]
 
 from dataclasses import dataclass
-from enum import Enum, unique
+from enum import Enum
 from typing import List, Union
 
 
-@unique
 class Appliance(Enum):
     """
     The type of appliance.
diff --git a/src/zepben/ewb/model/cim/iec61968/metering/end_device_function_kind.py b/src/zepben/ewb/model/cim/iec61968/metering/end_device_function_kind.py
index 0507e79a5..96b4168ef 100644
--- a/src/zepben/ewb/model/cim/iec61968/metering/end_device_function_kind.py
+++ b/src/zepben/ewb/model/cim/iec61968/metering/end_device_function_kind.py
@@ -5,10 +5,9 @@
 
 __all__ = ["EndDeviceFunctionKind"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class EndDeviceFunctionKind(Enum):
     """
     Kind of end device function.
diff --git a/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/potential_transformer_kind.py b/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/potential_transformer_kind.py
index 1c659d2a2..5f5de866e 100644
--- a/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/potential_transformer_kind.py
+++ b/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/potential_transformer_kind.py
@@ -5,10 +5,9 @@
 
 __all__ = ["PotentialTransformerKind"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class PotentialTransformerKind(Enum):
     """
     The construction kind of the potential transformer.
diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/phase_code.py b/src/zepben/ewb/model/cim/iec61970/base/core/phase_code.py
index 46dfe0fa6..846ee9121 100644
--- a/src/zepben/ewb/model/cim/iec61970/base/core/phase_code.py
+++ b/src/zepben/ewb/model/cim/iec61970/base/core/phase_code.py
@@ -5,7 +5,7 @@
 
 __all__ = ["PhaseCode", "phase_code_by_id", "phase_code_from_single_phases"]
 
-from enum import Enum, unique
+from enum import Enum
 from typing import List, Set, Union
 
 from zepben.ewb.model.cim.iec61970.base.wires.single_phase_kind import SinglePhaseKind
@@ -21,7 +21,6 @@ def phase_code_by_id(value: int):
     return _PHASE_CODE_VALUES[value]
 
 
-@unique
 class PhaseCode(Enum):
     """
     An unordered enumeration of phase identifiers.  Allows designation of phases for both transmission and distribution equipment,
diff --git a/src/zepben/ewb/model/cim/iec61970/base/diagramlayout/diagram_style.py b/src/zepben/ewb/model/cim/iec61970/base/diagramlayout/diagram_style.py
index cb380de24..d658518ff 100644
--- a/src/zepben/ewb/model/cim/iec61970/base/diagramlayout/diagram_style.py
+++ b/src/zepben/ewb/model/cim/iec61970/base/diagramlayout/diagram_style.py
@@ -5,10 +5,9 @@
 
 __all__ = ["DiagramStyle"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class DiagramStyle(Enum):
     """
     The diagram style refer to a style used by the originating system for a diagram.  A diagram style describes
diff --git a/src/zepben/ewb/model/cim/iec61970/base/diagramlayout/orientation_kind.py b/src/zepben/ewb/model/cim/iec61970/base/diagramlayout/orientation_kind.py
index afc0ffae6..2d1e461f2 100644
--- a/src/zepben/ewb/model/cim/iec61970/base/diagramlayout/orientation_kind.py
+++ b/src/zepben/ewb/model/cim/iec61970/base/diagramlayout/orientation_kind.py
@@ -5,10 +5,9 @@
 
 __all__ = ["OrientationKind"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class OrientationKind(Enum):
     """
     The orientation of the coordinate system with respect to top, left, and the coordinate number system.
diff --git a/src/zepben/ewb/model/cim/iec61970/base/domain/unit_symbol.py b/src/zepben/ewb/model/cim/iec61970/base/domain/unit_symbol.py
index 817178263..d1dfae5af 100644
--- a/src/zepben/ewb/model/cim/iec61970/base/domain/unit_symbol.py
+++ b/src/zepben/ewb/model/cim/iec61970/base/domain/unit_symbol.py
@@ -16,7 +16,6 @@ def unit_symbol_from_id(value: int):
     return _unitsymbol_members_by_id[value]
 
 
-# NOTE: We can't use `@unique` here, as there are duplicate unit strings.
 class UnitSymbol(Enum):
     """
     The derived units defined for usage in the CIM. In some cases, the derived unit is equal to an SI unit. Whenever possible, the standard derived symbol is
diff --git a/src/zepben/ewb/model/cim/iec61970/base/generation/production/battery_state_kind.py b/src/zepben/ewb/model/cim/iec61970/base/generation/production/battery_state_kind.py
index a8eb5e475..428dede8b 100644
--- a/src/zepben/ewb/model/cim/iec61970/base/generation/production/battery_state_kind.py
+++ b/src/zepben/ewb/model/cim/iec61970/base/generation/production/battery_state_kind.py
@@ -5,10 +5,9 @@
 
 __all__ = ["BatteryStateKind"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class BatteryStateKind(Enum):
     """
     Battery state.
diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/phase_shunt_connection_kind.py b/src/zepben/ewb/model/cim/iec61970/base/wires/phase_shunt_connection_kind.py
index a4c341f57..3f7524b88 100644
--- a/src/zepben/ewb/model/cim/iec61970/base/wires/phase_shunt_connection_kind.py
+++ b/src/zepben/ewb/model/cim/iec61970/base/wires/phase_shunt_connection_kind.py
@@ -5,10 +5,9 @@
 
 __all__ = ["PhaseShuntConnectionKind"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class PhaseShuntConnectionKind(Enum):
     """
     The configuration of phase connections for a single terminal device such as a load or capacitor.
diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/regulating_control_mode_kind.py b/src/zepben/ewb/model/cim/iec61970/base/wires/regulating_control_mode_kind.py
index cfbb3de44..8beb389a3 100644
--- a/src/zepben/ewb/model/cim/iec61970/base/wires/regulating_control_mode_kind.py
+++ b/src/zepben/ewb/model/cim/iec61970/base/wires/regulating_control_mode_kind.py
@@ -5,10 +5,9 @@
 
 __all__ = ["RegulatingControlModeKind"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class RegulatingControlModeKind(Enum):
     """
     The kind of regulation model. For example regulating voltage, reactive power, active power, etc.
diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/single_phase_kind.py b/src/zepben/ewb/model/cim/iec61970/base/wires/single_phase_kind.py
index 8236a0d34..73c20ef93 100644
--- a/src/zepben/ewb/model/cim/iec61970/base/wires/single_phase_kind.py
+++ b/src/zepben/ewb/model/cim/iec61970/base/wires/single_phase_kind.py
@@ -5,7 +5,7 @@
 
 __all__ = ["SinglePhaseKind", "single_phase_kind_by_id", "SINGLE_PHASE_KIND_VALUES"]
 
-from enum import Enum, unique
+from enum import Enum
 from typing import Union
 
 
@@ -25,7 +25,6 @@ def single_phase_kind_by_id(value):
     return SINGLE_PHASE_KIND_VALUES[value]
 
 
-@unique
 class SinglePhaseKind(Enum):
     """
     Enumeration of single phase identifiers. Allows designation of single phases for both transmission and distribution equipment, circuits and loads.
diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/svc_control_mode.py b/src/zepben/ewb/model/cim/iec61970/base/wires/svc_control_mode.py
index 9a09154a1..6dda61b1f 100644
--- a/src/zepben/ewb/model/cim/iec61970/base/wires/svc_control_mode.py
+++ b/src/zepben/ewb/model/cim/iec61970/base/wires/svc_control_mode.py
@@ -5,10 +5,9 @@
 
 __all__ = ["SVCControlMode"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class SVCControlMode(Enum):
     """
     Static VAr Compensator control mode.
diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/synchronous_machine_kind.py b/src/zepben/ewb/model/cim/iec61970/base/wires/synchronous_machine_kind.py
index fe7872f4a..5ac8340e4 100644
--- a/src/zepben/ewb/model/cim/iec61970/base/wires/synchronous_machine_kind.py
+++ b/src/zepben/ewb/model/cim/iec61970/base/wires/synchronous_machine_kind.py
@@ -5,10 +5,9 @@
 
 __all__ = ["SynchronousMachineKind"]
 
-from enum import unique, Enum
+from enum import Enum
 
 
-@unique
 class SynchronousMachineKind(Enum):
     """
     Synchronous machine type.
diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/winding_connection.py b/src/zepben/ewb/model/cim/iec61970/base/wires/winding_connection.py
index f94e6df40..507ce70ad 100644
--- a/src/zepben/ewb/model/cim/iec61970/base/wires/winding_connection.py
+++ b/src/zepben/ewb/model/cim/iec61970/base/wires/winding_connection.py
@@ -5,10 +5,9 @@
 
 __all__ = ["WindingConnection"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class WindingConnection(Enum):
     """
     Winding connection type.
diff --git a/src/zepben/ewb/services/network/network_state.py b/src/zepben/ewb/services/network/network_state.py
index 04ea7451c..3b8652f91 100644
--- a/src/zepben/ewb/services/network/network_state.py
+++ b/src/zepben/ewb/services/network/network_state.py
@@ -5,10 +5,9 @@
 
 __all__ = ["NetworkState"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class NetworkState(Enum):
     """
     Indicates which state of the network an operation should be performed on.
diff --git a/src/zepben/ewb/streaming/get/included_energized_containers.py b/src/zepben/ewb/streaming/get/included_energized_containers.py
index f367558c2..3e16d3a99 100644
--- a/src/zepben/ewb/streaming/get/included_energized_containers.py
+++ b/src/zepben/ewb/streaming/get/included_energized_containers.py
@@ -5,10 +5,9 @@
 
 __all__ = ["IncludedEnergizedContainers"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class IncludedEnergizedContainers(Enum):
     """
     Indicates which energized contains should be included when fetching a container.
diff --git a/src/zepben/ewb/streaming/get/included_energizing_containers.py b/src/zepben/ewb/streaming/get/included_energizing_containers.py
index fe27ab4c6..90027da51 100644
--- a/src/zepben/ewb/streaming/get/included_energizing_containers.py
+++ b/src/zepben/ewb/streaming/get/included_energizing_containers.py
@@ -5,10 +5,9 @@
 
 __all__ = ["IncludedEnergizingContainers"]
 
-from enum import Enum, unique
+from enum import Enum
 
 
-@unique
 class IncludedEnergizingContainers(Enum):
     """
     Indicates which energizing contains should be included when fetching a container.