Index: leahi_dialin/td/modules/air_pump.py
===================================================================
diff -u -r3f6c0e94db8379f00cb7fbc91daa189d6b06f379 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision 3f6c0e94db8379f00cb7fbc91daa189d6b06f379)
+++ leahi_dialin/td/modules/air_pump.py	(.../air_pump.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
 
 MAX_AIR_PUMP_POWER_LEVEL = 255  #Maximum air pump power allowed
@@ -34,7 +35,7 @@
     Treatment Delivery (TD) Dialin API sub-class for air pump related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali Can Messenger object
         """