Index: leahi_dialin/td/modules/air_trap.py
===================================================================
diff -u -r6f76dccbc46cfa9f663285d2febd7588cec49bb3 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 6f76dccbc46cfa9f663285d2febd7588cec49bb3)
+++ leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.common import td_enum_repository
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
 
@@ -37,7 +38,7 @@
     AIR_DETECTED_AT_LEVEL = 0
     FLUID_DETECTED_AT_LEVEL = 1
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali Can Messenger object
         """