diff --git a/site_ansto/instrument/config/environment/magneticField/bruker.sct b/site_ansto/instrument/config/environment/magneticField/bruker.sct
index c1daa165..5abe322b 100644
--- a/site_ansto/instrument/config/environment/magneticField/bruker.sct
+++ b/site_ansto/instrument/config/environment/magneticField/bruker.sct
@@ -1,11 +1,12 @@
 # vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent nocindent
 driver bruker = {
+  wrapper_property nosctcontroller = True
   protocol = astvelsel
   class = environment
   simulation_group = environment_simulation
   add_args = 'id datype {tol 0.1}'
   make_args = 'id datype tol'
   code mkWrapper = {%%
-    add_bruker_BEC1 $name $ip_address $tcp_port $tol
+    add_bruker_bec1 $name $ip_address $tcp_port $tol $id $datype
   %%}
 }
diff --git a/site_ansto/instrument/config/environment/magneticField/sct_bruker.tcl b/site_ansto/instrument/config/environment/magneticField/sct_bruker.tcl
index 7093b2d7..e86bab65 100644
--- a/site_ansto/instrument/config/environment/magneticField/sct_bruker.tcl
+++ b/site_ansto/instrument/config/environment/magneticField/sct_bruker.tcl
@@ -36,7 +36,7 @@ proc ::scobj::bruker::mkDriver { sct_controller name device_class simulation_fla
   set catch_status [ catch {
 
 # mkWrapper hook code starts
-    add_bruker_BEC1 $name $ip_address $tcp_port $tol
+    add_bruker_bec1 $name $ip_address $tcp_port $tol $id $datype
 # mkWrapper hook code ends
   } catch_message ]
   handle_exception ${catch_status} ${catch_message}
@@ -45,19 +45,7 @@ proc ::scobj::bruker::mkDriver { sct_controller name device_class simulation_fla
 proc ::scobj::bruker::add_driver {name device_class simulation_flag ip_address tcp_port id datype {tol 0.1}} {
   set catch_status [ catch {
     ::scobj::bruker::sics_log 9 "::scobj::bruker::add_driver ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${tol}"
-    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      if {[string equal -nocase "aqadapter" "${ip_address}"]} {
-        ::scobj::bruker::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}"
-        makesctcontroller sct_${name} aqadapter ${tcp_port}
-      } else {
-        ::scobj::bruker::sics_log 9 "makesctcontroller sct_${name} astvelsel ${ip_address}:${tcp_port}"
-        makesctcontroller sct_${name} astvelsel ${ip_address}:${tcp_port}
-      }
-    } else {
-      ::scobj::bruker::sics_log 9 "simulation_flag=${simulation_flag} => Null sctcontroller for bruker"
-      ::scobj::bruker::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL"
-      makesctcontroller sct_${name} aqadapter NULL
-    }
+    ::scobj::bruker::sics_log 9 "No sctcontroller for bruker"
     ::scobj::bruker::sics_log 1 "::scobj::bruker::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${tol}"
     ::scobj::bruker::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${tol}
   } catch_message ]
@@ -110,46 +98,9 @@ proc ::scobj::bruker::read_config {} {
           continue
         }
         if { [string equal -nocase [dict get $v "driver"] "bruker"] } {
-          if { ![string equal -nocase "${simulation_flag}" "false"] } {
-            set asyncqueue "null"
-            ${ns}::sics_log 9 "simulation_flag=${simulation_flag} => using null asyncqueue"
-            ${ns}::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL"
-            makesctcontroller sct_${name} aqadapter NULL
-          } elseif { [dict exists $v "asyncqueue"] } {
-            set asyncqueue [dict get $v "asyncqueue"]
-            if { [string equal -nocase ${asyncqueue} "sct"] } {
-              set ip_address [dict get $v ip]
-              set tcp_port [dict get $v port]
-              makesctcontroller sct_${name} astvelsel ${ip_address}:${tcp_port}
-            } else {
-              makesctcontroller sct_${name} aqadapter ${asyncqueue}
-            }
-          } else {
-            if { [dict exists $v "asyncprotocol"] } {
-              set asyncprotocol [dict get $v "asyncprotocol"]
-            } else {
-              set asyncprotocol ${name}_protocol
-              MakeAsyncProtocol ${asyncprotocol}
-              if { [dict exists $v "sendterminator"] } {
-                ${asyncprotocol} sendterminator "[dict get $v "sendterminator"]"
-              } elseif { [dict exists $v "terminator"] } {
-                ${asyncprotocol} sendterminator "[dict get $v "terminator"]"
-              }
-              if { [dict exists $v "replyterminator"] } {
-                ${asyncprotocol} replyterminator "[dict get $v "replyterminator"]"
-              } elseif { [dict exists $v "terminator"] } {
-                ${asyncprotocol} replyterminator "[dict get $v "terminator"]"
-              }
-            }
-            set asyncqueue ${name}_queue
-            set ip_address [dict get $v ip]
-            set tcp_port [dict get $v port]
-            MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port}
-            if { [dict exists $v "timeout"] } {
-              ${asyncqueue} timeout "[dict get $v "timeout"]"
-            }
-            makesctcontroller sct_${name} aqadapter ${asyncqueue}
-          }
+          ::scobj::bruker::sics_log 9 "No sctcontroller for bruker"
+          set ip_address [dict get $v ip]
+          set tcp_port [dict get $v port]
           set arg_list [list]
           set missing_list [list]
           foreach arg {id datype tol} {