diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index bcb8ea1b31a0cece38f2d631f2419d984d4ebb51..d435b6c4e0e0245fb5c7721efe3fdc245698a3b4 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -270,7 +270,17 @@ public class CouchDBDao implements IDatabaseDao {
 		q.put("offsetX", question.getOffsetX());
 		q.put("offsetY", question.getOffsetY());
 		q.put("zoomLvl", question.getZoomLvl());
-
+		q.put("gridOffsetX", question.getGridOffsetX());
+		q.put("gridOffsetY", question.getGridOffsetY());
+		q.put("gridZoomLvl", question.getGridZoomLvl());
+		q.put("gridSizeX", question.getGridSizeX());
+		q.put("gridSizeY", question.getGridSizeY());
+		q.put("gridIsHidden", question.getGridIsHidden());
+		q.put("imgRotation", question.getImgRotation());
+		q.put("toggleFieldsLeft", question.getToggleFieldsLeft());
+		q.put("numClickableFields", question.getNumClickableFields());
+		q.put("thresholdCorrectAnswers", question.getThresholdCorrectAnswers());
+		
 		return q;
 	}
 
@@ -293,6 +303,16 @@ public class CouchDBDao implements IDatabaseDao {
 			q.put("offsetX", question.getOffsetX());
 			q.put("offsetY", question.getOffsetY());
 			q.put("zoomLvl", question.getZoomLvl());
+			q.put("gridOffsetX", question.getGridOffsetX());
+			q.put("gridOffsetY", question.getGridOffsetY());
+			q.put("gridZoomLvl", question.getGridZoomLvl());
+			q.put("gridSizeX", question.getGridSizeX());
+			q.put("gridSizeY", question.getGridSizeY());
+			q.put("gridIsHidden", question.getGridIsHidden());
+			q.put("imgRotation", question.getImgRotation());
+			q.put("toggleFieldsLeft", question.getToggleFieldsLeft());
+			q.put("numClickableFields", question.getNumClickableFields());
+			q.put("thresholdCorrectAnswers", question.getThresholdCorrectAnswers());
 			database.saveDocument(q);
 			question.set_rev(q.getRev());
 
diff --git a/src/main/java/de/thm/arsnova/entities/Question.java b/src/main/java/de/thm/arsnova/entities/Question.java
index f8cbbadb9294a27ec106eaa59b53bb422bf69d05..9647d6dbab838f0ef402e0d297257d98334d6fc7 100644
--- a/src/main/java/de/thm/arsnova/entities/Question.java
+++ b/src/main/java/de/thm/arsnova/entities/Question.java
@@ -49,6 +49,16 @@ public class Question {
 	private int offsetX;
 	private int offsetY;
 	private int zoomLvl;
+	private int gridOffsetX;
+	private int gridOffsetY;
+	private int gridZoomLvl;
+	private int gridSizeX;
+	private int gridSizeY;
+	private boolean gridIsHidden;
+	private int imgRotation;
+	private boolean toggleFieldsLeft;
+	private int numClickableFields;
+	private int thresholdCorrectAnswers;
 
 	public final String getType() {
 		return type;
@@ -257,6 +267,86 @@ public class Question {
 	public void setZoomLvl(final int zoomLvl) {
 		this.zoomLvl = zoomLvl;
 	}
+	
+	public int getGridOffsetX() {
+		return gridOffsetX;
+	}
+
+	public void setGridOffsetX(int gridOffsetX) {
+		this.gridOffsetX = gridOffsetX;
+	}
+	
+	public int getGridOffsetY() {
+		return gridOffsetY;
+	}
+
+	public void setGridOffsetY(int gridOffsetY) {
+		this.gridOffsetY = gridOffsetY;
+	}
+	
+	public int getGridZoomLvl() {
+		return gridZoomLvl;
+	}
+
+	public void setGridZoomLvl(int gridZoomLvl) {
+		this.gridZoomLvl = gridZoomLvl;
+	}
+	
+	public int getGridSizeX() {
+		return gridSizeX;
+	}
+
+	public void setGridSizeX(int gridSizeX) {
+		this.gridSizeX = gridSizeX;
+	}
+	
+	public int getGridSizeY() {
+		return gridSizeY;
+	}
+
+	public void setGridSizeY(int gridSizeY) {
+		this.gridSizeY = gridSizeY;
+	}
+	
+	public boolean getGridIsHidden() {
+		return gridIsHidden;
+	}
+
+	public void setGridIsHidden(boolean gridIsHidden) {
+		this.gridIsHidden = gridIsHidden;
+	}
+	
+	public int getImgRotation() {
+		return imgRotation;
+	}
+
+	public void setImgRotation(int imgRotation) {
+		this.imgRotation = imgRotation;
+	}
+	
+	public boolean getToggleFieldsLeft() {
+		return toggleFieldsLeft;
+	}
+
+	public void setToggleFieldsLeft(boolean toggleFieldsLeft) {
+		this.toggleFieldsLeft = toggleFieldsLeft;
+	}
+	
+	public int getNumClickableFields() {
+		return numClickableFields;
+	}
+
+	public void setNumClickableFields(int numClickableFields) {
+		this.numClickableFields = numClickableFields;
+	}
+	
+	public int getThresholdCorrectAnswers() {
+		return thresholdCorrectAnswers;
+	}
+	
+	public void setThresholdCorrectAnswers(int thresholdCorrectAnswers) {
+		this.thresholdCorrectAnswers = thresholdCorrectAnswers;
+	}
 
 	@Override
 	public final String toString() {