diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/EComparable.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/EComparable.java
index 8ce225337..46b49d0db 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/EComparable.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/EComparable.java
@@ -34,46 +34,6 @@ public abstract class EComparable<D extends Comparable> extends Expr<D> {
         super(type);
     }
     
-    @Deprecated
-    public EBoolean after(D right) {
-        return gt(right);
-    }    
-
-    @Deprecated
-    public EBoolean after(Expr<D> right) {
-        return gt(right);
-    }
-    
-    @Deprecated
-    public EBoolean aoe(D right) {
-        return goe(right);
-    }    
-
-    @Deprecated
-    public EBoolean aoe(Expr<D> right) {
-        return goe(right);
-    }
-    
-    @Deprecated
-    public EBoolean before(D right) {
-        return lt(right);
-    }    
-
-    @Deprecated
-    public EBoolean before(Expr<D> right) {
-        return lt(right);
-    }
-    
-    @Deprecated
-    public EBoolean boe(D right) {
-        return loe(right);
-    }    
-
-    @Deprecated
-    public EBoolean boe(Expr<D> right) {
-        return loe(right);
-    }
-
     /**
      * Create a <code>this &gt; right</code> expression
      * 
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/EDate.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/EDate.java
index be8a3fc7c..d39c83732 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/EDate.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/EDate.java
@@ -20,7 +20,7 @@ import com.mysema.query.types.operation.Ops;
  * @param <D>
  */
 @SuppressWarnings("unchecked")
-public abstract class EDate<D extends Comparable> extends EComparable<D> {
+public abstract class EDate<D extends Comparable> extends EDateOrTime<D> {
     
     private ENumber<Integer> dayOfMonth;
     
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/EDateOrTime.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/EDateOrTime.java
new file mode 100644
index 000000000..f546a3ed3
--- /dev/null
+++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/EDateOrTime.java
@@ -0,0 +1,50 @@
+package com.mysema.query.types.expr;
+
+
+/**
+ * EDateOrTime is a supertype for Date/Time related types
+ * 
+ * @author tiwe
+ *
+ * @param <D>
+ */
+@SuppressWarnings("unchecked")
+public abstract class EDateOrTime<D extends Comparable> extends EComparable<D> {
+    
+    public EDateOrTime(Class<? extends D> type) {
+        super(type);
+    }
+    
+    public EBoolean after(D right) {
+        return gt(right);
+    }    
+
+    public EBoolean after(Expr<D> right) {
+        return gt(right);
+    }
+    
+    public EBoolean aoe(D right) {
+        return goe(right);
+    }    
+
+    public EBoolean aoe(Expr<D> right) {
+        return goe(right);
+    }
+    
+    public EBoolean before(D right) {
+        return lt(right);
+    }    
+
+    public EBoolean before(Expr<D> right) {
+        return lt(right);
+    }
+    
+    public EBoolean boe(D right) {
+        return loe(right);
+    }    
+
+    public EBoolean boe(Expr<D> right) {
+        return loe(right);
+    }
+    
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/EDateTime.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/EDateTime.java
index c503e3c6d..6bdc18418 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/EDateTime.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/EDateTime.java
@@ -20,7 +20,7 @@ import com.mysema.query.types.operation.Ops;
  * @param <D>
  */
 @SuppressWarnings("unchecked")
-public abstract class EDateTime<D extends Comparable> extends EComparable<D> {
+public abstract class EDateTime<D extends Comparable> extends EDateOrTime<D> {
 
     private ENumber<Integer> dayOfMonth;
     
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/ETime.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/ETime.java
index 2a975022e..f4ef68cf0 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/ETime.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/ETime.java
@@ -19,7 +19,7 @@ import com.mysema.query.types.operation.Ops;
  * @param <D>
  */
 @SuppressWarnings("unchecked")
-public abstract class ETime<D extends Comparable> extends EComparable<D> {
+public abstract class ETime<D extends Comparable> extends EDateOrTime<D> {
     
     private ENumber<Integer> hours;