diff --git a/site_ansto/instrument/config/hipadaba/common_hipadaba_configuration.tcl b/site_ansto/instrument/config/hipadaba/common_hipadaba_configuration.tcl
index b0160aa2..77462753 100644
--- a/site_ansto/instrument/config/hipadaba/common_hipadaba_configuration.tcl
+++ b/site_ansto/instrument/config/hipadaba/common_hipadaba_configuration.tcl
@@ -1,7 +1,5 @@
 # Defines hashes which map SICS device object names to hipadaba paths
 InstallHdb
-hmake /graphics spy none
-hsetprop /graphics type graphset
 hmake /commands spy none
 hsetprop /commands type commandset
 
@@ -18,13 +16,15 @@ foreach hp $hpaths {
 }
 
 #--- admin
-hattach /$instrument title title
-hattach /$instrument/experiment sample description
-hmake /$instrument/user spy none
-hsetprop /$instrument/user type part
-hattach /$instrument/user user name
-hattach /$instrument/user email email
-hattach /$instrument/user phone phone
+hmake /experiment user none
+hattach /experiment title title
+hattach /experiment sample description
+hmake /experiment/user spy none
+hsetprop /experiment/user type part
+hattach /experiment/user user name
+hattach /experiment/user email email
+hattach /experiment/user phone phone
+hattach /experiment dataFileName datafile 
 
 #--- Motors
 foreach {obj name part} $motor_hpath {
@@ -61,3 +61,7 @@ hsetprop /commands/scan/mode values monitor,timer
 hmake /commands/scan/preset user float
 hsetprop /commands/scan/preset argtype float
  
+#--- Graphics
+hmake /Graphics spy none
+::scanCommand::hpath_setup /Graphics
+::scanCommand::init