diff --git a/nxstools/xmltemplates/eiger1m16vds_nbimages_cb.ds.xml b/nxstools/xmltemplates/eiger1m16vds_nbimages_cb.ds.xml
index 813f6af0..a76223b5 100644
--- a/nxstools/xmltemplates/eiger1m16vds_nbimages_cb.ds.xml
+++ b/nxstools/xmltemplates/eiger1m16vds_nbimages_cb.ds.xml
@@ -2,11 +2,8 @@
 <definition>
   <datasource type="PYEVAL" name="$(name)_nbimages_cb">
     <result name="result">
-try:
-    import tango
-except Exception:
-    import PyTango as tango
-ds.result = tango.DeviceProxy("$(hostname)/$(device)").NbImages
+ds.result = ds.$(name)_nbimages
     </result>
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger1m16vds_stepindex.ds.xml b/nxstools/xmltemplates/eiger1m16vds_stepindex.ds.xml
index c5c44a31..eec2a9c4 100644
--- a/nxstools/xmltemplates/eiger1m16vds_stepindex.ds.xml
+++ b/nxstools/xmltemplates/eiger1m16vds_stepindex.ds.xml
@@ -3,9 +3,9 @@
   <datasource type="PYEVAL" name="$(name)_stepindex">
     <result name="result">
 from nxstools.pyeval import common
-ds.result = common.blockitem_addint(commonblock, "$(name)_stepindex", ds.$(name)_nbimages_cb)
+ds.result = common.blockitem_addint(commonblock, "$(name)_stepindex", ds.$(name)_nbimages)
 ds.result = len(commonblock["$(name)_stepindex"])
     </result>
-    $datasources.$(name)_nbimages_cb
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger1m16vds_triggermode_cb.ds.xml b/nxstools/xmltemplates/eiger1m16vds_triggermode_cb.ds.xml
index 57809f9f..6e6e3230 100644
--- a/nxstools/xmltemplates/eiger1m16vds_triggermode_cb.ds.xml
+++ b/nxstools/xmltemplates/eiger1m16vds_triggermode_cb.ds.xml
@@ -3,9 +3,9 @@
   <datasource type="PYEVAL" name="$(name)_triggermode_cb">
     <result name="result">
 from nxstools.pyeval import eigerdectris
