diff --git a/site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
index 69ec5d4f..c7d4a68b 100644
--- a/site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
@@ -1,6 +1,12 @@
 set sim_mode [SplitReply [hmm_simulation]]
 if {$sim_mode == "true"} {
-  MakeHM hmm SIM;
+  MakeHM hmm SIM
+  MakeHM hmm_xy SIM
+  MakeHM hmm_xt SIM
+  MakeHM hmm_yt SIM
+  MakeHM hmm_x SIM
+  MakeHM hmm_y SIM
+  MakeHM hmm_t SIM
   hmm configure daq Stopped
   hmm configure statuscheck false
   namespace eval histogram_memory {
@@ -12,6 +18,13 @@ if {$sim_mode == "true"} {
   }
 } else {
   MakeHM hmm anstohttp;
+  MakeHM hmm_xy anstohttp;
+  MakeHM hmm_xt anstohttp;
+  MakeHM hmm_yt anstohttp;
+  MakeHM hmm_x anstohttp;
+  MakeHM hmm_y anstohttp;
+  MakeHM hmm_t anstohttp;
+
   MakeHMControl_ANSTO hmc bm hmm;
 }
 
@@ -109,10 +122,10 @@ proc ::histogram_memory::initialize {} {
   } else {
     set y_bin1 [expr {$y_bin0-$y_binwidth}]
   }
-  OAT_TABLE -init X_min $x_bin0 X_max $x_binmax Y_min $y_bin0 Y_max $y_binmax
+  OAT_TABLE -init X_MIN $x_bin0 X_MAX $x_binmax Y_MIN $y_bin0 Y_MAX $y_binmax
   # We default to one big bin for time
-  set t_bin0 [OAT_TABLE -get T_min]
-  set t_bin1 [OAT_TABLE -get T_max]
+  set t_bin0 [OAT_TABLE -get T_MIN]
+  set t_bin1 [OAT_TABLE -get T_MAX]
   OAT_TABLE X "$x_bin0 $x_bin1" Y "$y_bin0 $y_bin1" T "$t_bin0 $t_bin1"
   ::histogram_memory::configure_server Filler_defaults
 
diff --git a/site_ansto/instrument/reflectometer/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/reflectometer/config/hmm/hmm_configuration.tcl
index 2e539674..b6e39128 100644
--- a/site_ansto/instrument/reflectometer/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/reflectometer/config/hmm/hmm_configuration.tcl
@@ -1,6 +1,12 @@
 set sim_mode [SplitReply [hmm_simulation]]
 if {$sim_mode == "true"} {
-  MakeHM hmm SIM;
+  MakeHM hmm SIM
+  MakeHM hmm_xy SIM
+  MakeHM hmm_xt SIM
+  MakeHM hmm_yt SIM
+  MakeHM hmm_x SIM
+  MakeHM hmm_y SIM
+  MakeHM hmm_t SIM
   hmm configure daq Stopped
   hmm configure statuscheck false
   namespace eval histogram_memory {
@@ -12,6 +18,13 @@ if {$sim_mode == "true"} {
   }
 } else {
   MakeHM hmm anstohttp;
+  MakeHM hmm_xy anstohttp;
+  MakeHM hmm_xt anstohttp;
+  MakeHM hmm_yt anstohttp;
+  MakeHM hmm_x anstohttp;
+  MakeHM hmm_y anstohttp;
+  MakeHM hmm_t anstohttp;
+
   MakeHMControl_ANSTO hmc bm hmm;
 }
 
@@ -104,10 +117,10 @@ proc ::histogram_memory::initialize {} {
   } else {
     set y_bin1 [expr {$y_bin0-$y_binwidth}]
   }
-  OAT_TABLE -init X_min $x_bin0 X_max $x_binmax Y_min $y_bin0 Y_max $y_binmax
+  OAT_TABLE -init X_MIN $x_bin0 X_MAX $x_binmax Y_MIN $y_bin0 Y_MAX $y_binmax
   # We default to one big bin for time
-  set t_bin0 [OAT_TABLE -get T_min]
-  set t_bin1 [OAT_TABLE -get T_max]
+  set t_bin0 [OAT_TABLE -get T_MIN]
+  set t_bin1 [OAT_TABLE -get T_MAX]
   OAT_TABLE X "$x_bin0 $x_bin1" Y "$y_bin0 $y_bin1" T "$t_bin0 $t_bin1"
   ::histogram_memory::configure_server Filler_defaults
 
diff --git a/site_ansto/instrument/rsd/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/rsd/config/hmm/hmm_configuration.tcl
index 9dd8d0c5..c3fcb8ec 100644
--- a/site_ansto/instrument/rsd/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/rsd/config/hmm/hmm_configuration.tcl
@@ -1,6 +1,12 @@
 set sim_mode [SplitReply [hmm_simulation]]
 if {$sim_mode == "true"} {
-  MakeHM hmm SIM;
+  MakeHM hmm SIM
+  MakeHM hmm_xy SIM
+  MakeHM hmm_xt SIM
+  MakeHM hmm_yt SIM
+  MakeHM hmm_x SIM
+  MakeHM hmm_y SIM
+  MakeHM hmm_t SIM
   hmm configure daq Stopped
   hmm configure statuscheck false
   namespace eval histogram_memory {
@@ -12,6 +18,13 @@ if {$sim_mode == "true"} {
   }
 } else {
   MakeHM hmm anstohttp;
+  MakeHM hmm_xy anstohttp;
+  MakeHM hmm_xt anstohttp;
+  MakeHM hmm_yt anstohttp;
+  MakeHM hmm_x anstohttp;
+  MakeHM hmm_y anstohttp;
+  MakeHM hmm_t anstohttp;
+
   MakeHMControl_ANSTO hmc bm hmm;
 }
 
@@ -103,10 +116,10 @@ proc ::histogram_memory::initialize {} {
   } else {
     set y_bin1 [expr {$y_bin0-$y_binwidth}]
   }
-  OAT_TABLE -init X_min $x_bin0 X_max $x_binmax Y_min $y_bin0 Y_max $y_binmax
+  OAT_TABLE -init X_MIN $x_bin0 X_MAX $x_binmax Y_MIN $y_bin0 Y_MAX $y_binmax
   # We default to one big bin for time
-  set t_bin0 [OAT_TABLE -get T_min]
-  set t_bin1 [OAT_TABLE -get T_max]
+  set t_bin0 [OAT_TABLE -get T_MIN]
+  set t_bin1 [OAT_TABLE -get T_MAX]
   OAT_TABLE X "$x_bin0 $x_bin1" Y "$y_bin0 $y_bin1" T "$t_bin0 $t_bin1"
   ::histogram_memory::configure_server Filler_defaults
 
diff --git a/site_ansto/instrument/sans/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/sans/config/hmm/hmm_configuration.tcl
index 6cf2e7e1..07f5b6f6 100644
--- a/site_ansto/instrument/sans/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/sans/config/hmm/hmm_configuration.tcl
@@ -1,6 +1,12 @@
 set sim_mode [SplitReply [hmm_simulation]]
 if {$sim_mode == "true"} {
-  MakeHM hmm SIM;
+  MakeHM hmm SIM
+  MakeHM hmm_xy SIM
+  MakeHM hmm_xt SIM
+  MakeHM hmm_yt SIM
+  MakeHM hmm_x SIM
+  MakeHM hmm_y SIM
+  MakeHM hmm_t SIM
   hmm configure daq Stopped
   hmm configure statuscheck false
   namespace eval histogram_memory {
@@ -12,6 +18,13 @@ if {$sim_mode == "true"} {
   }
 } else {
   MakeHM hmm anstohttp;
+  MakeHM hmm_xy anstohttp;
+  MakeHM hmm_xt anstohttp;
+  MakeHM hmm_yt anstohttp;
+  MakeHM hmm_x anstohttp;
+  MakeHM hmm_y anstohttp;
+  MakeHM hmm_t anstohttp;
+
   MakeHMControl_ANSTO hmc bm hmm;
 }
 
@@ -103,10 +116,10 @@ proc ::histogram_memory::initialize {} {
   } else {
     set y_bin1 [expr {$y_bin0-$y_binwidth}]
   }
-  OAT_TABLE -init X_min $x_bin0 X_max $x_binmax Y_min $y_bin0 Y_max $y_binmax
+  OAT_TABLE -init X_MIN $x_bin0 X_MAX $x_binmax Y_MIN $y_bin0 Y_MAX $y_binmax
   # We default to one big bin for time
-  set t_bin0 [OAT_TABLE -get T_min]
-  set t_bin1 [OAT_TABLE -get T_max]
+  set t_bin0 [OAT_TABLE -get T_MIN]
+  set t_bin1 [OAT_TABLE -get T_MAX]
   OAT_TABLE X "$x_bin0 $x_bin1" Y "$y_bin0 $y_bin1" T "$t_bin0 $t_bin1"
   ::histogram_memory::configure_server Filler_defaults