diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_ExpressionContainer.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_ExpressionContainer.java
index 9dbbbb6..af7aced 100644
--- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_ExpressionContainer.java
+++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_ExpressionContainer.java
@@ -17,9 +17,13 @@ public class C_ExpressionContainer implements Serializable {
 		C_Expression, Rule;
 	}
 
-	protected Contains id;
-	protected C_Expression exp;
-	protected String readableExpression;
+	private Contains id;
+	private boolean conditionAllRows;
+	private C_Expression exp;
+	private String readableExpression;
+	
+	
+	
 	
 	/**
 	 * 
@@ -38,9 +42,20 @@ public class C_ExpressionContainer implements Serializable {
 			String readableExpression) {
 		super();
 		this.id = id;
+		this.conditionAllRows=false;
 		this.exp = exp;
 		this.readableExpression = readableExpression;
 	}
+	
+	public C_ExpressionContainer(Contains id, boolean conditionAllRows, C_Expression exp,
+			String readableExpression) {
+		super();
+		this.id = id;
+		this.conditionAllRows=conditionAllRows;
+		this.exp = exp;
+		this.readableExpression = readableExpression;
+	}
+	
 
 	public Contains getId() {
 		return id;
@@ -50,6 +65,14 @@ public class C_ExpressionContainer implements Serializable {
 		this.id = id;
 	}
 
+	public boolean isConditionAllRows() {
+		return conditionAllRows;
+	}
+
+	public void setConditionAllRows(boolean conditionAllRows) {
+		this.conditionAllRows = conditionAllRows;
+	}
+
 	public C_Expression getExp() {
 		return exp;
 	}
@@ -68,9 +91,12 @@ public class C_ExpressionContainer implements Serializable {
 
 	@Override
 	public String toString() {
-		return "C_ExpressionContainer [id=" + id + ", exp=" + exp
-				+ ", readableExpression=" + readableExpression + "]";
+		return "C_ExpressionContainer [id=" + id + ", conditionAllRows="
+				+ conditionAllRows + ", exp=" + exp + ", readableExpression="
+				+ readableExpression + "]";
 	}
+
+