diff --git a/pom.xml b/pom.xml
index ac472cffd..a71ca46e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
   <modelVersion>4.0.0</modelVersion>
@@ -251,6 +251,7 @@
                   <compatibilityType>BACKWARD_COMPATIBLE_USER</compatibilityType>
                   <dumpDetails>true</dumpDetails>
                   <publicOnly>true</publicOnly>
+                  <previousVersion>4.0.0</previousVersion>
                 </requireBackwardCompatibility>
               </rules>
             </configuration>
@@ -693,4 +694,4 @@
     </plugins>
   </reporting>
   
-</project>
+</project>
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CaseForEqBuilder.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CaseForEqBuilder.java
index fe038c9cc..06d56dcd6 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CaseForEqBuilder.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CaseForEqBuilder.java
@@ -13,15 +13,14 @@
  */
 package com.querydsl.core.types.dsl;
 
+import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import javax.annotation.Nullable;
 
-import com.querydsl.core.types.ConstantImpl;
-import com.querydsl.core.types.Expression;
-import com.querydsl.core.types.NullExpression;
-import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.*;
 
 /**
  * {@code CaseForEqBuilder} enables the construction of typesafe case-when-then-else constructs
@@ -78,14 +77,34 @@ public final class CaseForEqBuilder<D> {
         this.other = other;
     }
 
-    public <T> Cases<T,Expression<T>> then(Expression<T> then) {
-        type = then.getType();
+    public <T> Cases<T,Expression<T>> then(Expression<T> expr) {
+        if (expr instanceof Predicate) {
+            return (Cases) then((Predicate) expr);
+        } else if (expr instanceof StringExpression) {
+            return (Cases) then((StringExpression) expr);
+        } else if (expr instanceof NumberExpression) {
+            return then((NumberExpression) expr);
+        } else if (expr instanceof DateExpression) {
+            return then((DateExpression) expr);
+        } else if (expr instanceof DateTimeExpression) {
+            return then((DateTimeExpression) expr);
+        } else if (expr instanceof TimeExpression) {
+            return then((TimeExpression) expr);
+        } else if (expr instanceof ComparableExpression) {
+            return then((ComparableExpression) expr);
+        } else {
+            return thenSimple(expr);
+        }
+    }
+
+    private <T> Cases<T, Expression<T>> thenSimple(Expression<T> expr) {
+        type = expr.getType();
         return new Cases<T,Expression<T>>() {
             @Override
             protected Expression<T> createResult(Class<T> type, Expression<T> last) {
                 return Expressions.operation(type, Ops.CASE_EQ, base, last);
             }
-        }.when(other).then(then);
+        }.when(other).then(expr);
     }
 
     public <T> Cases<T,Expression<T>> then(T then) {
@@ -96,7 +115,118 @@ public final class CaseForEqBuilder<D> {
         return then((Expression<T>) NullExpression.DEFAULT);
     }
 
-    public <T extends Number & Comparable<?>> Cases<T,NumberExpression<T>> then(T then) {
+    // Boolean
+
+    public Cases<Boolean, BooleanExpression> then(Boolean then) {
+        return thenBoolean(ConstantImpl.create(then));
+    }
+
+    public Cases<Boolean, BooleanExpression> then(BooleanExpression then) {
+        return thenBoolean(then);
+    }
+
+    private Cases<Boolean, BooleanExpression> thenBoolean(Expression<Boolean> then) {
+        type = then.getType();
+        return new Cases<Boolean, BooleanExpression>() {
+            @Override
+            protected BooleanExpression createResult(Class<Boolean> type, Expression<Boolean> last) {
+                return Expressions.booleanOperation(Ops.CASE_EQ, base, last);
+            }
+
+        }.when(other).then(then);
+    }
+
+    // Comparable
+
+    public <T extends Comparable> Cases<T, ComparableExpression<T>> then(T then) {
+        return thenComparable(ConstantImpl.create(then));
+    }
+
+    public <T extends Comparable> Cases<T, ComparableExpression<T>> then(ComparableExpression<T> then) {
+        return thenComparable(then);
+    }
+
+    private <T extends Comparable> Cases<T, ComparableExpression<T>> thenComparable(Expression<T> then) {
+        type = then.getType();
+        return new Cases<T, ComparableExpression<T>>() {
+            @Override
+            protected ComparableExpression<T> createResult(Class<T> type, Expression<T> last) {
+                return Expressions.comparableOperation(type, Ops.CASE_EQ, base, last);
+            }
+
+        }.when(other).then(then);
+    }
+
+    // Date
+
+    public Cases<java.sql.Date, DateExpression<java.sql.Date>> then(java.sql.Date then) {
+        return thenDate(ConstantImpl.create(then));
+    }
+
+    public <T extends Comparable> Cases<T, DateExpression<T>> then(DateExpression<T> then) {
+        return thenDate(then);
+    }
+
+    private <T extends Comparable> Cases<T, DateExpression<T>> thenDate(Expression<T> then) {
+        type = then.getType();
+        return new Cases<T, DateExpression<T>>() {
+            @Override
+            protected DateExpression<T> createResult(Class<T> type, Expression<T> last) {
+                return Expressions.dateOperation(type, Ops.CASE_EQ, base, last);
+            }
+
+        }.when(other).then(then);
+    }
+
+    // DateTime
+
+    public Cases<Date, DateTimeExpression<Date>> then(Date then) {
+        return thenDateTime(ConstantImpl.create(then));
+    }
+
+    public Cases<Timestamp, DateTimeExpression<Timestamp>> then(Timestamp then) {
+        return thenDateTime(ConstantImpl.create(then));
+    }
+
+    public <T extends Comparable> Cases<T, DateTimeExpression<T>> then(DateTimeExpression<T> then) {
+        return thenDateTime(then);
+    }
+
+    private <T extends Comparable> Cases<T, DateTimeExpression<T>> thenDateTime(Expression<T> then) {
+        type = then.getType();
+        return new Cases<T, DateTimeExpression<T>>() {
+            @Override
+            protected DateTimeExpression<T> createResult(Class<T> type, Expression<T> last) {
+                return Expressions.dateTimeOperation(type, Ops.CASE_EQ, base, last);
+            }
+
+        }.when(other).then(then);
+    }
+
+    // Enum
+
+    public <T extends Enum<T>> Cases<T, EnumExpression<T>> then(T then) {
+        return thenEnum(ConstantImpl.create(then));
+    }
+
+    public <T extends Enum<T>> Cases<T, EnumExpression<T>> then(EnumExpression<T> then) {
+        return thenEnum(then);
+    }
+
+    private <T extends Enum<T>> Cases<T, EnumExpression<T>> thenEnum(Expression<T> then) {
+        type = then.getType();
+        return new Cases<T, EnumExpression<T>>() {
+            @Override
+            protected EnumExpression<T> createResult(Class<T> type, Expression<T> last) {
+                return Expressions.enumOperation(type, Ops.CASE_EQ, base, last);
+            }
+
+        }.when(other).then(then);
+    }
+
+    // Number
+
+    public <T extends Number & Comparable<?>> Cases<T, NumberExpression<T>> then(T then) {
         return thenNumber(ConstantImpl.create(then));
     }
 
@@ -116,14 +246,16 @@ public final class CaseForEqBuilder<D> {
         }.when(other).then(then);
     }
 
-    public Cases<String,StringExpression> then(StringExpression then) {
-        return thenString(then);
-    }
+    // String
 
     public Cases<String,StringExpression> then(String then) {
         return thenString(ConstantImpl.create(then));
     }
 
+    public Cases<String,StringExpression> then(StringExpression then) {
+        return thenString(then);
+    }
+
     private Cases<String,StringExpression> thenString(Expression<String> then) {
         type = then.getType();
         return new Cases<String,StringExpression>() {
@@ -136,6 +268,27 @@ public final class CaseForEqBuilder<D> {
         }.when(other).then(then);
     }
 
+    // Time
+
+    public Cases<java.sql.Time, TimeExpression<java.sql.Time>> then(java.sql.Time then) {
+        return thenTime(ConstantImpl.create(then));
+    }
+
+    public <T extends Comparable> Cases<T, TimeExpression<T>> then(TimeExpression<T> then) {
+        return thenTime(then);
+    }
+
+    private <T extends Comparable> Cases<T, TimeExpression<T>> thenTime(Expression<T> then) {
+        type = then.getType();
+        return new Cases<T, TimeExpression<T>>() {
+            @Override
+            protected TimeExpression<T> createResult(Class<T> type, Expression<T> last) {
+                return Expressions.timeOperation(type, Ops.CASE_EQ, base, last);
+            }
+
+        }.when(other).then(then);
+    }
+
     /**
      * Intermediate step
      *
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/CaseBuilderTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/CaseBuilderTest.java
similarity index 98%
rename from querydsl-core/src/test/java/com/querydsl/core/types/CaseBuilderTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/dsl/CaseBuilderTest.java
index 130462438..715d473f1 100644
--- a/querydsl-core/src/test/java/com/querydsl/core/types/CaseBuilderTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/CaseBuilderTest.java
@@ -11,17 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.querydsl.core.types;
+package com.querydsl.core.types.dsl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static com.querydsl.core.alias.Alias.$;
 import static com.querydsl.core.alias.Alias.alias;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.querydsl.core.types.dsl.*;
-
 public class CaseBuilderTest {
 
     public enum Gender {
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/CaseForEqBuilderTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/CaseForEqBuilderTest.java
similarity index 61%
rename from querydsl-core/src/test/java/com/querydsl/core/types/CaseForEqBuilderTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/dsl/CaseForEqBuilderTest.java
index c59e3abb0..a12cc5229 100644
--- a/querydsl-core/src/test/java/com/querydsl/core/types/CaseForEqBuilderTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/CaseForEqBuilderTest.java
@@ -11,20 +11,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.querydsl.core.types;
+package com.querydsl.core.types.dsl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static com.querydsl.core.alias.Alias.$;
 import static com.querydsl.core.alias.Alias.alias;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.sql.Time;
 
 import org.junit.Test;
 
-import com.querydsl.core.types.dsl.NumberExpression;
-import com.querydsl.core.types.dsl.StringExpression;
-
 public class CaseForEqBuilderTest {
 
+    public enum EnumExample { A, B }
+
     public static class Customer {
         private long annualSpending;
         public long getAnnualSpending() {
@@ -69,12 +70,56 @@ public class CaseForEqBuilderTest {
     public void BooleanTyped() {
         Customer c = alias(Customer.class, "customer");
 
-        Expression<Boolean> cases = $(c.getAnnualSpending())
+        BooleanExpression cases = $(c.getAnnualSpending())
             .when(1000L).then(true)
             .otherwise(false);
 
         assertNotNull(cases);
-
     }
 
+    @Test
+    public void DateType() {
+        Customer c = alias(Customer.class, "customer");
+
+        DateExpression<java.sql.Date> cases = $(c.getAnnualSpending())
+                .when(1000L).then(new java.sql.Date(0))
+                .otherwise(new java.sql.Date(0));
+
+        assertNotNull(cases);
+    }
+
+    @Test
+    public void DateTimeType() {
+        Customer c = alias(Customer.class, "customer");
+
+        DateTimeExpression<java.util.Date> cases = $(c.getAnnualSpending())
+                .when(1000L).then(new java.util.Date(0))
+                .otherwise(new java.util.Date(0));
+
+        assertNotNull(cases);
+    }
+
+    @Test
+    public void TimeType() {
+        Customer c = alias(Customer.class, "customer");
+
+        TimeExpression<Time> cases = $(c.getAnnualSpending())
+                .when(1000L).then(new Time(0))
+                .otherwise(new Time(0));
+
+        assertNotNull(cases);
+    }
+
+    @Test
+    public void EnumType() {
+        Customer c = alias(Customer.class, "customer");
+
+        EnumExpression<EnumExample> cases = $(c.getAnnualSpending())
+                .when(1000L).then(EnumExample.A)
+                .otherwise(EnumExample.B);
+
+        assertNotNull(cases);
+    }
+
+
 }