diff --git a/build.gradle b/build.gradle
index bf1a431..de2297d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 import org.redline_rpm.header.Flags
 
 allprojects {
-    version = '2.0.0'    
+    version = '2.0.1'    
     group = 'ch.psi'
     ext.release = '1'
     ext.jar_suffix = 'fat'
@@ -17,7 +17,7 @@ allprojects {
     ext.rpm_requires = []
     //Not forcing workbench to same version, as it can break other apps. 
     //If specific minimal version is needed then must be specified in project. 
-    ext.workbench_version= '2.0.0'
+    ext.workbench_version= '2.0.1'
     
     repositories {
         mavenLocal() 
diff --git a/screenpanel-sf/src/main/java/ScreenPanelSF.java b/screenpanel-sf/src/main/java/ScreenPanelSF.java
index 5d0b529..e2cd926 100755
--- a/screenpanel-sf/src/main/java/ScreenPanelSF.java
+++ b/screenpanel-sf/src/main/java/ScreenPanelSF.java
@@ -1,6 +1,6 @@
 import ch.psi.pshell.bs.StreamCamera;
 import ch.psi.pshell.camserver.PipelineSource;
-import ch.psi.pshell.data.DataManager;
+import ch.psi.pshell.data.DataStore;
 import ch.psi.pshell.device.Device;
 import ch.psi.pshell.epics.DiscretePositioner;
 import ch.psi.pshell.epics.ChannelInteger;
@@ -286,10 +286,10 @@ public class ScreenPanelSF extends Panel implements CamServerViewer.CamServerVie
         }
     }   
     
-    public void onSavingImages(String name, String instance, DataManager dm, String pathRoot) throws IOException{
+    public void onSavingImages(String name, String instance, DataStore ds, String pathRoot) throws IOException{
         if (camServerViewer.getTypes().contains(ELECTRONS_TYPE)) {
-            dm.setAttribute(pathRoot, "Screen", String.valueOf(valueScreen.getLabel().getText()));
-            dm.setAttribute(pathRoot, "Filter", String.valueOf(valueFilter.getLabel().getText()));
+            ds.setAttribute(pathRoot, "Screen", String.valueOf(valueScreen.getLabel().getText()));
+            ds.setAttribute(pathRoot, "Filter", String.valueOf(valueFilter.getLabel().getText()));
         }
     }
     
diff --git a/screenpanel-sls/src/main/java/ScreenPanelSLS.java b/screenpanel-sls/src/main/java/ScreenPanelSLS.java
index 93d74d5..05a27ca 100755
--- a/screenpanel-sls/src/main/java/ScreenPanelSLS.java
+++ b/screenpanel-sls/src/main/java/ScreenPanelSLS.java
@@ -1,5 +1,5 @@
 import ch.psi.pshell.bs.StreamCamera;
-import ch.psi.pshell.data.DataManager;
+import ch.psi.pshell.data.DataStore;
 import ch.psi.pshell.device.Device;
 import ch.psi.pshell.epics.DiscretePositioner;
 import ch.psi.pshell.epics.BinaryPositioner;
@@ -347,18 +347,18 @@ public class ScreenPanelSLS extends Panel implements CamServerViewer.CamServerVi
         }
     }   
     
-    public void onSavingImages(String name, String instance, DataManager dm, String pathRoot) throws IOException{
+    public void onSavingImages(String name, String instance, DataStore ds, String pathRoot) throws IOException{
         if (valueScreen.isVisible() && valueScreen.isEnabled()) {
-            dm.setAttribute(pathRoot, "Screen", String.valueOf(valueScreen.getLabel().getText()));
+            ds.setAttribute(pathRoot, "Screen", String.valueOf(valueScreen.getLabel().getText()));
         }
         if (panelExposure.isVisible() && panelExposure.isEnabled()) {
-            dm.setAttribute(pathRoot, "Exposure", String.valueOf(panelExposure.getValue()));
+            ds.setAttribute(pathRoot, "Exposure", String.valueOf(panelExposure.getValue()));
         }
         if (selMirror.isVisible() && selMirror.isEnabled()) {
-            dm.setAttribute(pathRoot, "Mirror", String.valueOf(selMirror.getComboBox().getSelectedItem()));
+            ds.setAttribute(pathRoot, "Mirror", String.valueOf(selMirror.getComboBox().getSelectedItem()));
         }
         if (selLedPower.isVisible() && selLedPower.isEnabled()) {
-            dm.setAttribute(pathRoot, "LedPower", String.valueOf(selLedPower.getComboBox().getSelectedItem()));
+            ds.setAttribute(pathRoot, "LedPower", String.valueOf(selLedPower.getComboBox().getSelectedItem()));
         }
     }