diff --git a/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl b/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
index 1eda955e..26d97060 100644
--- a/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
+++ b/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
@@ -59,6 +59,7 @@ proc ::scobj::he3_polanal::chkWrite {tc_root} {
     debug_log ${tc_root} 1 "chkWrite tc_root=${tc_root} sct=[sct] resp=[sct result]"
 # chkWrite hook code starts
     [namespace current]::rdValue ${tc_root}
+    clientput [sct result]
 # chkWrite hook code ends
     return "idle"
   } catch_message ]
@@ -126,6 +127,7 @@ proc ::scobj::he3_polanal::rdValue {tc_root} {
       set data [lindex ${dlist} 1]
     }
     set path [pathname [sct]]
+    set timestamp [clock format [clock seconds] -format "%T"]
     if {[llength ${dlist}] > 2} {
       set new_value [lindex ${dlist} 2]
       if { "${new_value}" == "NaN" } {
@@ -145,6 +147,7 @@ proc ::scobj::he3_polanal::rdValue {tc_root} {
     if {[llength ${dlist}] > 6} {
       hupdateif ${path}/Field "[lindex ${dlist} 6]"
     }
+    hupdateif ${path}/Timestamp "${timestamp}"
 # rdValue hook code ends
     if { [hpropexists [sct] geterror] } {
       debug_log ${tc_root} 9 "[sct] error: [sct geterror]"
@@ -175,6 +178,9 @@ proc ::scobj::he3_polanal::setValue {tc_root nextState cmd_str} {
     if {[string equal -nocase [sct target] "refresh"]} {
       set cmd "${cmd_str}"
     }
+    if {[string equal -nocase [sct target] "minus"]} {
+      set cmd "${cmd_str} -"
+    }
     if {[string equal -nocase [sct target] "dn"]} {
       set cmd "${cmd_str} -"
     }
@@ -184,6 +190,9 @@ proc ::scobj::he3_polanal::setValue {tc_root nextState cmd_str} {
     if {[sct target] == "-" || [sct target] == -1} {
       set cmd "${cmd_str} -"
     }
+    if {[string equal -nocase [sct target] "plus"]} {
+      set cmd "${cmd_str} +"
+    }
     if {[string equal -nocase [sct target] "up"]} {
       set cmd "${cmd_str} +"
     }
@@ -209,8 +218,8 @@ proc ::scobj::he3_polanal::setValue {tc_root nextState cmd_str} {
   handle_exception ${catch_status} ${catch_message}
 }
 
-proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulation_flag ip_address tcp_port } {
-  ::scobj::he3_polanal::sics_log 9 "::scobj::he3_polanal::mkDriver ${sct_controller} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}"
+proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulation_flag ip_address tcp_port {has_pol true} {has_anal true} } {
+  ::scobj::he3_polanal::sics_log 9 "::scobj::he3_polanal::mkDriver ${sct_controller} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${has_pol} ${has_anal}"
   set ns "[namespace current]"
   set catch_status [ catch {
 
@@ -220,181 +229,387 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
+    if {[string equal -nocase ${has_anal} "true"]} {
 
-    hfactory ${scobj_hpath}/analyser plain spy none
-    hsetprop ${scobj_hpath}/analyser data "true"
-    hsetprop ${scobj_hpath}/analyser klass "@none"
-    hsetprop ${scobj_hpath}/analyser type "part"
+      hfactory ${scobj_hpath}/analyser plain spy none
 
-    hfactory ${scobj_hpath}/analyser/Amplitude plain user text
-    hsetprop ${scobj_hpath}/analyser/Amplitude control true
-    hsetprop ${scobj_hpath}/analyser/Amplitude data true
-    hsetprop ${scobj_hpath}/analyser/Amplitude mutable true
-    hsetprop ${scobj_hpath}/analyser/Amplitude nxsave true
-    hsetprop ${scobj_hpath}/analyser/Amplitude oldval UNKNOWN
-    hsetprop ${scobj_hpath}/analyser/Amplitude klass "parameter"
-    hsetprop ${scobj_hpath}/analyser/Amplitude sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/analyser/Amplitude type "part"
-    hsetprop ${scobj_hpath}/analyser/Amplitude nxalias "${name}_analyser_Amplitude"
+      hfactory ${scobj_hpath}/analyser/Amplitude plain user text
+      hsetprop ${scobj_hpath}/analyser/Amplitude control true
+      hsetprop ${scobj_hpath}/analyser/Amplitude data true
+      hsetprop ${scobj_hpath}/analyser/Amplitude mutable true
+      hsetprop ${scobj_hpath}/analyser/Amplitude nxsave true
+      hsetprop ${scobj_hpath}/analyser/Amplitude oldval UNKNOWN
+      hsetprop ${scobj_hpath}/analyser/Amplitude klass "parameter"
+      hsetprop ${scobj_hpath}/analyser/Amplitude sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/analyser/Amplitude type "part"
+      hsetprop ${scobj_hpath}/analyser/Amplitude nxalias "${name}_analyser_Amplitude"
 
-    hfactory ${scobj_hpath}/analyser/Field plain user text
-    hsetprop ${scobj_hpath}/analyser/Field control true
-    hsetprop ${scobj_hpath}/analyser/Field data true
-    hsetprop ${scobj_hpath}/analyser/Field mutable true
-    hsetprop ${scobj_hpath}/analyser/Field nxsave true
-    hsetprop ${scobj_hpath}/analyser/Field units Oersted
-    hsetprop ${scobj_hpath}/analyser/Field oldval UNKNOWN
-    hsetprop ${scobj_hpath}/analyser/Field klass "parameter"
-    hsetprop ${scobj_hpath}/analyser/Field sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/analyser/Field type "part"
-    hsetprop ${scobj_hpath}/analyser/Field nxalias "${name}_analyser_Field"
+      hfactory ${scobj_hpath}/analyser/Field plain user text
+      hsetprop ${scobj_hpath}/analyser/Field control true
+      hsetprop ${scobj_hpath}/analyser/Field data true
+      hsetprop ${scobj_hpath}/analyser/Field mutable true
+      hsetprop ${scobj_hpath}/analyser/Field nxsave true
+      hsetprop ${scobj_hpath}/analyser/Field units Oersted
+      hsetprop ${scobj_hpath}/analyser/Field oldval UNKNOWN
+      hsetprop ${scobj_hpath}/analyser/Field klass "parameter"
+      hsetprop ${scobj_hpath}/analyser/Field sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/analyser/Field type "part"
+      hsetprop ${scobj_hpath}/analyser/Field nxalias "${name}_analyser_Field"
 
-    hfactory ${scobj_hpath}/analyser/Freq plain user text
-    hsetprop ${scobj_hpath}/analyser/Freq control true
-    hsetprop ${scobj_hpath}/analyser/Freq data true
-    hsetprop ${scobj_hpath}/analyser/Freq mutable true
-    hsetprop ${scobj_hpath}/analyser/Freq nxsave true
-    hsetprop ${scobj_hpath}/analyser/Freq units Hertz
-    hsetprop ${scobj_hpath}/analyser/Freq oldval UNKNOWN
-    hsetprop ${scobj_hpath}/analyser/Freq klass "parameter"
-    hsetprop ${scobj_hpath}/analyser/Freq sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/analyser/Freq type "part"
-    hsetprop ${scobj_hpath}/analyser/Freq nxalias "${name}_analyser_Freq"
+      hfactory ${scobj_hpath}/analyser/Freq plain user text
+      hsetprop ${scobj_hpath}/analyser/Freq control true
+      hsetprop ${scobj_hpath}/analyser/Freq data true
+      hsetprop ${scobj_hpath}/analyser/Freq mutable true
+      hsetprop ${scobj_hpath}/analyser/Freq nxsave true
+      hsetprop ${scobj_hpath}/analyser/Freq units Hertz
+      hsetprop ${scobj_hpath}/analyser/Freq oldval UNKNOWN
+      hsetprop ${scobj_hpath}/analyser/Freq klass "parameter"
+      hsetprop ${scobj_hpath}/analyser/Freq sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/analyser/Freq type "part"
+      hsetprop ${scobj_hpath}/analyser/Freq nxalias "${name}_analyser_Freq"
 
-    hfactory ${scobj_hpath}/analyser/Phase plain user text
-    hsetprop ${scobj_hpath}/analyser/Phase control true
-    hsetprop ${scobj_hpath}/analyser/Phase data true
-    hsetprop ${scobj_hpath}/analyser/Phase mutable true
-    hsetprop ${scobj_hpath}/analyser/Phase nxsave true
-    hsetprop ${scobj_hpath}/analyser/Phase units Degree
-    hsetprop ${scobj_hpath}/analyser/Phase oldval UNKNOWN
-    hsetprop ${scobj_hpath}/analyser/Phase klass "parameter"
-    hsetprop ${scobj_hpath}/analyser/Phase sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/analyser/Phase type "part"
-    hsetprop ${scobj_hpath}/analyser/Phase nxalias "${name}_analyser_Phase"
+      hfactory ${scobj_hpath}/analyser/Phase plain user text
+      hsetprop ${scobj_hpath}/analyser/Phase control true
+      hsetprop ${scobj_hpath}/analyser/Phase data true
+      hsetprop ${scobj_hpath}/analyser/Phase mutable true
+      hsetprop ${scobj_hpath}/analyser/Phase nxsave true
+      hsetprop ${scobj_hpath}/analyser/Phase units Degree
+      hsetprop ${scobj_hpath}/analyser/Phase oldval UNKNOWN
+      hsetprop ${scobj_hpath}/analyser/Phase klass "parameter"
+      hsetprop ${scobj_hpath}/analyser/Phase sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/analyser/Phase type "part"
+      hsetprop ${scobj_hpath}/analyser/Phase nxalias "${name}_analyser_Phase"
 
-    hfactory ${scobj_hpath}/analyser/Time2 plain user text
-    hsetprop ${scobj_hpath}/analyser/Time2 control true
-    hsetprop ${scobj_hpath}/analyser/Time2 data true
-    hsetprop ${scobj_hpath}/analyser/Time2 mutable true
-    hsetprop ${scobj_hpath}/analyser/Time2 nxsave true
-    hsetprop ${scobj_hpath}/analyser/Time2 units Second
-    hsetprop ${scobj_hpath}/analyser/Time2 oldval UNKNOWN
-    hsetprop ${scobj_hpath}/analyser/Time2 klass "parameter"
-    hsetprop ${scobj_hpath}/analyser/Time2 sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/analyser/Time2 type "part"
-    hsetprop ${scobj_hpath}/analyser/Time2 nxalias "${name}_analyser_Time2"
+      hfactory ${scobj_hpath}/analyser/Time2 plain user text
+      hsetprop ${scobj_hpath}/analyser/Time2 control true
+      hsetprop ${scobj_hpath}/analyser/Time2 data true
+      hsetprop ${scobj_hpath}/analyser/Time2 mutable true
+      hsetprop ${scobj_hpath}/analyser/Time2 nxsave true
+      hsetprop ${scobj_hpath}/analyser/Time2 units Second
+      hsetprop ${scobj_hpath}/analyser/Time2 oldval UNKNOWN
+      hsetprop ${scobj_hpath}/analyser/Time2 klass "parameter"
+      hsetprop ${scobj_hpath}/analyser/Time2 sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/analyser/Time2 type "part"
+      hsetprop ${scobj_hpath}/analyser/Time2 nxalias "${name}_analyser_Time2"
 
-    hfactory ${scobj_hpath}/analyser/spin plain user text
-    hsetprop ${scobj_hpath}/analyser/spin read ${ns}::getValue ${scobj_hpath} rdValue {analyser}
-    hsetprop ${scobj_hpath}/analyser/spin rdValue ${ns}::rdValue ${scobj_hpath}
-    hsetprop ${scobj_hpath}/analyser/spin write ${ns}::setValue ${scobj_hpath} chkWrite {analyser}
-    hsetprop ${scobj_hpath}/analyser/spin chkWrite ${ns}::chkWrite ${scobj_hpath}
-    hsetprop ${scobj_hpath}/analyser/spin check ${ns}::checkrange ${scobj_hpath}
-    hsetprop ${scobj_hpath}/analyser/spin control true
-    hsetprop ${scobj_hpath}/analyser/spin data true
-    hsetprop ${scobj_hpath}/analyser/spin mutable true
-    hsetprop ${scobj_hpath}/analyser/spin nxsave true
-    hsetprop ${scobj_hpath}/analyser/spin values +,-,0
-    hsetprop ${scobj_hpath}/analyser/spin oldval UNKNOWN
-    hsetprop ${scobj_hpath}/analyser/spin klass "parameter"
-    hsetprop ${scobj_hpath}/analyser/spin sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/analyser/spin type "part"
-    hsetprop ${scobj_hpath}/analyser/spin nxalias "${name}_analyser_spin"
+      hfactory ${scobj_hpath}/analyser/Timestamp plain user text
+      hsetprop ${scobj_hpath}/analyser/Timestamp control true
+      hsetprop ${scobj_hpath}/analyser/Timestamp data true
+      hsetprop ${scobj_hpath}/analyser/Timestamp mutable true
+      hsetprop ${scobj_hpath}/analyser/Timestamp nxsave true
+      hsetprop ${scobj_hpath}/analyser/Timestamp oldval UNKNOWN
+      hsetprop ${scobj_hpath}/analyser/Timestamp klass "parameter"
+      hsetprop ${scobj_hpath}/analyser/Timestamp sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/analyser/Timestamp type "part"
+      hsetprop ${scobj_hpath}/analyser/Timestamp nxalias "${name}_analyser_Timestamp"
 
-    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/analyser/spin 900
-      ${sct_controller} write ${scobj_hpath}/analyser/spin
-    } else {
-      ::scobj::he3_polanal::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for he3_polanal"
+      hfactory ${scobj_hpath}/analyser/spin plain user text
+      hsetprop ${scobj_hpath}/analyser/spin read ${ns}::getValue ${scobj_hpath} rdValue {analyser}
+      hsetprop ${scobj_hpath}/analyser/spin rdValue ${ns}::rdValue ${scobj_hpath}
+      hsetprop ${scobj_hpath}/analyser/spin write ${ns}::setValue ${scobj_hpath} chkWrite {analyser}
+      hsetprop ${scobj_hpath}/analyser/spin chkWrite ${ns}::chkWrite ${scobj_hpath}
+      hsetprop ${scobj_hpath}/analyser/spin check ${ns}::checkrange ${scobj_hpath}
+      hsetprop ${scobj_hpath}/analyser/spin control true
+      hsetprop ${scobj_hpath}/analyser/spin data true
+      hsetprop ${scobj_hpath}/analyser/spin mutable true
+      hsetprop ${scobj_hpath}/analyser/spin nxsave true
+      hsetprop ${scobj_hpath}/analyser/spin values +,-,Refresh
+      hsetprop ${scobj_hpath}/analyser/spin oldval UNKNOWN
+      hsetprop ${scobj_hpath}/analyser/spin klass "parameter"
+      hsetprop ${scobj_hpath}/analyser/spin sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/analyser/spin type "part"
+      hsetprop ${scobj_hpath}/analyser/spin nxalias "${name}_analyser_spin"
+
+      if {[string equal -nocase "${simulation_flag}" "false"]} {
+        ${sct_controller} poll ${scobj_hpath}/analyser/spin 900
+        ${sct_controller} write ${scobj_hpath}/analyser/spin
+        hsetprop ${scobj_hpath}/analyser/spin simulated false
+      } else {
+        ::scobj::he3_polanal::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for he3_polanal"
+        hsetprop ${scobj_hpath}/analyser/spin simulated true
+      }
+      hsetprop ${scobj_hpath}/analyser data "true"
+      hsetprop ${scobj_hpath}/analyser klass "@none"
+      hsetprop ${scobj_hpath}/analyser type "part"
     }
+    if {[string equal -nocase ${has_anal} "true"]} {
 
-    hfactory ${scobj_hpath}/polariser plain spy none
-    hsetprop ${scobj_hpath}/polariser data "true"
-    hsetprop ${scobj_hpath}/polariser klass "@none"
-    hsetprop ${scobj_hpath}/polariser type "part"
+      hfactory ${scobj_hpath}/analyser_start plain spy none
 
-    hfactory ${scobj_hpath}/polariser/Amplitude plain user text
-    hsetprop ${scobj_hpath}/polariser/Amplitude control true
-    hsetprop ${scobj_hpath}/polariser/Amplitude data true
-    hsetprop ${scobj_hpath}/polariser/Amplitude mutable true
-    hsetprop ${scobj_hpath}/polariser/Amplitude nxsave true
-    hsetprop ${scobj_hpath}/polariser/Amplitude oldval UNKNOWN
-    hsetprop ${scobj_hpath}/polariser/Amplitude klass "parameter"
-    hsetprop ${scobj_hpath}/polariser/Amplitude sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/polariser/Amplitude type "part"
-    hsetprop ${scobj_hpath}/polariser/Amplitude nxalias "${name}_polariser_Amplitude"
+      hfactory ${scobj_hpath}/analyser_start/Amplitude plain user text
+      hsetprop ${scobj_hpath}/analyser_start/Amplitude control true
+      hsetprop ${scobj_hpath}/analyser_start/Amplitude data true
+      hsetprop ${scobj_hpath}/analyser_start/Amplitude mutable true
+      hsetprop ${scobj_hpath}/analyser_start/Amplitude nxsave true
+      hsetprop ${scobj_hpath}/analyser_start/Amplitude oldval UNKNOWN
+      hsetprop ${scobj_hpath}/analyser_start/Amplitude klass "parameter"
+      hsetprop ${scobj_hpath}/analyser_start/Amplitude sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/analyser_start/Amplitude type "part"
+      hsetprop ${scobj_hpath}/analyser_start/Amplitude nxalias "${name}_analyser_start_Amplitude"
 
-    hfactory ${scobj_hpath}/polariser/Field plain user text
-    hsetprop ${scobj_hpath}/polariser/Field control true
-    hsetprop ${scobj_hpath}/polariser/Field data true
-    hsetprop ${scobj_hpath}/polariser/Field mutable true
-    hsetprop ${scobj_hpath}/polariser/Field nxsave true
-    hsetprop ${scobj_hpath}/polariser/Field units Oersted
-    hsetprop ${scobj_hpath}/polariser/Field oldval UNKNOWN
-    hsetprop ${scobj_hpath}/polariser/Field klass "parameter"
-    hsetprop ${scobj_hpath}/polariser/Field sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/polariser/Field type "part"
-    hsetprop ${scobj_hpath}/polariser/Field nxalias "${name}_polariser_Field"
+      hfactory ${scobj_hpath}/analyser_start/Field plain user text
+      hsetprop ${scobj_hpath}/analyser_start/Field control true
+      hsetprop ${scobj_hpath}/analyser_start/Field data true
+      hsetprop ${scobj_hpath}/analyser_start/Field mutable true
+      hsetprop ${scobj_hpath}/analyser_start/Field nxsave true
+      hsetprop ${scobj_hpath}/analyser_start/Field units Oersted
+      hsetprop ${scobj_hpath}/analyser_start/Field oldval UNKNOWN
+      hsetprop ${scobj_hpath}/analyser_start/Field klass "parameter"
+      hsetprop ${scobj_hpath}/analyser_start/Field sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/analyser_start/Field type "part"
+      hsetprop ${scobj_hpath}/analyser_start/Field nxalias "${name}_analyser_start_Field"
 
-    hfactory ${scobj_hpath}/polariser/Freq plain user text
-    hsetprop ${scobj_hpath}/polariser/Freq control true
-    hsetprop ${scobj_hpath}/polariser/Freq data true
-    hsetprop ${scobj_hpath}/polariser/Freq mutable true
-    hsetprop ${scobj_hpath}/polariser/Freq nxsave true
-    hsetprop ${scobj_hpath}/polariser/Freq units Hertz
-    hsetprop ${scobj_hpath}/polariser/Freq oldval UNKNOWN
-    hsetprop ${scobj_hpath}/polariser/Freq klass "parameter"
-    hsetprop ${scobj_hpath}/polariser/Freq sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/polariser/Freq type "part"
-    hsetprop ${scobj_hpath}/polariser/Freq nxalias "${name}_polariser_Freq"
+      hfactory ${scobj_hpath}/analyser_start/Freq plain user text
+      hsetprop ${scobj_hpath}/analyser_start/Freq control true
+      hsetprop ${scobj_hpath}/analyser_start/Freq data true
+      hsetprop ${scobj_hpath}/analyser_start/Freq mutable true
+      hsetprop ${scobj_hpath}/analyser_start/Freq nxsave true
+      hsetprop ${scobj_hpath}/analyser_start/Freq units Hertz
+      hsetprop ${scobj_hpath}/analyser_start/Freq oldval UNKNOWN
+      hsetprop ${scobj_hpath}/analyser_start/Freq klass "parameter"
+      hsetprop ${scobj_hpath}/analyser_start/Freq sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/analyser_start/Freq type "part"
+      hsetprop ${scobj_hpath}/analyser_start/Freq nxalias "${name}_analyser_start_Freq"
 
-    hfactory ${scobj_hpath}/polariser/Phase plain user text
-    hsetprop ${scobj_hpath}/polariser/Phase control true
-    hsetprop ${scobj_hpath}/polariser/Phase data true
-    hsetprop ${scobj_hpath}/polariser/Phase mutable true
-    hsetprop ${scobj_hpath}/polariser/Phase nxsave true
-    hsetprop ${scobj_hpath}/polariser/Phase units Degree
-    hsetprop ${scobj_hpath}/polariser/Phase oldval UNKNOWN
-    hsetprop ${scobj_hpath}/polariser/Phase klass "parameter"
-    hsetprop ${scobj_hpath}/polariser/Phase sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/polariser/Phase type "part"
-    hsetprop ${scobj_hpath}/polariser/Phase nxalias "${name}_polariser_Phase"
+      hfactory ${scobj_hpath}/analyser_start/Phase plain user text
+      hsetprop ${scobj_hpath}/analyser_start/Phase control true
+      hsetprop ${scobj_hpath}/analyser_start/Phase data true
+      hsetprop ${scobj_hpath}/analyser_start/Phase mutable true
+      hsetprop ${scobj_hpath}/analyser_start/Phase nxsave true
+      hsetprop ${scobj_hpath}/analyser_start/Phase units Degree
+      hsetprop ${scobj_hpath}/analyser_start/Phase oldval UNKNOWN
+      hsetprop ${scobj_hpath}/analyser_start/Phase klass "parameter"
+      hsetprop ${scobj_hpath}/analyser_start/Phase sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/analyser_start/Phase type "part"
+      hsetprop ${scobj_hpath}/analyser_start/Phase nxalias "${name}_analyser_start_Phase"
 
-    hfactory ${scobj_hpath}/polariser/Time2 plain user text
-    hsetprop ${scobj_hpath}/polariser/Time2 control true
-    hsetprop ${scobj_hpath}/polariser/Time2 data true
-    hsetprop ${scobj_hpath}/polariser/Time2 mutable true
-    hsetprop ${scobj_hpath}/polariser/Time2 nxsave true
-    hsetprop ${scobj_hpath}/polariser/Time2 units Second
-    hsetprop ${scobj_hpath}/polariser/Time2 oldval UNKNOWN
-    hsetprop ${scobj_hpath}/polariser/Time2 klass "parameter"
-    hsetprop ${scobj_hpath}/polariser/Time2 sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/polariser/Time2 type "part"
-    hsetprop ${scobj_hpath}/polariser/Time2 nxalias "${name}_polariser_Time2"
+      hfactory ${scobj_hpath}/analyser_start/Time2 plain user text
+      hsetprop ${scobj_hpath}/analyser_start/Time2 control true
+      hsetprop ${scobj_hpath}/analyser_start/Time2 data true
+      hsetprop ${scobj_hpath}/analyser_start/Time2 mutable true
+      hsetprop ${scobj_hpath}/analyser_start/Time2 nxsave true
+      hsetprop ${scobj_hpath}/analyser_start/Time2 units Second
+      hsetprop ${scobj_hpath}/analyser_start/Time2 oldval UNKNOWN
+      hsetprop ${scobj_hpath}/analyser_start/Time2 klass "parameter"
+      hsetprop ${scobj_hpath}/analyser_start/Time2 sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/analyser_start/Time2 type "part"
+      hsetprop ${scobj_hpath}/analyser_start/Time2 nxalias "${name}_analyser_start_Time2"
 
-    hfactory ${scobj_hpath}/polariser/spin plain user text
-    hsetprop ${scobj_hpath}/polariser/spin read ${ns}::getValue ${scobj_hpath} rdValue {polariser}
-    hsetprop ${scobj_hpath}/polariser/spin rdValue ${ns}::rdValue ${scobj_hpath}
-    hsetprop ${scobj_hpath}/polariser/spin write ${ns}::setValue ${scobj_hpath} chkWrite {polariser}
-    hsetprop ${scobj_hpath}/polariser/spin chkWrite ${ns}::chkWrite ${scobj_hpath}
-    hsetprop ${scobj_hpath}/polariser/spin check ${ns}::checkrange ${scobj_hpath}
-    hsetprop ${scobj_hpath}/polariser/spin control true
-    hsetprop ${scobj_hpath}/polariser/spin data true
-    hsetprop ${scobj_hpath}/polariser/spin mutable true
-    hsetprop ${scobj_hpath}/polariser/spin nxsave true
-    hsetprop ${scobj_hpath}/polariser/spin values +,-,0
-    hsetprop ${scobj_hpath}/polariser/spin oldval UNKNOWN
-    hsetprop ${scobj_hpath}/polariser/spin klass "parameter"
-    hsetprop ${scobj_hpath}/polariser/spin sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/polariser/spin type "part"
-    hsetprop ${scobj_hpath}/polariser/spin nxalias "${name}_polariser_spin"
+      hfactory ${scobj_hpath}/analyser_start/Timestamp plain user text
+      hsetprop ${scobj_hpath}/analyser_start/Timestamp control true
+      hsetprop ${scobj_hpath}/analyser_start/Timestamp data true
+      hsetprop ${scobj_hpath}/analyser_start/Timestamp mutable true
+      hsetprop ${scobj_hpath}/analyser_start/Timestamp nxsave true
+      hsetprop ${scobj_hpath}/analyser_start/Timestamp oldval UNKNOWN
+      hsetprop ${scobj_hpath}/analyser_start/Timestamp klass "parameter"
+      hsetprop ${scobj_hpath}/analyser_start/Timestamp sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/analyser_start/Timestamp type "part"
+      hsetprop ${scobj_hpath}/analyser_start/Timestamp nxalias "${name}_analyser_start_Timestamp"
 
-    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/polariser/spin 900
-      ${sct_controller} write ${scobj_hpath}/polariser/spin
-    } else {
-      ::scobj::he3_polanal::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for he3_polanal"
+      hfactory ${scobj_hpath}/analyser_start/spin plain user text
+      hsetprop ${scobj_hpath}/analyser_start/spin control true
+      hsetprop ${scobj_hpath}/analyser_start/spin data true
+      hsetprop ${scobj_hpath}/analyser_start/spin mutable true
+      hsetprop ${scobj_hpath}/analyser_start/spin nxsave true
+      hsetprop ${scobj_hpath}/analyser_start/spin oldval UNKNOWN
+      hsetprop ${scobj_hpath}/analyser_start/spin klass "parameter"
+      hsetprop ${scobj_hpath}/analyser_start/spin sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/analyser_start/spin type "part"
+      hsetprop ${scobj_hpath}/analyser_start/spin nxalias "${name}_analyser_start_spin"
+      hsetprop ${scobj_hpath}/analyser_start data "true"
+      hsetprop ${scobj_hpath}/analyser_start klass "@none"
+      hsetprop ${scobj_hpath}/analyser_start type "part"
+    }
+    if {[string equal -nocase ${has_pol} "true"]} {
+
+      hfactory ${scobj_hpath}/polariser plain spy none
+
+      hfactory ${scobj_hpath}/polariser/Amplitude plain user text
+      hsetprop ${scobj_hpath}/polariser/Amplitude control true
+      hsetprop ${scobj_hpath}/polariser/Amplitude data true
+      hsetprop ${scobj_hpath}/polariser/Amplitude mutable true
+      hsetprop ${scobj_hpath}/polariser/Amplitude nxsave true
+      hsetprop ${scobj_hpath}/polariser/Amplitude oldval UNKNOWN
+      hsetprop ${scobj_hpath}/polariser/Amplitude klass "parameter"
+      hsetprop ${scobj_hpath}/polariser/Amplitude sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/polariser/Amplitude type "part"
+      hsetprop ${scobj_hpath}/polariser/Amplitude nxalias "${name}_polariser_Amplitude"
+
+      hfactory ${scobj_hpath}/polariser/Field plain user text
+      hsetprop ${scobj_hpath}/polariser/Field control true
+      hsetprop ${scobj_hpath}/polariser/Field data true
+      hsetprop ${scobj_hpath}/polariser/Field mutable true
+      hsetprop ${scobj_hpath}/polariser/Field nxsave true
+      hsetprop ${scobj_hpath}/polariser/Field units Oersted
+      hsetprop ${scobj_hpath}/polariser/Field oldval UNKNOWN
+      hsetprop ${scobj_hpath}/polariser/Field klass "parameter"
+      hsetprop ${scobj_hpath}/polariser/Field sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/polariser/Field type "part"
+      hsetprop ${scobj_hpath}/polariser/Field nxalias "${name}_polariser_Field"
+
+      hfactory ${scobj_hpath}/polariser/Freq plain user text
+      hsetprop ${scobj_hpath}/polariser/Freq control true
+      hsetprop ${scobj_hpath}/polariser/Freq data true
+      hsetprop ${scobj_hpath}/polariser/Freq mutable true
+      hsetprop ${scobj_hpath}/polariser/Freq nxsave true
+      hsetprop ${scobj_hpath}/polariser/Freq units Hertz
+      hsetprop ${scobj_hpath}/polariser/Freq oldval UNKNOWN
+      hsetprop ${scobj_hpath}/polariser/Freq klass "parameter"
+      hsetprop ${scobj_hpath}/polariser/Freq sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/polariser/Freq type "part"
+      hsetprop ${scobj_hpath}/polariser/Freq nxalias "${name}_polariser_Freq"
+
+      hfactory ${scobj_hpath}/polariser/Phase plain user text
+      hsetprop ${scobj_hpath}/polariser/Phase control true
+      hsetprop ${scobj_hpath}/polariser/Phase data true
+      hsetprop ${scobj_hpath}/polariser/Phase mutable true
+      hsetprop ${scobj_hpath}/polariser/Phase nxsave true
+      hsetprop ${scobj_hpath}/polariser/Phase units Degree
+      hsetprop ${scobj_hpath}/polariser/Phase oldval UNKNOWN
+      hsetprop ${scobj_hpath}/polariser/Phase klass "parameter"
+      hsetprop ${scobj_hpath}/polariser/Phase sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/polariser/Phase type "part"
+      hsetprop ${scobj_hpath}/polariser/Phase nxalias "${name}_polariser_Phase"
+
+      hfactory ${scobj_hpath}/polariser/Time2 plain user text
+      hsetprop ${scobj_hpath}/polariser/Time2 control true
+      hsetprop ${scobj_hpath}/polariser/Time2 data true
+      hsetprop ${scobj_hpath}/polariser/Time2 mutable true
+      hsetprop ${scobj_hpath}/polariser/Time2 nxsave true
+      hsetprop ${scobj_hpath}/polariser/Time2 units Second
+      hsetprop ${scobj_hpath}/polariser/Time2 oldval UNKNOWN
+      hsetprop ${scobj_hpath}/polariser/Time2 klass "parameter"
+      hsetprop ${scobj_hpath}/polariser/Time2 sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/polariser/Time2 type "part"
+      hsetprop ${scobj_hpath}/polariser/Time2 nxalias "${name}_polariser_Time2"
+
+      hfactory ${scobj_hpath}/polariser/Timestamp plain user text
+      hsetprop ${scobj_hpath}/polariser/Timestamp control true
+      hsetprop ${scobj_hpath}/polariser/Timestamp data true
+      hsetprop ${scobj_hpath}/polariser/Timestamp mutable true
+      hsetprop ${scobj_hpath}/polariser/Timestamp nxsave true
+      hsetprop ${scobj_hpath}/polariser/Timestamp oldval UNKNOWN
+      hsetprop ${scobj_hpath}/polariser/Timestamp klass "parameter"
+      hsetprop ${scobj_hpath}/polariser/Timestamp sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/polariser/Timestamp type "part"
+      hsetprop ${scobj_hpath}/polariser/Timestamp nxalias "${name}_polariser_Timestamp"
+
+      hfactory ${scobj_hpath}/polariser/spin plain user text
+      hsetprop ${scobj_hpath}/polariser/spin read ${ns}::getValue ${scobj_hpath} rdValue {polariser}
+      hsetprop ${scobj_hpath}/polariser/spin rdValue ${ns}::rdValue ${scobj_hpath}
+      hsetprop ${scobj_hpath}/polariser/spin write ${ns}::setValue ${scobj_hpath} chkWrite {polariser}
+      hsetprop ${scobj_hpath}/polariser/spin chkWrite ${ns}::chkWrite ${scobj_hpath}
+      hsetprop ${scobj_hpath}/polariser/spin check ${ns}::checkrange ${scobj_hpath}
+      hsetprop ${scobj_hpath}/polariser/spin control true
+      hsetprop ${scobj_hpath}/polariser/spin data true
+      hsetprop ${scobj_hpath}/polariser/spin mutable true
+      hsetprop ${scobj_hpath}/polariser/spin nxsave true
+      hsetprop ${scobj_hpath}/polariser/spin values +,-,Refresh
+      hsetprop ${scobj_hpath}/polariser/spin oldval UNKNOWN
+      hsetprop ${scobj_hpath}/polariser/spin klass "parameter"
+      hsetprop ${scobj_hpath}/polariser/spin sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/polariser/spin type "part"
+      hsetprop ${scobj_hpath}/polariser/spin nxalias "${name}_polariser_spin"
+
+      if {[string equal -nocase "${simulation_flag}" "false"]} {
+        ${sct_controller} poll ${scobj_hpath}/polariser/spin 900
+        ${sct_controller} write ${scobj_hpath}/polariser/spin
+        hsetprop ${scobj_hpath}/polariser/spin simulated false
+      } else {
+        ::scobj::he3_polanal::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for he3_polanal"
+        hsetprop ${scobj_hpath}/polariser/spin simulated true
+      }
+      hsetprop ${scobj_hpath}/polariser data "true"
+      hsetprop ${scobj_hpath}/polariser klass "@none"
+      hsetprop ${scobj_hpath}/polariser type "part"
+    }
+    if {[string equal -nocase ${has_pol} "true"]} {
+
+      hfactory ${scobj_hpath}/polariser_start plain spy none
+
+      hfactory ${scobj_hpath}/polariser_start/Amplitude plain user text
+      hsetprop ${scobj_hpath}/polariser_start/Amplitude control true
+      hsetprop ${scobj_hpath}/polariser_start/Amplitude data true
+      hsetprop ${scobj_hpath}/polariser_start/Amplitude mutable true
+      hsetprop ${scobj_hpath}/polariser_start/Amplitude nxsave true
+      hsetprop ${scobj_hpath}/polariser_start/Amplitude oldval UNKNOWN
+      hsetprop ${scobj_hpath}/polariser_start/Amplitude klass "parameter"
+      hsetprop ${scobj_hpath}/polariser_start/Amplitude sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/polariser_start/Amplitude type "part"
+      hsetprop ${scobj_hpath}/polariser_start/Amplitude nxalias "${name}_polariser_start_Amplitude"
+
+      hfactory ${scobj_hpath}/polariser_start/Field plain user text
+      hsetprop ${scobj_hpath}/polariser_start/Field control true
+      hsetprop ${scobj_hpath}/polariser_start/Field data true
+      hsetprop ${scobj_hpath}/polariser_start/Field mutable true
+      hsetprop ${scobj_hpath}/polariser_start/Field nxsave true
+      hsetprop ${scobj_hpath}/polariser_start/Field units Oersted
+      hsetprop ${scobj_hpath}/polariser_start/Field oldval UNKNOWN
+      hsetprop ${scobj_hpath}/polariser_start/Field klass "parameter"
+      hsetprop ${scobj_hpath}/polariser_start/Field sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/polariser_start/Field type "part"
+      hsetprop ${scobj_hpath}/polariser_start/Field nxalias "${name}_polariser_start_Field"
+
+      hfactory ${scobj_hpath}/polariser_start/Freq plain user text
+      hsetprop ${scobj_hpath}/polariser_start/Freq control true
+      hsetprop ${scobj_hpath}/polariser_start/Freq data true
+      hsetprop ${scobj_hpath}/polariser_start/Freq mutable true
+      hsetprop ${scobj_hpath}/polariser_start/Freq nxsave true
+      hsetprop ${scobj_hpath}/polariser_start/Freq units Hertz
+      hsetprop ${scobj_hpath}/polariser_start/Freq oldval UNKNOWN
+      hsetprop ${scobj_hpath}/polariser_start/Freq klass "parameter"
+      hsetprop ${scobj_hpath}/polariser_start/Freq sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/polariser_start/Freq type "part"
+      hsetprop ${scobj_hpath}/polariser_start/Freq nxalias "${name}_polariser_start_Freq"
+
+      hfactory ${scobj_hpath}/polariser_start/Phase plain user text
+      hsetprop ${scobj_hpath}/polariser_start/Phase control true
+      hsetprop ${scobj_hpath}/polariser_start/Phase data true
+      hsetprop ${scobj_hpath}/polariser_start/Phase mutable true
+      hsetprop ${scobj_hpath}/polariser_start/Phase nxsave true
+      hsetprop ${scobj_hpath}/polariser_start/Phase units Degree
+      hsetprop ${scobj_hpath}/polariser_start/Phase oldval UNKNOWN
+      hsetprop ${scobj_hpath}/polariser_start/Phase klass "parameter"
+      hsetprop ${scobj_hpath}/polariser_start/Phase sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/polariser_start/Phase type "part"
+      hsetprop ${scobj_hpath}/polariser_start/Phase nxalias "${name}_polariser_start_Phase"
+
+      hfactory ${scobj_hpath}/polariser_start/Time2 plain user text
+      hsetprop ${scobj_hpath}/polariser_start/Time2 control true
+      hsetprop ${scobj_hpath}/polariser_start/Time2 data true
+      hsetprop ${scobj_hpath}/polariser_start/Time2 mutable true
+      hsetprop ${scobj_hpath}/polariser_start/Time2 nxsave true
+      hsetprop ${scobj_hpath}/polariser_start/Time2 units Second
+      hsetprop ${scobj_hpath}/polariser_start/Time2 oldval UNKNOWN
+      hsetprop ${scobj_hpath}/polariser_start/Time2 klass "parameter"
+      hsetprop ${scobj_hpath}/polariser_start/Time2 sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/polariser_start/Time2 type "part"
+      hsetprop ${scobj_hpath}/polariser_start/Time2 nxalias "${name}_polariser_start_Time2"
+
+      hfactory ${scobj_hpath}/polariser_start/Timestamp plain user text
+      hsetprop ${scobj_hpath}/polariser_start/Timestamp control true
+      hsetprop ${scobj_hpath}/polariser_start/Timestamp data true
+      hsetprop ${scobj_hpath}/polariser_start/Timestamp mutable true
+      hsetprop ${scobj_hpath}/polariser_start/Timestamp nxsave true
+      hsetprop ${scobj_hpath}/polariser_start/Timestamp oldval UNKNOWN
+      hsetprop ${scobj_hpath}/polariser_start/Timestamp klass "parameter"
+      hsetprop ${scobj_hpath}/polariser_start/Timestamp sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/polariser_start/Timestamp type "part"
+      hsetprop ${scobj_hpath}/polariser_start/Timestamp nxalias "${name}_polariser_start_Timestamp"
+
+      hfactory ${scobj_hpath}/polariser_start/spin plain user text
+      hsetprop ${scobj_hpath}/polariser_start/spin control true
+      hsetprop ${scobj_hpath}/polariser_start/spin data true
+      hsetprop ${scobj_hpath}/polariser_start/spin mutable true
+      hsetprop ${scobj_hpath}/polariser_start/spin nxsave true
+      hsetprop ${scobj_hpath}/polariser_start/spin oldval UNKNOWN
+      hsetprop ${scobj_hpath}/polariser_start/spin klass "parameter"
+      hsetprop ${scobj_hpath}/polariser_start/spin sdsinfo "::nexus::scobj::sdsinfo"
+      hsetprop ${scobj_hpath}/polariser_start/spin type "part"
+      hsetprop ${scobj_hpath}/polariser_start/spin nxalias "${name}_polariser_start_spin"
+      hsetprop ${scobj_hpath}/polariser_start data "true"
+      hsetprop ${scobj_hpath}/polariser_start klass "@none"
+      hsetprop ${scobj_hpath}/polariser_start type "part"
     }
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
@@ -406,7 +621,7 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
 
 proc ::scobj::he3_polanal::add_driver {name device_class simulation_flag ip_address tcp_port} {
   set catch_status [ catch {
-    ::scobj::he3_polanal::sics_log 9 "::scobj::he3_polanal::add_driver ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}"
+    ::scobj::he3_polanal::sics_log 9 "::scobj::he3_polanal::add_driver ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${has_pol} ${has_anal}"
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       if {[string equal -nocase "aqadapter" "${ip_address}"]} {
         ::scobj::he3_polanal::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}"
@@ -416,10 +631,12 @@ proc ::scobj::he3_polanal::add_driver {name device_class simulation_flag ip_addr
         makesctcontroller sct_${name} std ${ip_address}:${tcp_port}
       }
     } else {
-      ::scobj::he3_polanal::sics_log 9 "simulation_flag={simulation_flag} => No sctcontroller for he3_polanal"
+      ::scobj::he3_polanal::sics_log 9 "simulation_flag=${simulation_flag} => Null sctcontroller for he3_polanal"
+      ::scobj::he3_polanal::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL"
+      makesctcontroller sct_${name} aqadapter NULL
     }
-    ::scobj::he3_polanal::sics_log 1 "::scobj::he3_polanal::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}"
-    ::scobj::he3_polanal::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
+    ::scobj::he3_polanal::sics_log 1 "::scobj::he3_polanal::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${has_pol} ${has_anal}"
+    ::scobj::he3_polanal::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${has_pol} ${has_anal}
   } catch_message ]
   handle_exception ${catch_status} ${catch_message}
 }
@@ -434,7 +651,7 @@ namespace eval ::scobj::he3_polanal {
 
 proc add_he3_polanal {name ip_address tcp_port} {
   set simulation_flag "[string tolower [SplitReply [rfgen_simulation]]]"
-  ::scobj::he3_polanal::add_driver ${name} "instrument" "${simulation_flag}" ${ip_address} ${tcp_port}
+  ::scobj::he3_polanal::add_driver ${name} "instrument" ${simulation_flag} ${ip_address} ${tcp_port}
 }
 
 clientput "file evaluation of sct_he3_polanal.tcl"
@@ -473,20 +690,31 @@ proc ::scobj::he3_polanal::read_config {} {
           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} std ${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 "terminator"] } {
+              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"]"
               }
             }
@@ -497,12 +725,28 @@ proc ::scobj::he3_polanal::read_config {} {
             if { [dict exists $v "timeout"] } {
               ${asyncqueue} timeout "[dict get $v "timeout"]"
             }
+            makesctcontroller sct_${name} aqadapter ${asyncqueue}
           }
-          if { [string equal -nocase ${asyncqueue} "sct"] } {
-            ${ns}::add_driver ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
-          } else {
-            ${ns}::add_driver ${name} ${device_class} ${simulation_flag} "aqadapter" ${asyncqueue}
+          set arg_list [list]
+          set missing_list [list]
+          array unset default_map
+          array set default_map [list has_pol true has_anal true]
+          foreach arg {has_pol has_anal} {
+            if {[dict exists $u $arg]} {
+              lappend arg_list "[dict get $u $arg]"
+            } elseif {[dict exists $v $arg]} {
+              lappend arg_list "[dict get $v $arg]"
+            } elseif {[info exists default_map($arg)]} {
+              lappend arg_list $default_map($arg)
+            } else {
+              ${ns}::sics_log 9 "Missing configuration value $arg"
+              lappend missing_list $arg
+            }
           }
+          if { [llength $missing_list] > 0 } {
+              error "$name is missing configuration values $missing_list"
+          }
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }