diff --git a/tomcat_bec/devices/aerotech/AerotechPso.py b/tomcat_bec/devices/aerotech/AerotechPso.py
index 03caf46..61e3d10 100644
--- a/tomcat_bec/devices/aerotech/AerotechPso.py
+++ b/tomcat_bec/devices/aerotech/AerotechPso.py
@@ -29,9 +29,10 @@ class AerotechPsoDistanceMixin(CustomDeviceMixin):
         """ Configuration and staging
         """
         # logger.warning(self.parent.scaninfo.scan_msg.info.keys())
-        logger.warning(self.parent.scaninfo.scan_msg.info.kwargs.keys())
+        logger.warning(self.parent.scaninfo.scan_msg.info['kwargs'].keys())
 
         # Fish out our configuration from scaninfo (via explicit or generic addressing)
+        scan = self.parent.scaninfo.scan_msg
         prefix = self.parent.parent.name if self.parent.parent is not None else self.parent.name
         d = {}
         if hasattr(self.parent.scaninfo, prefix + '_pso_distance'):
diff --git a/tomcat_bec/devices/aerotech/AerotechTasks.py b/tomcat_bec/devices/aerotech/AerotechTasks.py
index d1d8902..5a97313 100644
--- a/tomcat_bec/devices/aerotech/AerotechTasks.py
+++ b/tomcat_bec/devices/aerotech/AerotechTasks.py
@@ -31,7 +31,7 @@ class AerotechTasksMixin(CustomDeviceMixin):
 
         NOTE: Tomcat might use multiple cameras with their own separate DAQ instances.
         """
-        logger.warning(self.parent.scaninfo.__dict__)
+        logger.warning(self.parent.scaninfo.scan_msg.info['kwargs'].keys())
 
         # Fish out our configuration from scaninfo (via explicit or generic addressing)
         prefix = self.parent.parent.name if self.parent.parent is not None else self.parent.name