-ds.result = eigerdectris.triggermode_cb(commonblock, "$(name)", ds.$(name)_triggermode, ds.$(name)_nbimages_cb, "$(hostname)", "$(device)", "$var.filename", "$(name)_stepindex", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", "EigerDectris", "EigerFilewriter", True, [1065 , 1030], "uint16", "$var.acq_modes")
+ds.result = eigerdectris.triggermode_cb(commonblock, "$(name)", ds.$(name)_triggermode, ds.$(name)_nbimages, "$(hostname)", "$(device)", "$var.filename", "$(name)_stepindex", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", "EigerDectris", "EigerFilewriter", True, [1065 , 1030], "uint16", "$var.acq_modes")
     </result>
     $datasources.$(name)_triggermode
-    $datasources.$(name)_nbimages_cb
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger1m32vds_nbimages_cb.ds.xml b/nxstools/xmltemplates/eiger1m32vds_nbimages_cb.ds.xml
index 813f6af0..a76223b5 100644
--- a/nxstools/xmltemplates/eiger1m32vds_nbimages_cb.ds.xml
+++ b/nxstools/xmltemplates/eiger1m32vds_nbimages_cb.ds.xml
@@ -2,11 +2,8 @@
 <definition>
   <datasource type="PYEVAL" name="$(name)_nbimages_cb">
     <result name="result">
-try:
-    import tango
-except Exception:
-    import PyTango as tango
-ds.result = tango.DeviceProxy("$(hostname)/$(device)").NbImages
+ds.result = ds.$(name)_nbimages
     </result>
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger1m32vds_stepindex.ds.xml b/nxstools/xmltemplates/eiger1m32vds_stepindex.ds.xml
index c5c44a31..eec2a9c4 100644
--- a/nxstools/xmltemplates/eiger1m32vds_stepindex.ds.xml
+++ b/nxstools/xmltemplates/eiger1m32vds_stepindex.ds.xml
@@ -3,9 +3,9 @@
   <datasource type="PYEVAL" name="$(name)_stepindex">
     <result name="result">
 from nxstools.pyeval import common
-ds.result = common.blockitem_addint(commonblock, "$(name)_stepindex", ds.$(name)_nbimages_cb)
+ds.result = common.blockitem_addint(commonblock, "$(name)_stepindex", ds.$(name)_nbimages)
 ds.result = len(commonblock["$(name)_stepindex"])
     </result>
-    $datasources.$(name)_nbimages_cb
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger1m32vds_triggermode_cb.ds.xml b/nxstools/xmltemplates/eiger1m32vds_triggermode_cb.ds.xml
index ed39a046..fdf9f62f 100644
--- a/nxstools/xmltemplates/eiger1m32vds_triggermode_cb.ds.xml
+++ b/nxstools/xmltemplates/eiger1m32vds_triggermode_cb.ds.xml
@@ -3,9 +3,9 @@
   <datasource type="PYEVAL" name="$(name)_triggermode_cb">
     <result name="result">
 from nxstools.pyeval import eigerdectris
-ds.result = eigerdectris.triggermode_cb(commonblock, "$(name)", ds.$(name)_triggermode, ds.$(name)_nbimages_cb, "$(hostname)", "$(device)", "$var.filename", "$(name)_stepindex", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", "EigerDectris", "EigerFilewriter", True, [1065 , 1030], "uint32", "$var.acq_modes")
+ds.result = eigerdectris.triggermode_cb(commonblock, "$(name)", ds.$(name)_triggermode, ds.$(name)_nbimages, "$(hostname)", "$(device)", "$var.filename", "$(name)_stepindex", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", "EigerDectris", "EigerFilewriter", True, [1065 , 1030], "uint32", "$var.acq_modes")
     </result>
     $datasources.$(name)_triggermode
-    $datasources.$(name)_nbimages_cb
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger4m16vds_nbimages_cb.ds.xml b/nxstools/xmltemplates/eiger4m16vds_nbimages_cb.ds.xml
index 813f6af0..a76223b5 100644
--- a/nxstools/xmltemplates/eiger4m16vds_nbimages_cb.ds.xml
+++ b/nxstools/xmltemplates/eiger4m16vds_nbimages_cb.ds.xml
@@ -2,11 +2,8 @@
 <definition>
   <datasource type="PYEVAL" name="$(name)_nbimages_cb">
     <result name="result">
-try:
-    import tango
-except Exception:
-    import PyTango as tango
-ds.result = tango.DeviceProxy("$(hostname)/$(device)").NbImages
+ds.result = ds.$(name)_nbimages
     </result>
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger4m16vds_stepindex.ds.xml b/nxstools/xmltemplates/eiger4m16vds_stepindex.ds.xml
index c5c44a31..eec2a9c4 100644
--- a/nxstools/xmltemplates/eiger4m16vds_stepindex.ds.xml
+++ b/nxstools/xmltemplates/eiger4m16vds_stepindex.ds.xml
@@ -3,9 +3,9 @@
   <datasource type="PYEVAL" name="$(name)_stepindex">
     <result name="result">
 from nxstools.pyeval import common
-ds.result = common.blockitem_addint(commonblock, "$(name)_stepindex", ds.$(name)_nbimages_cb)
+ds.result = common.blockitem_addint(commonblock, "$(name)_stepindex", ds.$(name)_nbimages)
 ds.result = len(commonblock["$(name)_stepindex"])
     </result>
-    $datasources.$(name)_nbimages_cb
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger4m16vds_triggermode_cb.ds.xml b/nxstools/xmltemplates/eiger4m16vds_triggermode_cb.ds.xml
index 43122fb0..b58a5aa9 100644
--- a/nxstools/xmltemplates/eiger4m16vds_triggermode_cb.ds.xml
+++ b/nxstools/xmltemplates/eiger4m16vds_triggermode_cb.ds.xml
@@ -3,9 +3,9 @@
   <datasource type="PYEVAL" name="$(name)_triggermode_cb">
     <result name="result">
 from nxstools.pyeval import eigerdectris
-ds.result = eigerdectris.triggermode_cb(commonblock, "$(name)", ds.$(name)_triggermode, ds.$(name)_nbimages_cb, "$(hostname)", "$(device)", "$var.filename", "$(name)_stepindex", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", "EigerDectris", "EigerFilewriter", True, [2167 , 2070], "uint16", "$var.acq_modes")
+ds.result = eigerdectris.triggermode_cb(commonblock, "$(name)", ds.$(name)_triggermode, ds.$(name)_nbimages, "$(hostname)", "$(device)", "$var.filename", "$(name)_stepindex", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", "EigerDectris", "EigerFilewriter", True, [2167 , 2070], "uint16", "$var.acq_modes")
     </result>
     $datasources.$(name)_triggermode
-    $datasources.$(name)_nbimages_cb
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger4m32vds_nbimages_cb.ds.xml b/nxstools/xmltemplates/eiger4m32vds_nbimages_cb.ds.xml
index 813f6af0..a76223b5 100644
--- a/nxstools/xmltemplates/eiger4m32vds_nbimages_cb.ds.xml
+++ b/nxstools/xmltemplates/eiger4m32vds_nbimages_cb.ds.xml
@@ -2,11 +2,8 @@
 <definition>
   <datasource type="PYEVAL" name="$(name)_nbimages_cb">
     <result name="result">
-try:
-    import tango
-except Exception:
-    import PyTango as tango
-ds.result = tango.DeviceProxy("$(hostname)/$(device)").NbImages
+ds.result = ds.$(name)_nbimages
     </result>
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger4m32vds_stepindex.ds.xml b/nxstools/xmltemplates/eiger4m32vds_stepindex.ds.xml
index c5c44a31..eec2a9c4 100644
--- a/nxstools/xmltemplates/eiger4m32vds_stepindex.ds.xml
+++ b/nxstools/xmltemplates/eiger4m32vds_stepindex.ds.xml
@@ -3,9 +3,9 @@
   <datasource type="PYEVAL" name="$(name)_stepindex">
     <result name="result">
 from nxstools.pyeval import common
-ds.result = common.blockitem_addint(commonblock, "$(name)_stepindex", ds.$(name)_nbimages_cb)
+ds.result = common.blockitem_addint(commonblock, "$(name)_stepindex", ds.$(name)_nbimages)
 ds.result = len(commonblock["$(name)_stepindex"])
     </result>
-    $datasources.$(name)_nbimages_cb
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger4m32vds_triggermode_cb.ds.xml b/nxstools/xmltemplates/eiger4m32vds_triggermode_cb.ds.xml
index 879518d1..4deb16da 100644
--- a/nxstools/xmltemplates/eiger4m32vds_triggermode_cb.ds.xml
+++ b/nxstools/xmltemplates/eiger4m32vds_triggermode_cb.ds.xml
@@ -3,9 +3,9 @@
   <datasource type="PYEVAL" name="$(name)_triggermode_cb">
     <result name="result">
 from nxstools.pyeval import eigerdectris
-ds.result = eigerdectris.triggermode_cb(commonblock, "$(name)", ds.$(name)_triggermode, ds.$(name)_nbimages_cb, "$(hostname)", "$(device)", "$var.filename", "$(name)_stepindex", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", "EigerDectris", "EigerFilewriter", True, [2167 , 2070], "uint32", "$var.acq_modes")
+ds.result = eigerdectris.triggermode_cb(commonblock, "$(name)", ds.$(name)_triggermode, ds.$(name)_nbimages, "$(hostname)", "$(device)", "$var.filename", "$(name)_stepindex", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", "EigerDectris", "EigerFilewriter", True, [2167 , 2070], "uint32", "$var.acq_modes")
     </result>
     $datasources.$(name)_triggermode
-    $datasources.$(name)_nbimages_cb
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger9m16vds_nbimages_cb.ds.xml b/nxstools/xmltemplates/eiger9m16vds_nbimages_cb.ds.xml
index 813f6af0..a76223b5 100644
--- a/nxstools/xmltemplates/eiger9m16vds_nbimages_cb.ds.xml
+++ b/nxstools/xmltemplates/eiger9m16vds_nbimages_cb.ds.xml
@@ -2,11 +2,8 @@
 <definition>
   <datasource type="PYEVAL" name="$(name)_nbimages_cb">
     <result name="result">
-try:
-    import tango
-except Exception:
-    import PyTango as tango
-ds.result = tango.DeviceProxy("$(hostname)/$(device)").NbImages
+ds.result = ds.$(name)_nbimages
     </result>
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger9m16vds_stepindex.ds.xml b/nxstools/xmltemplates/eiger9m16vds_stepindex.ds.xml
index c5c44a31..eec2a9c4 100644
--- a/nxstools/xmltemplates/eiger9m16vds_stepindex.ds.xml
+++ b/nxstools/xmltemplates/eiger9m16vds_stepindex.ds.xml
@@ -3,9 +3,9 @@
   <datasource type="PYEVAL" name="$(name)_stepindex">
     <result name="result">
 from nxstools.pyeval import common
-ds.result = common.blockitem_addint(commonblock, "$(name)_stepindex", ds.$(name)_nbimages_cb)
+ds.result = common.blockitem_addint(commonblock, "$(name)_stepindex", ds.$(name)_nbimages)
 ds.result = len(commonblock["$(name)_stepindex"])
     </result>
-    $datasources.$(name)_nbimages_cb
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger9m16vds_triggermode_cb.ds.xml b/nxstools/xmltemplates/eiger9m16vds_triggermode_cb.ds.xml
index b67010cc..27f68033 100644
--- a/nxstools/xmltemplates/eiger9m16vds_triggermode_cb.ds.xml
+++ b/nxstools/xmltemplates/eiger9m16vds_triggermode_cb.ds.xml
@@ -3,9 +3,9 @@
   <datasource type="PYEVAL" name="$(name)_triggermode_cb">
     <result name="result">
 from nxstools.pyeval import eigerdectris
-ds.result = eigerdectris.triggermode_cb(commonblock, "$(name)", ds.$(name)_triggermode, ds.$(name)_nbimages_cb, "$(hostname)", "$(device)", "$var.filename", "$(name)_stepindex", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", "EigerDectris", "EigerFilewriter", True, [3269, 3110], "uint16", "$var.acq_modes")
+ds.result = eigerdectris.triggermode_cb(commonblock, "$(name)", ds.$(name)_triggermode, ds.$(name)_nbimages, "$(hostname)", "$(device)", "$var.filename", "$(name)_stepindex", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", "EigerDectris", "EigerFilewriter", True, [3269, 3110], "uint16", "$var.acq_modes")
     </result>
     $datasources.$(name)_triggermode
-    $datasources.$(name)_nbimages_cb
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger9m32vds_nbimages_cb.ds.xml b/nxstools/xmltemplates/eiger9m32vds_nbimages_cb.ds.xml
index 813f6af0..a76223b5 100644
--- a/nxstools/xmltemplates/eiger9m32vds_nbimages_cb.ds.xml
+++ b/nxstools/xmltemplates/eiger9m32vds_nbimages_cb.ds.xml
@@ -2,11 +2,8 @@
 <definition>
   <datasource type="PYEVAL" name="$(name)_nbimages_cb">
     <result name="result">
-try:
-    import tango
-except Exception:
-    import PyTango as tango
-ds.result = tango.DeviceProxy("$(hostname)/$(device)").NbImages
+ds.result = ds.$(name)_nbimages
     </result>
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger9m32vds_stepindex.ds.xml b/nxstools/xmltemplates/eiger9m32vds_stepindex.ds.xml
index c5c44a31..eec2a9c4 100644
--- a/nxstools/xmltemplates/eiger9m32vds_stepindex.ds.xml
+++ b/nxstools/xmltemplates/eiger9m32vds_stepindex.ds.xml
@@ -3,9 +3,9 @@
   <datasource type="PYEVAL" name="$(name)_stepindex">
     <result name="result">
 from nxstools.pyeval import common
-ds.result = common.blockitem_addint(commonblock, "$(name)_stepindex", ds.$(name)_nbimages_cb)
+ds.result = common.blockitem_addint(commonblock, "$(name)_stepindex", ds.$(name)_nbimages)
 ds.result = len(commonblock["$(name)_stepindex"])
     </result>
-    $datasources.$(name)_nbimages_cb
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eiger9m32vds_triggermode_cb.ds.xml b/nxstools/xmltemplates/eiger9m32vds_triggermode_cb.ds.xml
index 6b88c69d..f53c9954 100644
--- a/nxstools/xmltemplates/eiger9m32vds_triggermode_cb.ds.xml
+++ b/nxstools/xmltemplates/eiger9m32vds_triggermode_cb.ds.xml
@@ -3,9 +3,9 @@
   <datasource type="PYEVAL" name="$(name)_triggermode_cb">
     <result name="result">
 from nxstools.pyeval import eigerdectris
-ds.result = eigerdectris.triggermode_cb(commonblock, "$(name)", ds.$(name)_triggermode, ds.$(name)_nbimages_cb, "$(hostname)", "$(device)", "$var.filename", "$(name)_stepindex", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", "EigerDectris", "EigerFilewriter", True, [3269, 3110], "uint32", "$var.acq_modes")
+ds.result = eigerdectris.triggermode_cb(commonblock, "$(name)", ds.$(name)_triggermode, ds.$(name)_nbimages, "$(hostname)", "$(device)", "$var.filename", "$(name)_stepindex", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", "EigerDectris", "EigerFilewriter", True, [3269, 3110], "uint32", "$var.acq_modes")
     </result>
     $datasources.$(name)_triggermode
-    $datasources.$(name)_nbimages_cb
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eigerdectris_nbimages_cb.ds.xml b/nxstools/xmltemplates/eigerdectris_nbimages_cb.ds.xml
index 813f6af0..a76223b5 100644
--- a/nxstools/xmltemplates/eigerdectris_nbimages_cb.ds.xml
+++ b/nxstools/xmltemplates/eigerdectris_nbimages_cb.ds.xml
@@ -2,11 +2,8 @@
 <definition>
   <datasource type="PYEVAL" name="$(name)_nbimages_cb">
     <result name="result">
-try:
-    import tango
-except Exception:
-    import PyTango as tango
-ds.result = tango.DeviceProxy("$(hostname)/$(device)").NbImages
+ds.result = ds.$(name)_nbimages
     </result>
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eigerdectris_stepindex.ds.xml b/nxstools/xmltemplates/eigerdectris_stepindex.ds.xml
index c5c44a31..eec2a9c4 100644
--- a/nxstools/xmltemplates/eigerdectris_stepindex.ds.xml
+++ b/nxstools/xmltemplates/eigerdectris_stepindex.ds.xml
@@ -3,9 +3,9 @@
   <datasource type="PYEVAL" name="$(name)_stepindex">
     <result name="result">
 from nxstools.pyeval import common
-ds.result = common.blockitem_addint(commonblock, "$(name)_stepindex", ds.$(name)_nbimages_cb)
+ds.result = common.blockitem_addint(commonblock, "$(name)_stepindex", ds.$(name)_nbimages)
 ds.result = len(commonblock["$(name)_stepindex"])
     </result>
-    $datasources.$(name)_nbimages_cb
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eigerdectris_triggermode_cb.ds.xml b/nxstools/xmltemplates/eigerdectris_triggermode_cb.ds.xml
index cee2ba7c..9f599268 100644
--- a/nxstools/xmltemplates/eigerdectris_triggermode_cb.ds.xml
+++ b/nxstools/xmltemplates/eigerdectris_triggermode_cb.ds.xml
@@ -3,9 +3,9 @@
   <datasource type="PYEVAL" name="$(name)_triggermode_cb">
     <result name="result">
 from nxstools.pyeval import eigerdectris
-ds.result = eigerdectris.triggermode_cb(commonblock, "$(name)", ds.$(name)_triggermode, ds.$(name)_nbimages_cb, "$(hostname)", "$(device)", "$var.filename", "$(name)_stepindex", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", "EigerDectris", "EigerFilewriter")
+ds.result = eigerdectris.triggermode_cb(commonblock, "$(name)", ds.$(name)_triggermode, ds.$(name)_nbimages, "$(hostname)", "$(device)", "$var.filename", "$(name)_stepindex", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", "EigerDectris", "EigerFilewriter")
     </result>
     $datasources.$(name)_triggermode
-    $datasources.$(name)_nbimages_cb
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/eigerdectrismesh_nbimages_cb.ds.xml b/nxstools/xmltemplates/eigerdectrismesh_nbimages_cb.ds.xml
new file mode 100644
index 00000000..a76223b5
--- /dev/null
+++ b/nxstools/xmltemplates/eigerdectrismesh_nbimages_cb.ds.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<definition>
+  <datasource type="PYEVAL" name="$(name)_nbimages_cb">
+    <result name="result">
+ds.result = ds.$(name)_nbimages
+    </result>
+    $datasources.$(name)_nbimages
+  </datasource>
+</definition>
diff --git a/nxstools/xmltemplates/eigerdectrismesh_stepindex.ds.xml b/nxstools/xmltemplates/eigerdectrismesh_stepindex.ds.xml
index c5c44a31..eec2a9c4 100644
--- a/nxstools/xmltemplates/eigerdectrismesh_stepindex.ds.xml
+++ b/nxstools/xmltemplates/eigerdectrismesh_stepindex.ds.xml
@@ -3,9 +3,9 @@
   <datasource type="PYEVAL" name="$(name)_stepindex">
     <result name="result">
 from nxstools.pyeval import common
-ds.result = common.blockitem_addint(commonblock, "$(name)_stepindex", ds.$(name)_nbimages_cb)
+ds.result = common.blockitem_addint(commonblock, "$(name)_stepindex", ds.$(name)_nbimages)
 ds.result = len(commonblock["$(name)_stepindex"])
     </result>
-    $datasources.$(name)_nbimages_cb
+    $datasources.$(name)_nbimages
   </datasource>
 </definition>
diff --git a/nxstools/xmltemplates/lambdavds_framenumbers_cb.ds.xml b/nxstools/xmltemplates/lambdavds_framenumbers_cb.ds.xml
index ab777456..fd6ed015 100644
--- a/nxstools/xmltemplates/lambdavds_framenumbers_cb.ds.xml
+++ b/nxstools/xmltemplates/lambdavds_framenumbers_cb.ds.xml
@@ -3,11 +3,7 @@
   <datasource type="PYEVAL" name="$(name)_framenumbers_cb">
     <result name="result">
 from nxstools.pyeval import common
-try:
-    import tango
-except Exception:
-    import PyTango as tango
-ds.result = common.blockitem_addint(commonblock, "$(name)_framenumbers", tango.DeviceProxy("$(hostname)/$(device)").FrameNumbers)
+ds.result = common.blockitem_addint(commonblock, "$(name)_framenumbers", ds.$(name)_framenumbers)
     </result>
     $datasources.$(name)_framenumbers
   </datasource>
diff --git a/nxstools/xmltemplates/lambdavds_savefilename_cb.ds.xml b/nxstools/xmltemplates/lambdavds_savefilename_cb.ds.xml
index c579399e..3e2376e0 100644
--- a/nxstools/xmltemplates/lambdavds_savefilename_cb.ds.xml
+++ b/nxstools/xmltemplates/lambdavds_savefilename_cb.ds.xml
@@ -3,11 +3,7 @@
   <datasource type="PYEVAL" name="$(name)_savefilename_cb">
     <result name="result">
 from nxstools.pyeval import common
-try:
-    import tango
-except Exception:
-    import PyTango as tango
-ds.result = common.blockitem_add(commonblock, "$(name)_savefilename", tango.DeviceProxy("$(hostname)/$(device)").SaveFileName)
+ds.result = common.blockitem_add(commonblock, "$(name)_savefilename", ds.$(name)_savefilename)
     </result>
     $datasources.$(name)_savefilename
   </datasource>
diff --git a/test/NXSCreateOnlineCPFS2_test.py b/test/NXSCreateOnlineCPFS2_test.py
index ddf0a808..555da0de 100644
--- a/test/NXSCreateOnlineCPFS2_test.py
+++ b/test/NXSCreateOnlineCPFS2_test.py
@@ -305,13 +305,9 @@ def test_onlinecp_eigerdectris_fileprefix(self):
                      ' name="myeigerdectris_nbimages_cb"'
                      '>\n'
                      '    <result name="result">\n'
-                     'try:\n'
-                     '    import tango\n'
-                     'except Exception:\n'
-                     '    import PyTango as tango\n'
-                     'ds.result = tango.DeviceProxy('
-                     '"haso000:10000/p09/eigerdectris/exp.01").NbImages\n'
+                     'ds.result = ds.myeigerdectris_nbimages\n'
                      '    </result>\n'
+                     '    $datasources.myeigerdectris_nbimages\n'
                      '  </datasource>\n'
                      '</definition>\n',
                      '<?xml version=\'1.0\' encoding=\'utf8\'?>\n'
@@ -366,11 +362,11 @@ def test_onlinecp_eigerdectris_fileprefix(self):
                      'from nxstools.pyeval import common\n'
                      'ds.result = common.blockitem_addint('
                      'commonblock, "myeigerdectris_stepindex", '
-                     'ds.myeigerdectris_nbimages_cb)\n'
+                     'ds.myeigerdectris_nbimages)\n'
                      'ds.result = len(commonblock['
                      '"myeigerdectris_stepindex"])\n'
                      '    </result>\n'
-                     '    $datasources.myeigerdectris_nbimages_cb\n'
+                     '    $datasources.myeigerdectris_nbimages\n'
                      '  </datasource>\n'
                      '</definition>\n',
                      '<?xml version=\'1.0\' encoding=\'utf8\'?>\n'
@@ -394,7 +390,7 @@ def test_onlinecp_eigerdectris_fileprefix(self):
                      'commonblock,'
                      ' "myeigerdectris",'
                      ' ds.myeigerdectris_triggermode,'
-                     ' ds.myeigerdectris_nbimages_cb,'
+                     ' ds.myeigerdectris_nbimages,'
                      ' "haso000:10000",'
                      ' "p09/eigerdectris/exp.01",'
                      ' "$var.filename",'
@@ -406,7 +402,7 @@ def test_onlinecp_eigerdectris_fileprefix(self):
                      ')\n'
                      '    </result>\n'
                      '    $datasources.myeigerdectris_triggermode\n'
-                     '    $datasources.myeigerdectris_nbimages_cb\n'
+                     '    $datasources.myeigerdectris_nbimages\n'
                      '  </datasource>\n'
                      '</definition>\n',
                      '<?xml version=\'1.0\' encoding=\'utf8\'?>\n'