diff --git a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/JobState.java b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/JobState.java
index 515310a6cdf1587d0e3b2f95fe38f7c6d187c4cb..374481004f6c13fb6f4dcccee151dc97b4cb0ab3 100644
--- a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/JobState.java
+++ b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/JobState.java
@@ -1,11 +1,12 @@
 package cz.it4i.fiji.haas_java_client;
 
 public enum JobState {
-	Configuring ,
-    Submitted ,
-    Queued ,
-    Running ,
-    Finished ,
-    Failed ,
+	Unknown,
+	Configuring,
+    Submitted,
+    Queued,
+    Running,
+    Finished,
+    Failed,
     Canceled;
 }
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Task.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Task.java
index 84af6203020fe9a90b10200c869d33eb2ee07516..17e74f89bc0e381b6da22fbc4168b41e930ddd2a 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Task.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Task.java
@@ -4,33 +4,23 @@ import java.util.Collection;
 import java.util.LinkedList;
 
 public class Task {
-	private SPIMComputationAccessor outputHolder;
-	private String description;
-	private Collection<TaskComputation> computations;
-	private int numComputations;
+	private final String description;
+	private final Collection<TaskComputation> computations;
 
 	public Task(SPIMComputationAccessor outputHolder, String description, int numComputations) {
 		this.description = description;
-		this.outputHolder = outputHolder;
-		this.numComputations = numComputations;
-	}
-
-	public Collection<TaskComputation> getComputations() {
-		if (computations == null) {
-			fillComputations();
+		this.computations = new LinkedList<>();
+		
+		for (int i = 0; i < numComputations; i++) {
+			computations.add(new TaskComputation(outputHolder, this, i + 1));
 		}
-		return computations;
 	}
 
 	public String getDescription() {
 		return description;
 	}
-
-	private void fillComputations() {
-		computations = new LinkedList<>();
-		for (int i = 0; i < numComputations; i++) {
-			computations.add(new TaskComputation(outputHolder, this, i + 1));
-		}
+	
+	public Collection<TaskComputation> getComputations() {
+		return computations;
 	}
-
 }
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java
index 2d1c7b221d415bac344dbd9221a164108eac5ed7..3ee8bb11a00b4dcd20d60a3752dc3ef540b7e199 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java
@@ -5,29 +5,29 @@ import java.util.LinkedList;
 
 import cz.it4i.fiji.haas_java_client.JobState;
 
-
 public class TaskComputation {
 
-	private SPIMComputationAccessor outputHolder;
-	private int timepoint;
+	private final SPIMComputationAccessor outputHolder;
+	private final Task task;
+	private final int timepoint;
+	
 	private Long id;
 	//TASK 1011 what states will be defined and how it will be defined
-	private JobState state;
-	private Task task;
+	private JobState state = JobState.Unknown;
 	private Collection<String> logs = new LinkedList<>();
 	private Collection<String> outputs = new LinkedList<>();
 	private Collection<String> inputs = new LinkedList<>();
 
 	
-	public TaskComputation(SPIMComputationAccessor outputHolder,Task task, int timepoint) {
+	public TaskComputation(SPIMComputationAccessor outputHolder, Task task, int timepoint) {
 		this.outputHolder = outputHolder;
-		this.timepoint = timepoint;
 		this.task = task;
+		this.timepoint = timepoint;
 	}
 
 	public JobState getState() {
 		updateState();//TASK 1011 it is not good idea update every time when state is requested 
-		return state != null?state:JobState.Configuring;
+		return state;
 	}
 
 	private void updateState() {
@@ -42,7 +42,7 @@ public class TaskComputation {
 	}
 
 	private Long getId() {
-		if(id == null) {
+		if (id == null) {
 			fillId();
 		}
 		return id;