diff --git a/ch.psi.fda/pom.xml b/ch.psi.fda/pom.xml
index cef64f5..d614898 100644
--- a/ch.psi.fda/pom.xml
+++ b/ch.psi.fda/pom.xml
@@ -11,6 +11,11 @@
 			<artifactId>guava</artifactId>
 			<version>15.0</version>
 		</dependency>
+		<dependency>
+			<groupId>com.google.inject</groupId>
+			<artifactId>guice</artifactId>
+			<version>3.0</version>
+		</dependency>
 
 		<dependency>
 			<groupId>commons-lang</groupId>
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/aq/Acquisition.java b/ch.psi.fda/src/main/java/ch/psi/fda/aq/Acquisition.java
index daa5fa9..36da3e2 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/aq/Acquisition.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/aq/Acquisition.java
@@ -155,7 +155,6 @@ public class Acquisition {
 		actionLoop = null;
 		collector = new Collector();
 		manipulations = new ArrayList<Manipulation>();
-		
 	}
 	
 	
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionModule.java b/ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionModule.java
new file mode 100644
index 0000000..f602262
--- /dev/null
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionModule.java
@@ -0,0 +1,18 @@
+package ch.psi.fda.aq;
+
+import gov.aps.jca.CAException;
+import ch.psi.jcae.ChannelBeanFactory;
+
+import com.google.inject.AbstractModule;
+
+public class AcquisitionModule extends AbstractModule {
+
+	@Override
+	protected void configure() {
+		try {
+			bind(ChannelBeanFactory.class).toInstance(ChannelBeanFactory.getFactory());
+		} catch (CAException e) {
+			throw new RuntimeException(e);
+		}
+	}
+}
\ No newline at end of file
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/actions/Delay.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/actions/Delay.java
index 4c15f93..9e90c00 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/core/actions/Delay.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/actions/Delay.java
@@ -28,14 +28,10 @@ import ch.psi.fda.core.Action;
  */
 public class Delay implements Action {
 
-	/**
-	 * Time to wait
-	 */
 	private final long time;
 	
 	/**
-	 * Constructor
-	 * @param time		Time to wait (in milliseconds)
+	 * @param time		Time to wait in milliseconds
 	 */
 	public Delay(long time){
 		
@@ -47,28 +43,17 @@ public class Delay implements Action {
 		this.time = time;
 	}
 	
-	/* (non-Javadoc)
-	 * @see ch.psi.fda.core.Action#execute()
-	 */
 	@Override
 	public void execute() throws InterruptedException {
 		Thread.sleep(time);
 	}
 
-	/* (non-Javadoc)
-	 * @see ch.psi.fda.core.Action#abort()
-	 */
 	@Override
 	public void abort() {
-		// Not implemented because not needed
 	}
 
-	/* (non-Javadoc)
-	 * @see ch.psi.fda.core.Action#destroy()
-	 */
 	@Override
 	public void destroy() {
-		// Nothing to be done
 	}
 
 }
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/actions/JythonAction.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/actions/JythonAction.java
index dea28d1..fe8f670 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/core/actions/JythonAction.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/actions/JythonAction.java
@@ -44,7 +44,6 @@ import ch.psi.jcae.ChannelBeanFactory;
  */
 public class JythonAction implements Action {
 
-	// Get Logger
 	private static Logger logger = Logger.getLogger(JythonAction.class.getName());
 	
 	/**
@@ -167,21 +166,13 @@ public class JythonAction implements Action {
 		}		
 	}
 
-	/* (non-Javadoc)
-	 * @see ch.psi.fda.core.Action#abort()
-	 */
 	@Override
 	public void abort() {
-		// TODO need to find a way to abort script execution
 	}
 
 
-	/* (non-Javadoc)
-	 * @see ch.psi.fda.core.Action#destroy()
-	 */
 	@Override
 	public void destroy() {
-		// Nothing to be done
 	}
 
 	/**
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/actions/ShellAction.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/actions/ShellAction.java
index 8e5a23b..b8ff396 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/core/actions/ShellAction.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/actions/ShellAction.java
@@ -121,9 +121,6 @@ public class ShellAction implements Action{
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see ch.psi.fda.core.Action#abort()
-	 */
 	@Override
 	public void abort() {
 		abort=true;
@@ -134,14 +131,8 @@ public class ShellAction implements Action{
 		}
 	}
 
-	
-	
-	/* (non-Javadoc)
-	 * @see ch.psi.fda.core.Action#destroy()
-	 */
 	@Override
 	public void destroy() {
-		// Nothing to be done
 	}
 
 	/**