diff --git a/tomcat_bec/device_configs/microxas_test_bed.yaml b/tomcat_bec/device_configs/microxas_test_bed.yaml
index f29c7c0..7f305b0 100644
--- a/tomcat_bec/device_configs/microxas_test_bed.yaml
+++ b/tomcat_bec/device_configs/microxas_test_bed.yaml
@@ -92,24 +92,9 @@ femto_mean_curr:
 #  readoutPriority: monitored
 #  softwareTrigger: true
 
-gf2:
-  description: GigaFrost camera controls
-  deviceClass: tomcat_bec.devices.gigafrost.gigafrostcamera.GigaFrostCamera
-  deviceConfig:
-    prefix: 'X02DA-CAM-GF2:'
-    backend_url: 'http://xbl-daq-28:8080'
-    auto_soft_enable: true
-  deviceTags:
-  - camera
-  enabled: true
-  onFailure: buffer
-  readOnly: false
-  readoutPriority: monitored
-  softwareTrigger: true
-
 gfclient:
   description: GigaFrost camera controls
-  deviceClass: tomcat_bec.devices.gigafrost.gigafrostclient.GigaFrostClient
+  deviceClass: tomcat_bec.devices.GigaFrostClient
   deviceConfig:
     prefix: 'X02DA-CAM-GF2:'
     backend_url: 'http://xbl-daq-28:8080'
@@ -126,7 +111,7 @@ gfclient:
 
 daq_stream0:
   description: Standard DAQ preview stream 2 frames every 1000 image
-  deviceClass: tomcat_bec.devices.gigafrost.stddaq_preview.StdDaqPreview
+  deviceClass: tomcat_bec.devices.StdDaqPreview
   deviceConfig:
     url: 'tcp://129.129.95.38:20002'
   deviceTags:
@@ -139,7 +124,7 @@ daq_stream0:
 
 daq_stream1:
   description: Standard DAQ preview stream 4 frames at 10 Hz
-  deviceClass: tomcat_bec.devices.gigafrost.stddaq_preview.StdDaqPreview
+  deviceClass: tomcat_bec.devices.StdDaqPreview
   deviceConfig:
     url: 'tcp://129.129.95.38:20001'
   deviceTags:
@@ -152,7 +137,7 @@ daq_stream1:
 
 daq_stream2:
   description: Standard DAQ preview stream from first server
-  deviceClass: tomcat_bec.devices.gigafrost.stddaq_preview.StdDaqPreview
+  deviceClass: tomcat_bec.devices.StdDaqPreview
   deviceConfig:
     url: 'tcp://129.129.95.40:20001'
   deviceTags:
diff --git a/tomcat_bec/devices/__init__.py b/tomcat_bec/devices/__init__.py
index 341c4e8..03ee446 100644
--- a/tomcat_bec/devices/__init__.py
+++ b/tomcat_bec/devices/__init__.py
@@ -8,3 +8,8 @@ from .aerotech.AerotechAutomation1 import (
     aa1Tasks,
 )
 from .grashopper_tomcat import GrashopperTOMCAT
+
+from .psimotor import EpicsMotorMR, EpicsMotorEC
+
+from .gigafrost.gigafrostclient import GigaFrostClient
+from .gigafrost.stddaq_preview import StdDaqPreview
diff --git a/tomcat_bec/devices/gigafrost/stddaq_rest.py b/tomcat_bec/devices/gigafrost/stddaq_rest.py
index b3b5ddd..15f048c 100644
--- a/tomcat_bec/devices/gigafrost/stddaq_rest.py
+++ b/tomcat_bec/devices/gigafrost/stddaq_rest.py
@@ -89,7 +89,7 @@ class StdDaqRestClient(Device):
         self.cfg_start_udp_port.set(cfg['start_udp_port']).wait()
         self.cfg_writer_user_id.set(cfg['writer_user_id']).wait()
         #self.cfg_submodule_info.set(cfg['submodule_info']).wait()
-        self.cfg_max_number_of_forwarders.set(cfg['max_number_of_forwarders']).wait()
+        self.cfg_max_number_of_forwarders.set(cfg['max_number_of_forwarders_spawned']).wait()
         self.cfg_use_all_forwarders.set(cfg['use_all_forwarders']).wait()
         self.cfg_module_sync_queue_size.set(cfg['module_sync_queue_size']).wait()
         #self.cfg_module_positions.set(cfg['module_positions']).wait()
@@ -109,7 +109,7 @@ class StdDaqRestClient(Device):
             'writer_user_id':  int(self.cfg_writer_user_id.get()),
             'log_level':  "debug",
             'submodule_info': {},
-            'max_number_of_forwarders': int(self.cfg_max_number_of_forwarders.get()),
+            'max_number_of_forwarders_spawned': int(self.cfg_max_number_of_forwarders.get()),
             'use_all_forwarders': bool(self.cfg_use_all_forwarders.get()),
             'module_sync_queue_size': int(self.cfg_module_sync_queue_size.get()),
             'module_positions': {}