diff --git a/eive_tmtc/tmtc/payload/ploc_supervisor.py b/eive_tmtc/tmtc/payload/ploc_supervisor.py
index 8ee470a..0b5df66 100644
--- a/eive_tmtc/tmtc/payload/ploc_supervisor.py
+++ b/eive_tmtc/tmtc/payload/ploc_supervisor.py
@@ -83,7 +83,7 @@ FACTORY_RESET_OPS = {
 }
 
 
-class SupvActionId:
+class SupvActionId(enum.IntEnum):
     HK_REPORT = 1
     START_MPSOC = 3
     SHUTWOWN_MPSOC = 4
diff --git a/eive_tmtc/tmtc/payload/rad_sensor.py b/eive_tmtc/tmtc/payload/rad_sensor.py
index 78c82c3..e9dcff0 100644
--- a/eive_tmtc/tmtc/payload/rad_sensor.py
+++ b/eive_tmtc/tmtc/payload/rad_sensor.py
@@ -5,6 +5,7 @@
 @author J. Meier
 @date   01.07.2021
 """
+import enum
 import struct
 
 from eive_tmtc.config.definitions import CustomServiceList
@@ -20,7 +21,7 @@ from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
 
-class SetId:
+class SetId(enum.IntEnum):
     HK = 3