From 7c7295959855b881da1809c67a18d738c417b563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jyri-Matti=20L=C3=A4hteenm=C3=A4ki?=
 <jyri-matti.lahteenmaki@solita.fi>
Date: Thu, 5 Mar 2015 08:32:52 +0200
Subject: [PATCH] parameterized EntityRepresentation

---
 src/main/java/fi/solita/utils/query/Dao.java  | 46 +++++++-------
 .../java/fi/solita/utils/query/IEntity.java   |  2 +-
 src/main/java/fi/solita/utils/query/Id.java   |  2 +-
 .../fi/solita/utils/query/QueryUtils.java     |  6 +-
 .../RelationCollectionAttribute.java          |  8 +--
 .../attributes/RelationListAttribute.java     |  8 +--
 .../attributes/RelationSetAttribute.java      |  8 +--
 .../attributes/RelationSingularAttribute.java |  8 +--
 .../utils/query/backend/TypeProvider.java     |  2 +-
 .../hibernate/HibernateTypeProvider.java      |  2 +-
 .../query/execution/JpaBasicQueries.java      | 26 ++++----
 .../query/execution/JpaCriteriaQueries.java   |  7 +--
 .../query/execution/JpaProjectionQueries.java | 17 +++--
 .../solita/utils/query/generation/Cast.java   | 10 +--
 .../query/generation/JpaCriteriaQuery.java    | 54 ++++++++--------
 .../utils/query/generation/NativeQuery.java   |  4 +-
 .../ConstructorsAsJpaProjections.java         | 62 ++++++++++++-------
 .../utils/query/projection/Project.java       | 54 ++++++++--------
 .../query/projection/ProjectionHelper.java    | 12 ++--
 .../projection/ProjectionResultUtil.java      | 20 +++++-
 .../solita/utils/query/projection/Select.java |  2 +-
 .../fi/solita/utils/query/Department.java     |  2 +-
 src/test/java/fi/solita/utils/query/Dto.java  | 10 +--
 .../java/fi/solita/utils/query/Employee.java  |  2 +-
 .../fi/solita/utils/query/GeneratorTest.java  | 17 ++++-
 .../fi/solita/utils/query/Municipality.java   |  2 +-
 .../fi/solita/utils/query/QueryTestBase.java  |  4 +-
 27 files changed, 224 insertions(+), 173 deletions(-)

diff --git a/src/main/java/fi/solita/utils/query/Dao.java b/src/main/java/fi/solita/utils/query/Dao.java
index 006dac6..d182314 100644
--- a/src/main/java/fi/solita/utils/query/Dao.java
+++ b/src/main/java/fi/solita/utils/query/Dao.java
@@ -44,75 +44,75 @@ public Dao(JpaBasicQueries jpaBasicQueries, JpaCriteriaQueries jpaCriteriaQuerie
         this.qlQueries = qlQueries;
     }
 
-    public <E extends IEntity & Identifiable<? extends Id<? super E>>> Id<E> persist(E entity) {
+    public <E extends IEntity<?> & Identifiable<? extends Id<? super E>>> Id<E> persist(E entity) {
         return jpaBasicQueries.persist(entity);
     }
 
-    public boolean isManaged(IEntity entity) {
+    public boolean isManaged(IEntity<?> entity) {
         return jpaBasicQueries.isManaged(entity);
     }
 
     /**
      * Removes the entity corresponding to <i>id</i> from the database. Fails if not found.
      */
-    public <E extends IEntity & Removable> void remove(Id<E> id) {
+    public <E extends IEntity<?> & Removable> void remove(Id<E> id) {
         jpaBasicQueries.remove(id);
     }
 
-    public <E extends IEntity & Identifiable<? extends Id<E>> & Removable> void removeAll(CriteriaQuery<E> query) {
+    public <E extends IEntity<?> & Identifiable<? extends Id<E>> & Removable> void removeAll(CriteriaQuery<E> query) {
         jpaBasicQueries.removeAll(query);
     }
 
     /**
      * Get the entity corresponding to <i>id</i>. Fails if not found.
      */
-    public <E extends IEntity> E get(Id<E> id) {
+    public <E extends IEntity<?>> E get(Id<E> id) {
         return jpaBasicQueries.get(id);
     }
 
     /**
      * Convert <i>id</i> to a proxy instance without hitting the database
      */
-    public <E extends IEntity> E toProxy(Id<E> id) {
+    public <E extends IEntity<?>> E toProxy(Id<E> id) {
         return jpaBasicQueries.toProxy(id);
     }
     
     /**
      * Convert <i>ids</i> to a proxy instances without hitting the database
      */
-    public <E extends IEntity> Iterable<E> toProxies(Iterable<? extends Id<E>> ids) {
+    public <E extends IEntity<?>> Iterable<E> toProxies(Iterable<? extends Id<E>> ids) {
         return jpaBasicQueries.toProxies(ids);
     }
 
-    public <E extends IEntity> Option<E> find(Id<E> id) {
+    public <E extends IEntity<?>> Option<E> find(Id<E> id) {
         return jpaBasicQueries.find(id);
     }
     
     /**
      * Get a proxy of <i>relation</i> from <i>entity</i> without hitting the database 
      */
-    public <E extends IEntity & Identifiable<? extends Id<? super E>>, T> T toProxy(E entity, SingularAttribute<? super E, T> relation) {
+    public <E extends IEntity<?> & Identifiable<? extends Id<? super E>>, T> T toProxy(E entity, SingularAttribute<? super E, T> relation) {
         return jpaBasicQueries.toProxy(entity, relation);
     }
     
     /**
      * Get proxies of <i>relation</i> from <i>entity</i>. THIS HITS THE DATABASE. 
      */
-    public <E extends IEntity & Identifiable<? extends Id<? super E>>, T extends IEntity> Collection<T> getProxies(E entity, CollectionAttribute<? super E, T> relation) {
+    public <E extends IEntity<?> & Identifiable<? extends Id<? super E>>, T extends IEntity<?>> Collection<T> getProxies(E entity, CollectionAttribute<? super E, T> relation) {
         return jpaBasicQueries.getProxies(entity, relation);
     }
     
     /**
      * Get proxies of <i>relation</i> from <i>entity</i>. THIS HITS THE DATABASE. 
      */
-    public <E extends IEntity & Identifiable<? extends Id<? super E>>, T extends IEntity> Set<T> getProxies(E entity, SetAttribute<? super E, T> relation) {
+    public <E extends IEntity<?> & Identifiable<? extends Id<? super E>>, T extends IEntity<?>> Set<T> getProxies(E entity, SetAttribute<? super E, T> relation) {
         return jpaBasicQueries.getProxies(entity, relation);
     }
     
     /**
      * Get proxies of <i>relation</i> from <i>entity</i>. THIS HITS THE DATABASE. 
      */
-    public <E extends IEntity & Identifiable<? extends Id<? super E>>, T extends IEntity> List<T> getProxies(E entity, ListAttribute<? super E, T> relation) {
+    public <E extends IEntity<?> & Identifiable<? extends Id<? super E>>, T extends IEntity<?>> List<T> getProxies(E entity, ListAttribute<? super E, T> relation) {
         return jpaBasicQueries.getProxies(entity, relation);
     }
 
@@ -150,7 +150,7 @@ public <T> Option<T> findFirst(CriteriaQuery<T> query) throws NoOrderingSpecifie
     /**
      * Get the first row of <i>query</i>, if any
      */
-    public <E extends IEntity> Option<E> findFirst(CriteriaQuery<E> query, Iterable<? extends Order<? super E,?>> ordering) {
+    public <E> Option<E> findFirst(CriteriaQuery<E> query, Iterable<? extends Order<? super E,?>> ordering) {
         return jpaCriteriaQueries.findFirst(query, ordering);
     }
 
@@ -165,14 +165,14 @@ public <T> List<T> getMany(CriteriaQuery<T> query, Page page) throws NoOrderingS
         return jpaCriteriaQueries.getMany(query, page);
     }
 
-    public <E extends IEntity> List<E> getMany(CriteriaQuery<E> query, Iterable<? extends Order<? super E, ?>> ordering) {
+    public <E> List<E> getMany(CriteriaQuery<E> query, Iterable<? extends Order<? super E, ?>> ordering) {
         return jpaCriteriaQueries.getMany(query, ordering);
     }
 
     /**
      * Get rows of <i>query</i> considering <i>page</i>
      */
-    public <E extends IEntity> List<E> getMany(CriteriaQuery<E> query, Page page, Iterable<? extends Order<? super E, ?>> ordering) {
+    public <E> List<E> getMany(CriteriaQuery<E> query, Page page, Iterable<? extends Order<? super E, ?>> ordering) {
         return jpaCriteriaQueries.getMany(query, page, ordering);
     }
 
@@ -181,56 +181,56 @@ public <E extends IEntity> List<E> getMany(CriteriaQuery<E> query, Page page, It
     /**
      * Get the single row of <i>query</i>, projecting the result. Fails if multiple or no rows found.
      */
-    public <E extends IEntity, R> R get(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> projection) throws NoResultException, NonUniqueResultException {
+    public <E, R> R get(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> projection) throws NoResultException, NonUniqueResultException {
         return jpaProjectionQueries.get(query, projection);
     }
 
     /**
      * Get the only row of <i>query</i>, if any, projecting the result. Fails if multiple or no rows found.
      */
-    public <E extends IEntity, R> Option<R> find(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> projection) throws NonUniqueResultException {
+    public <E, R> Option<R> find(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> projection) throws NonUniqueResultException {
         return jpaProjectionQueries.find(query, projection);
     }
 
     /**
      * Get the first row of <i>query</i>, if any, projecting the result. Requires <i>query</i> to have ordering.
      */
-    public <E extends IEntity,R> Option<R> findFirst(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> projection) {
+    public <E,R> Option<R> findFirst(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> projection) {
         return jpaProjectionQueries.findFirst(query, projection);
     }
 
     /**
      * Get the first row of <i>query</i>, if any, projecting the result
      */
-    public <E extends IEntity,R> Option<R> findFirst(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> projection, Iterable<? extends Order<? super E,?>> ordering) {
+    public <E,R> Option<R> findFirst(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> projection, Iterable<? extends Order<? super E,?>> ordering) {
         return jpaProjectionQueries.findFirst(query, projection, ordering);
     }
 
     /**
      * Get all rows of <i>query</i>, projecting the results
      */
-    public <E extends IEntity,R> Collection<R> getMany(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> projection) {
+    public <E,R> Collection<R> getMany(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> projection) {
         return jpaProjectionQueries.getMany(query, projection);
     }
 
     /**
      * Get rows of <i>query</i> considering <i>page</i>, projecting the results. Requires <i>query</i> to have ordering.
      */
-    public <E extends IEntity,R> List<R> getMany(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> projection, Page page) throws NoOrderingSpecifiedException {
+    public <E,R> List<R> getMany(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> projection, Page page) throws NoOrderingSpecifiedException {
         return jpaProjectionQueries.getMany(query, projection, page);
     }
 
     /**
      * Get all rows of <i>query</i>, projecting the results
      */
-    public <E extends IEntity,R> List<R> getMany(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> projection, Iterable<? extends Order<? super E,?>> ordering) {
+    public <E,R> List<R> getMany(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> projection, Iterable<? extends Order<? super E,?>> ordering) {
         return jpaProjectionQueries.getMany(query, projection, ordering);
     }
 
     /**
      * Get rows of <i>query</i> considering <i>page</i>, projecting the results
      */
-    public <E extends IEntity,R> List<R> getMany(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> projection, Page page, Iterable<? extends Order<? super E,?>> ordering) {
+    public <E,R> List<R> getMany(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> projection, Page page, Iterable<? extends Order<? super E,?>> ordering) {
         return jpaProjectionQueries.getMany(query, projection, page, ordering);
     }
 
diff --git a/src/main/java/fi/solita/utils/query/IEntity.java b/src/main/java/fi/solita/utils/query/IEntity.java
index 0a34171..272e4c1 100644
--- a/src/main/java/fi/solita/utils/query/IEntity.java
+++ b/src/main/java/fi/solita/utils/query/IEntity.java
@@ -1,5 +1,5 @@
 package fi.solita.utils.query;
 
 
-public interface IEntity extends EntityRepresentation {
+public interface IEntity<T> extends EntityRepresentation<T> {
 }
diff --git a/src/main/java/fi/solita/utils/query/Id.java b/src/main/java/fi/solita/utils/query/Id.java
index 6a9eb33..5e7190b 100644
--- a/src/main/java/fi/solita/utils/query/Id.java
+++ b/src/main/java/fi/solita/utils/query/Id.java
@@ -2,6 +2,6 @@
 
 import java.io.Serializable;
 
-public interface Id<T> extends EntityRepresentation, Serializable {
+public interface Id<T> extends EntityRepresentation<T>, Serializable {
     Class<T> getOwningClass();
 }
diff --git a/src/main/java/fi/solita/utils/query/QueryUtils.java b/src/main/java/fi/solita/utils/query/QueryUtils.java
index b3605ea..c170eaa 100644
--- a/src/main/java/fi/solita/utils/query/QueryUtils.java
+++ b/src/main/java/fi/solita/utils/query/QueryUtils.java
@@ -4,11 +4,11 @@
 import static fi.solita.utils.functional.Collections.newList;
 import static fi.solita.utils.functional.Collections.newListOfSize;
 import static fi.solita.utils.functional.Functional.cons;
-import static fi.solita.utils.functional.Functional.head;
-import static fi.solita.utils.functional.Functional.isEmpty;
 import static fi.solita.utils.functional.Functional.flatMap;
 import static fi.solita.utils.functional.Functional.forall;
 import static fi.solita.utils.functional.Functional.grouped;
+import static fi.solita.utils.functional.Functional.head;
+import static fi.solita.utils.functional.Functional.isEmpty;
 import static fi.solita.utils.functional.Functional.map;
 import static fi.solita.utils.query.attributes.AttributeProxy.unwrap;
 
@@ -155,7 +155,7 @@ public static <T> void checkOrdering(CriteriaQuery<T> query, Page page) throws N
         }
     }
     
-    public static final <E extends IEntity> CriteriaQuery<E> applyOrder(CriteriaQuery<E> query, final Path<E> selection, Iterable<? extends fi.solita.utils.query.Order<? super E, ?>> orderings, final CriteriaBuilder cb) {
+    public static final <E> CriteriaQuery<E> applyOrder(CriteriaQuery<E> query, final Path<E> selection, Iterable<? extends fi.solita.utils.query.Order<? super E, ?>> orderings, final CriteriaBuilder cb) {
         if (!isEmpty(orderings)) {
             query.orderBy(newList(map(QueryUtils_.<E>order2jpaOrder().ap(cb, selection), orderings)));
         } else {
diff --git a/src/main/java/fi/solita/utils/query/attributes/RelationCollectionAttribute.java b/src/main/java/fi/solita/utils/query/attributes/RelationCollectionAttribute.java
index 3ba764d..b6bd4ff 100644
--- a/src/main/java/fi/solita/utils/query/attributes/RelationCollectionAttribute.java
+++ b/src/main/java/fi/solita/utils/query/attributes/RelationCollectionAttribute.java
@@ -11,16 +11,16 @@
 import fi.solita.utils.query.meta.MetaJpaConstructor;
 
 class RelationCollectionAttribute<E, R, A extends Attribute<E, Collection<R>> & Bindable<R>> extends PluralAttributeProxy<E, Collection<R>, R, A> implements CollectionAttribute<E,R>, AdditionalQueryPerformingAttribute {
-    private final MetaJpaConstructor<? extends IEntity, R, ?> constructor;
+    private final MetaJpaConstructor<? extends IEntity<?>, R, ?> constructor;
 
     @SuppressWarnings("unchecked")
-    public <E2 extends IEntity> RelationCollectionAttribute(CollectionAttribute<? super E, ? super E2> attribute, MetaJpaConstructor<? super E2, R, ?> constructor) {
+    public <E2 extends IEntity<?>> RelationCollectionAttribute(CollectionAttribute<? super E, ? super E2> attribute, MetaJpaConstructor<? super E2, R, ?> constructor) {
         super((A)(Object)attribute, CollectionType.COLLECTION, (Type<R>)attribute.getElementType());
-        this.constructor = (MetaJpaConstructor<? extends IEntity, R, ?>) constructor;
+        this.constructor = (MetaJpaConstructor<? extends IEntity<?>, R, ?>) constructor;
     }
 
     @Override
-    public MetaJpaConstructor<? extends IEntity, R, ?> getConstructor() {
+    public MetaJpaConstructor<? extends IEntity<?>, R, ?> getConstructor() {
         return constructor;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/fi/solita/utils/query/attributes/RelationListAttribute.java b/src/main/java/fi/solita/utils/query/attributes/RelationListAttribute.java
index f1907c0..9cd0243 100644
--- a/src/main/java/fi/solita/utils/query/attributes/RelationListAttribute.java
+++ b/src/main/java/fi/solita/utils/query/attributes/RelationListAttribute.java
@@ -11,16 +11,16 @@
 import fi.solita.utils.query.meta.MetaJpaConstructor;
 
 class RelationListAttribute<E, R, A extends Attribute<E, List<R>> & Bindable<R>> extends PluralAttributeProxy<E, List<R>, R, A> implements ListAttribute<E,R>, AdditionalQueryPerformingAttribute {
-    private final MetaJpaConstructor<? extends IEntity, R, ?> constructor;
+    private final MetaJpaConstructor<? extends IEntity<?>, R, ?> constructor;
 
     @SuppressWarnings("unchecked")
-    public <E2 extends IEntity> RelationListAttribute(ListAttribute<? super E, ? super E2> attribute, MetaJpaConstructor<? super E2, R, ?> constructor) {
+    public <E2 extends IEntity<?>> RelationListAttribute(ListAttribute<? super E, ? super E2> attribute, MetaJpaConstructor<? super E2, R, ?> constructor) {
         super((A)(Object)attribute, CollectionType.LIST, (Type<R>)attribute.getElementType());
-        this.constructor = (MetaJpaConstructor<? extends IEntity, R, ?>) constructor;
+        this.constructor = (MetaJpaConstructor<? extends IEntity<?>, R, ?>) constructor;
     }
 
     @Override
-    public MetaJpaConstructor<? extends IEntity, R, ?> getConstructor() {
+    public MetaJpaConstructor<? extends IEntity<?>, R, ?> getConstructor() {
         return constructor;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/fi/solita/utils/query/attributes/RelationSetAttribute.java b/src/main/java/fi/solita/utils/query/attributes/RelationSetAttribute.java
index 2267547..34ceb7e 100644
--- a/src/main/java/fi/solita/utils/query/attributes/RelationSetAttribute.java
+++ b/src/main/java/fi/solita/utils/query/attributes/RelationSetAttribute.java
@@ -11,16 +11,16 @@
 import fi.solita.utils.query.meta.MetaJpaConstructor;
 
 class RelationSetAttribute<E, R, A extends Attribute<E, Set<R>> & Bindable<R>> extends PluralAttributeProxy<E, Set<R>, R, A> implements SetAttribute<E,R>, AdditionalQueryPerformingAttribute {
-    private final MetaJpaConstructor<? extends IEntity, R, ?> constructor;
+    private final MetaJpaConstructor<? extends IEntity<?>, R, ?> constructor;
 
     @SuppressWarnings("unchecked")
-    public <E2 extends IEntity> RelationSetAttribute(SetAttribute<? super E, ? super E2> attribute, MetaJpaConstructor<? super E2, R, ?> constructor) {
+    public <E2 extends IEntity<?>> RelationSetAttribute(SetAttribute<? super E, ? super E2> attribute, MetaJpaConstructor<? super E2, R, ?> constructor) {
         super((A)(Object)attribute, CollectionType.SET, (Type<R>)attribute.getElementType());
-        this.constructor = (MetaJpaConstructor<? extends IEntity, R, ?>) constructor;
+        this.constructor = (MetaJpaConstructor<? extends IEntity<?>, R, ?>) constructor;
     }
 
     @Override
-    public MetaJpaConstructor<? extends IEntity, R, ?> getConstructor() {
+    public MetaJpaConstructor<? extends IEntity<?>, R, ?> getConstructor() {
         return constructor;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/fi/solita/utils/query/attributes/RelationSingularAttribute.java b/src/main/java/fi/solita/utils/query/attributes/RelationSingularAttribute.java
index 5b49c26..d661812 100644
--- a/src/main/java/fi/solita/utils/query/attributes/RelationSingularAttribute.java
+++ b/src/main/java/fi/solita/utils/query/attributes/RelationSingularAttribute.java
@@ -6,16 +6,16 @@
 import fi.solita.utils.query.meta.MetaJpaConstructor;
 
 class RelationSingularAttribute<E, R> extends SingularAttributeProxy<E, R> implements AdditionalQueryPerformingAttribute {
-    private final MetaJpaConstructor<? extends IEntity, R, ?> constructor;
+    private final MetaJpaConstructor<? extends IEntity<?>, R, ?> constructor;
 
     @SuppressWarnings("unchecked")
-    public <E2 extends IEntity> RelationSingularAttribute(SingularAttribute<? super E, ? super E2> attribute, MetaJpaConstructor<? super E2, R, ?> constructor) {
+    public <E2 extends IEntity<?>> RelationSingularAttribute(SingularAttribute<? super E, ? super E2> attribute, MetaJpaConstructor<? super E2, R, ?> constructor) {
         super((SingularAttribute<E, R>) attribute);
-        this.constructor = (MetaJpaConstructor<? extends IEntity, R, ?>) constructor;
+        this.constructor = (MetaJpaConstructor<? extends IEntity<?>, R, ?>) constructor;
     }
 
     @Override
-    public MetaJpaConstructor<? extends IEntity, R, ?> getConstructor() {
+    public MetaJpaConstructor<? extends IEntity<?>, R, ?> getConstructor() {
         return constructor;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/fi/solita/utils/query/backend/TypeProvider.java b/src/main/java/fi/solita/utils/query/backend/TypeProvider.java
index bef69db..2ccfc3a 100644
--- a/src/main/java/fi/solita/utils/query/backend/TypeProvider.java
+++ b/src/main/java/fi/solita/utils/query/backend/TypeProvider.java
@@ -9,5 +9,5 @@ public interface TypeProvider {
     <ID extends Serializable, T extends Identifiable<ID>> Type<ID> idType(Class<T> entityType);
     <T> Type<T> type(Class<T> clazz);
     
-    Class<?> getEntityClass(IEntity entity);
+    Class<?> getEntityClass(IEntity<?> entity);
 }
diff --git a/src/main/java/fi/solita/utils/query/backend/hibernate/HibernateTypeProvider.java b/src/main/java/fi/solita/utils/query/backend/hibernate/HibernateTypeProvider.java
index 44ddc20..87e6131 100644
--- a/src/main/java/fi/solita/utils/query/backend/hibernate/HibernateTypeProvider.java
+++ b/src/main/java/fi/solita/utils/query/backend/hibernate/HibernateTypeProvider.java
@@ -166,7 +166,7 @@ public <T> Type<T> type(final Class<T> clazz) {
     }
 
     @Override
-    public Class<?> getEntityClass(IEntity entity) {
+    public Class<?> getEntityClass(IEntity<?> entity) {
         return HibernateProxyHelper.getClassWithoutInitializingProxy(entity);
     }
 }
diff --git a/src/main/java/fi/solita/utils/query/execution/JpaBasicQueries.java b/src/main/java/fi/solita/utils/query/execution/JpaBasicQueries.java
index d225ea2..c836ad6 100644
--- a/src/main/java/fi/solita/utils/query/execution/JpaBasicQueries.java
+++ b/src/main/java/fi/solita/utils/query/execution/JpaBasicQueries.java
@@ -58,20 +58,20 @@ public JpaBasicQueries(Function0<EntityManager> em, ProjectionHelper projectionS
     }
 
     @SuppressWarnings("unchecked")
-    public <E extends IEntity & Identifiable<? extends Id<? super E>>> Id<E> persist(E entity) {
+    public <E extends IEntity<?> & Identifiable<? extends Id<? super E>>> Id<E> persist(E entity) {
         em.apply().persist(entity);
         return (Id<E>) entity.getId();
     }
 
-    public boolean isManaged(IEntity entity) {
+    public boolean isManaged(IEntity<?> entity) {
         return em.apply().contains(entity);
     }
 
-    public <E extends IEntity & Removable> void remove(Id<E> id) {
+    public <E extends IEntity<?> & Removable> void remove(Id<E> id) {
         em.apply().remove(toProxy(id));
     }
 
-    public <E extends IEntity & Identifiable<? extends Id<E>> & Removable> void removeAll(CriteriaQuery<E> query) {
+    public <E extends IEntity<?> & Identifiable<? extends Id<E>> & Removable> void removeAll(CriteriaQuery<E> query) {
         CriteriaQuery<Object> q = em.apply().getCriteriaBuilder().createQuery();
         JpaCriteriaCopy.copyCriteriaWithoutSelect(query, q, em.apply().getCriteriaBuilder());
         From<?,E> selection = resolveSelection(query, q);
@@ -85,7 +85,7 @@ public <E extends IEntity & Identifiable<? extends Id<E>> & Removable> void remo
         }
     }
 
-    public <E extends IEntity> E get(Id<E> id) {
+    public <E extends IEntity<?>> E get(Id<E> id) {
         E ret = em.apply().find(id.getOwningClass(), id);
         if (ret == null) {
             throw new EntityNotFoundException("Entity of type " + id.getOwningClass().getName() + " with id " + id + " not found.");
@@ -93,15 +93,15 @@ public <E extends IEntity> E get(Id<E> id) {
         return ret;
     }
 
-    public <E extends IEntity> E toProxy(Id<E> id) {
+    public <E extends IEntity<?>> E toProxy(Id<E> id) {
         return em.apply().getReference(id.getOwningClass(), id);
     }
     
-    public <E extends IEntity> Iterable<E> toProxies(Iterable<? extends Id<E>> ids) {
+    public <E extends IEntity<?>> Iterable<E> toProxies(Iterable<? extends Id<E>> ids) {
         return map(JpaBasicQueries_.<E>toProxy().ap(this), ids);
     }
 
-    public <E extends IEntity> Option<E> find(Id<E> id) {
+    public <E extends IEntity<?>> Option<E> find(Id<E> id) {
         return Option.of(em.apply().find(id.getOwningClass(), id));
     }
 
@@ -110,7 +110,7 @@ public <E extends IEntity> Option<E> find(Id<E> id) {
      * (<i>entity</i> already has an ID for a ToOne relation, so this is possible)
      */
     @SuppressWarnings("unchecked")
-    public <E extends IEntity & Identifiable<? extends Id<? super E>>, T> T toProxy(E entity, SingularAttribute<? super E, T> relation) {
+    public <E extends Identifiable<? extends Id<? super E>>, T> T toProxy(E entity, SingularAttribute<? super E, T> relation) {
         checkOptionalAttributes(relation);
         
         Field field = (Field)relation.getJavaMember();
@@ -131,20 +131,20 @@ public <E extends IEntity & Identifiable<? extends Id<? super E>>, T> T toProxy(
         }
     }
     
-    public <E extends IEntity & Identifiable<? extends Id<? super E>>, T extends IEntity> Collection<T> getProxies(E entity, CollectionAttribute<? super E, T> relation) {
+    public <E extends IEntity<?> & Identifiable<? extends Id<? super E>>, T extends IEntity<?>> Collection<T> getProxies(E entity, CollectionAttribute<? super E, T> relation) {
         return newList(getProxiesIt(entity, relation));
     }
     
-    public <E extends IEntity & Identifiable<? extends Id<? super E>>, T extends IEntity> Set<T> getProxies(E entity, SetAttribute<? super E, T> relation) {
+    public <E extends IEntity<?> & Identifiable<? extends Id<? super E>>, T extends IEntity<?>> Set<T> getProxies(E entity, SetAttribute<? super E, T> relation) {
         return newSet(getProxiesIt(entity, relation));
     }
     
-    public <E extends IEntity & Identifiable<? extends Id<? super E>>, T extends IEntity> List<T> getProxies(E entity, ListAttribute<? super E, T> relation) {
+    public <E extends IEntity<?> & Identifiable<? extends Id<? super E>>, T extends IEntity<?>> List<T> getProxies(E entity, ListAttribute<? super E, T> relation) {
         return newList(getProxiesIt(entity, relation));
     }
     
     @SuppressWarnings("unchecked")
-    private <E extends IEntity & Identifiable<? extends Id<? super E>>, T extends IEntity, C extends Collection<T>> Iterable<T> getProxiesIt(E entity, PluralAttribute<? super E, C, T> relation) {
+    private <E extends IEntity<?> & Identifiable<? extends Id<? super E>>, T extends IEntity<?>, C extends Collection<T>> Iterable<T> getProxiesIt(E entity, PluralAttribute<? super E, C, T> relation) {
         SingularAttribute<T, Id<T>> id = QueryUtils.id(relation.getBindableJavaType(), em.apply());
         CriteriaQuery<Id<T>> query = em.apply().getCriteriaBuilder().createQuery(id.getBindableJavaType());
         Root<E> root = (Root<E>) query.from(typeProvider.getEntityClass(entity));
diff --git a/src/main/java/fi/solita/utils/query/execution/JpaCriteriaQueries.java b/src/main/java/fi/solita/utils/query/execution/JpaCriteriaQueries.java
index d747933..ee727f6 100644
--- a/src/main/java/fi/solita/utils/query/execution/JpaCriteriaQueries.java
+++ b/src/main/java/fi/solita/utils/query/execution/JpaCriteriaQueries.java
@@ -21,7 +21,6 @@
 
 import fi.solita.utils.functional.Function0;
 import fi.solita.utils.functional.Option;
-import fi.solita.utils.query.IEntity;
 import fi.solita.utils.query.JpaCriteriaCopy;
 import fi.solita.utils.query.Order;
 import fi.solita.utils.query.Page;
@@ -67,7 +66,7 @@ public <T> Option<T> findFirst(CriteriaQuery<T> query) throws NoOrderingSpecifie
         return headOption(getMany(query, Page.FIRST.withSize(1)));
     }
 
-    public <E extends IEntity> Option<E> findFirst(CriteriaQuery<E> query, Iterable<? extends Order<? super E,?>> ordering) {
+    public <E> Option<E> findFirst(CriteriaQuery<E> query, Iterable<? extends Order<? super E,?>> ordering) {
         return headOption(getMany(query, Page.FIRST.withSize(1), ordering));
     }
 
@@ -81,11 +80,11 @@ public <T> List<T> getMany(CriteriaQuery<T> query, Page page) throws NoOrderingS
         return queryExecutor.getMany(query, page);
     }
 
-    public <E extends IEntity> List<E> getMany(CriteriaQuery<E> query, Iterable<? extends Order<? super E, ?>> ordering) {
+    public <E> List<E> getMany(CriteriaQuery<E> query, Iterable<? extends Order<? super E, ?>> ordering) {
         return getMany(query, Page.NoPaging, ordering);
     }
 
-    public <E extends IEntity> List<E> getMany(CriteriaQuery<E> query, Page page, Iterable<? extends Order<? super E, ?>> ordering) {
+    public <E> List<E> getMany(CriteriaQuery<E> query, Page page, Iterable<? extends Order<? super E, ?>> ordering) {
         return queryExecutor.getMany(applyOrder(query, resolveSelectionPath(query), ordering, em.apply().getCriteriaBuilder()), page);
     }
 }
diff --git a/src/main/java/fi/solita/utils/query/execution/JpaProjectionQueries.java b/src/main/java/fi/solita/utils/query/execution/JpaProjectionQueries.java
index a576158..06288b6 100644
--- a/src/main/java/fi/solita/utils/query/execution/JpaProjectionQueries.java
+++ b/src/main/java/fi/solita/utils/query/execution/JpaProjectionQueries.java
@@ -21,7 +21,6 @@
 
 import fi.solita.utils.functional.Function0;
 import fi.solita.utils.functional.Option;
-import fi.solita.utils.query.IEntity;
 import fi.solita.utils.query.JpaCriteriaCopy;
 import fi.solita.utils.query.Order;
 import fi.solita.utils.query.Page;
@@ -45,7 +44,7 @@ public JpaProjectionQueries(Function0<EntityManager> em, ProjectionHelper projec
         this.queryExecutor = queryExecutor;
     }
 
-    public <E extends IEntity, R> R get(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> constructor) throws NoResultException, NonUniqueResultException {
+    public <E, R> R get(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> constructor) throws NoResultException, NonUniqueResultException {
         CriteriaQuery<Object> q = em.apply().getCriteriaBuilder().createQuery();
         JpaCriteriaCopy.copyCriteriaWithoutSelect(query, q, em.apply().getCriteriaBuilder());
         From<?,E> selection = QueryUtils.resolveSelection(query, q);
@@ -56,7 +55,7 @@ public <E extends IEntity, R> R get(CriteriaQuery<E> query, MetaJpaConstructor<?
         return head(projectionSupport.finalizeProjectingQuery(constructor, res));
     }
 
-    public <E extends IEntity, R> Option<R> find(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> constructor) throws NonUniqueResultException {
+    public <E, R> Option<R> find(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> constructor) throws NonUniqueResultException {
         try {
             return Some(get(query, constructor));
         } catch (NoResultException e) {
@@ -64,30 +63,30 @@ public <E extends IEntity, R> Option<R> find(CriteriaQuery<E> query, MetaJpaCons
         }
     }
 
-    public <E extends IEntity,R> Option<R> findFirst(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> constructor) throws NoOrderingSpecifiedException {
+    public <E,R> Option<R> findFirst(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> constructor) throws NoOrderingSpecifiedException {
         return headOption(getMany(query, constructor, Page.FIRST.withSize(1)));
     }
 
-    public <E extends IEntity,R> Option<R> findFirst(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> constructor, Iterable<? extends Order<? super E,?>> ordering) {
+    public <E,R> Option<R> findFirst(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> constructor, Iterable<? extends Order<? super E,?>> ordering) {
         return headOption(getMany(query, constructor, Page.FIRST.withSize(1), ordering));
     }
 
-    public <E extends IEntity,R> Collection<R> getMany(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> constructor) throws NoOrderingSpecifiedException {
+    public <E,R> Collection<R> getMany(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> constructor) throws NoOrderingSpecifiedException {
         return getMany(query, constructor, Page.NoPaging);
     }
 
-    public <E extends IEntity,R> List<R> getMany(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> constructor, Page page) throws NoOrderingSpecifiedException {
+    public <E,R> List<R> getMany(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> constructor, Page page) throws NoOrderingSpecifiedException {
         QueryUtils.applyOrder(query, resolveSelection(query), em.apply().getCriteriaBuilder());
         QueryUtils.checkOrdering(query, page);
         List<Order<? super E,?>> noOrdering = Collections.emptyList();
         return getMany(query, constructor, page, noOrdering);
     }
 
-    public <E extends IEntity,R> List<R> getMany(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> constructor, Iterable<? extends Order<? super E,?>> ordering) {
+    public <E,R> List<R> getMany(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> constructor, Iterable<? extends Order<? super E,?>> ordering) {
         return getMany(query, constructor, Page.NoPaging, ordering);
     }
 
-    public <E extends IEntity,R> List<R> getMany(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> constructor, Page page, Iterable<? extends Order<? super E,?>> ordering) {
+    public <E,R> List<R> getMany(CriteriaQuery<E> query, MetaJpaConstructor<? super E,R, ?> constructor, Page page, Iterable<? extends Order<? super E,?>> ordering) {
         CriteriaQuery<Object> q = em.apply().getCriteriaBuilder().createQuery();
         JpaCriteriaCopy.copyCriteriaWithoutSelect(query, q, em.apply().getCriteriaBuilder());
         From<?,E> selection = resolveSelection(query, q);
diff --git a/src/main/java/fi/solita/utils/query/generation/Cast.java b/src/main/java/fi/solita/utils/query/generation/Cast.java
index db9239b..ee73a3e 100644
--- a/src/main/java/fi/solita/utils/query/generation/Cast.java
+++ b/src/main/java/fi/solita/utils/query/generation/Cast.java
@@ -38,27 +38,27 @@ public static <E, T> SingularAttribute<E, Option<T>> optionalSubtype(SingularAtt
     }
 
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity & Identifiable<?>, T> SingularAttribute<E, T> castSuper(SingularAttribute<? extends E, T> attribute) {
+    public static <E extends IEntity<?> & Identifiable<?>, T> SingularAttribute<E, T> castSuper(SingularAttribute<? extends E, T> attribute) {
         return (SingularAttribute<E, T>) attribute;
     }
 
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity & Identifiable<?>, T> SingularAttribute<E, T> cast(SingularAttribute<? super E, ? super T> attribute) {
+    public static <E extends IEntity<?> & Identifiable<?>, T> SingularAttribute<E, T> cast(SingularAttribute<? super E, ? super T> attribute) {
         return (SingularAttribute<E, T>) attribute;
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity & Identifiable<?>, T> CollectionAttribute<E, T> cast(CollectionAttribute<? super E, ? super T> attribute) {
+    public static <E extends IEntity<?> & Identifiable<?>, T> CollectionAttribute<E, T> cast(CollectionAttribute<? super E, ? super T> attribute) {
         return (CollectionAttribute<E, T>) attribute;
     }
 
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity & Identifiable<?>, T> SetAttribute<E, T> cast(SetAttribute<? super E, ? super T> attribute) {
+    public static <E extends IEntity<?> & Identifiable<?>, T> SetAttribute<E, T> cast(SetAttribute<? super E, ? super T> attribute) {
         return (SetAttribute<E, T>) attribute;
     }
 
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity & Identifiable<?>, T> ListAttribute<E, T> cast(ListAttribute<? super E, ? super T> attribute) {
+    public static <E extends IEntity<?> & Identifiable<?>, T> ListAttribute<E, T> cast(ListAttribute<? super E, ? super T> attribute) {
         return (ListAttribute<E, T>) attribute;
     }
 }
diff --git a/src/main/java/fi/solita/utils/query/generation/JpaCriteriaQuery.java b/src/main/java/fi/solita/utils/query/generation/JpaCriteriaQuery.java
index de222e2..65e075c 100644
--- a/src/main/java/fi/solita/utils/query/generation/JpaCriteriaQuery.java
+++ b/src/main/java/fi/solita/utils/query/generation/JpaCriteriaQuery.java
@@ -31,18 +31,18 @@ public JpaCriteriaQuery(Function0<EntityManager> em, TypeProvider typeProvider)
         this.typeProvider = typeProvider;
     }
 
-    public <E extends IEntity> CriteriaQuery<E> single(Id<E> id) {
+    public <E extends IEntity<?>> CriteriaQuery<E> single(Id<E> id) {
         CriteriaQuery<E> query = em.apply().getCriteriaBuilder().createQuery(id.getOwningClass());
         Root<E> root = query.from(id.getOwningClass());
         return query.where(em.apply().getCriteriaBuilder().equal(root.get(QueryUtils.id(id.getOwningClass(), em.apply())), id));
     }
 
-    public <E extends IEntity> CriteriaQuery<E> all(Class<E> entityClass) {
+    public <E extends IEntity<?>> CriteriaQuery<E> all(Class<E> entityClass) {
         CriteriaQuery<E> query = em.apply().getCriteriaBuilder().createQuery(entityClass);
         return query.select(query.from(entityClass));
     }
     
-    public <E extends IEntity, A extends IEntity> CriteriaQuery<E> matching(SingularAttribute<E,? super A> first, Id<A> firstId) {
+    public <E, A> CriteriaQuery<E> matching(SingularAttribute<E,? super A> first, Id<A> firstId) {
         CriteriaBuilder cb = em.apply().getCriteriaBuilder();
         Class<E> rootType = first.getDeclaringType().getJavaType();
         CriteriaQuery<E> query = cb.createQuery(rootType);
@@ -51,7 +51,7 @@ public <E extends IEntity, A extends IEntity> CriteriaQuery<E> matching(Singular
         return query;
     }
     
-    public <E extends IEntity, A> CriteriaQuery<E> matching(SingularAttribute<E,? super A> relation, A value) {
+    public <E, A> CriteriaQuery<E> matching(SingularAttribute<E,? super A> relation, A value) {
         CriteriaBuilder cb = em.apply().getCriteriaBuilder();
         Class<E> rootType = relation.getDeclaringType().getJavaType();
         CriteriaQuery<E> query = cb.createQuery(rootType);
@@ -60,7 +60,7 @@ public <E extends IEntity, A> CriteriaQuery<E> matching(SingularAttribute<E,? su
         return query;
     }
     
-    public <E extends IEntity, A extends IEntity, B extends IEntity> CriteriaQuery<E> matching(SingularAttribute<E,? super A> first, SingularAttribute<E,? super B> second, Id<A> firstId, Id<B> secondId) {
+    public <E, A, B> CriteriaQuery<E> matching(SingularAttribute<E,? super A> first, SingularAttribute<E,? super B> second, Id<A> firstId, Id<B> secondId) {
         CriteriaBuilder cb = em.apply().getCriteriaBuilder();
         Class<E> rootType = first.getDeclaringType().getJavaType();
         CriteriaQuery<E> query = cb.createQuery(rootType);
@@ -70,7 +70,7 @@ public <E extends IEntity, A extends IEntity, B extends IEntity> CriteriaQuery<E
         return query;
     }
     
-    public <E extends IEntity, A, B> CriteriaQuery<E> matching(SingularAttribute<E,? super A> first, SingularAttribute<E,? super B> second, A firstValue, B secondValue) {
+    public <E, A, B> CriteriaQuery<E> matching(SingularAttribute<E,? super A> first, SingularAttribute<E,? super B> second, A firstValue, B secondValue) {
         CriteriaBuilder cb = em.apply().getCriteriaBuilder();
         Class<E> rootType = first.getDeclaringType().getJavaType();
         CriteriaQuery<E> query = cb.createQuery(rootType);
@@ -80,7 +80,7 @@ public <E extends IEntity, A, B> CriteriaQuery<E> matching(SingularAttribute<E,?
         return query;
     }
     
-    public <E extends IEntity, A extends IEntity, B extends IEntity, C extends IEntity> CriteriaQuery<E> matching(SingularAttribute<E,? super A> first, SingularAttribute<E,? super B> second, SingularAttribute<E,? super C> third, Id<A> firstId, Id<B> secondId, Id<C> thirdId) {
+    public <E, A, B, C> CriteriaQuery<E> matching(SingularAttribute<E,? super A> first, SingularAttribute<E,? super B> second, SingularAttribute<E,? super C> third, Id<A> firstId, Id<B> secondId, Id<C> thirdId) {
         CriteriaBuilder cb = em.apply().getCriteriaBuilder();
         Class<E> rootType = first.getDeclaringType().getJavaType();
         CriteriaQuery<E> query = cb.createQuery(rootType);
@@ -91,7 +91,7 @@ public <E extends IEntity, A extends IEntity, B extends IEntity, C extends IEnti
         return query;
     }
     
-    public <E extends IEntity, A, B, C> CriteriaQuery<E> matching(SingularAttribute<E,? super A> first, SingularAttribute<E,? super B> second, SingularAttribute<E,? super C> third, A firstValue, B secondValue, C thirdValue) {
+    public <E, A, B, C> CriteriaQuery<E> matching(SingularAttribute<E,? super A> first, SingularAttribute<E,? super B> second, SingularAttribute<E,? super C> third, A firstValue, B secondValue, C thirdValue) {
         CriteriaBuilder cb = em.apply().getCriteriaBuilder();
         Class<E> rootType = first.getDeclaringType().getJavaType();
         CriteriaQuery<E> query = cb.createQuery(rootType);
@@ -103,7 +103,7 @@ public <E extends IEntity, A, B, C> CriteriaQuery<E> matching(SingularAttribute<
     }
 
     @SuppressWarnings("unchecked")
-    public <E extends IEntity> CriteriaQuery<E> ofIds(Iterable<? extends Id<? super E>> ids, Class<E> entityClass) {
+    public <E> CriteriaQuery<E> ofIds(Iterable<? extends Id<? super E>> ids, Class<E> entityClass) {
         CriteriaQuery<Object> query = em.apply().getCriteriaBuilder().createQuery();
         if (ids.iterator().hasNext()) {
             Root<E> root = query.from(entityClass);
@@ -119,48 +119,48 @@ public <E extends IEntity> CriteriaQuery<E> ofIds(Iterable<? extends Id<? super
         }
     }
 
-    public <E extends IEntity & Identifiable<?>, R1 extends IEntity, A1 extends Attribute<? super E, ?> & Bindable<R1>>
+    public <E extends IEntity<?> & Identifiable<?>, R1, A1 extends Attribute<? super E, ?> & Bindable<R1>>
             CriteriaQuery<R1> related(E entity, A1 r1) {
         return doRelated(entity, r1);
     }
 
-    public <E extends IEntity & Identifiable<?>, R1 extends IEntity, R2 extends IEntity, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>>
+    public <E extends IEntity<?> & Identifiable<?>, R1, R2, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>>
             CriteriaQuery<R2> related(E entity, A1 r1, A2 r2) {
         return doRelated(entity, r1, r2);
     }
 
-    public <E extends IEntity & Identifiable<?>, R1 extends IEntity, R2 extends IEntity, R3 extends IEntity, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>>
+    public <E extends IEntity<?> & Identifiable<?>, R1, R2, R3, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>>
             CriteriaQuery<R3> related(E entity, A1 r1, A2 r2, A3 r3) {
         return doRelated(entity, r1, r2, r3);
     }
 
-    public <E extends IEntity & Identifiable<?>, R1 extends IEntity, R2 extends IEntity, R3 extends IEntity, R4 extends IEntity, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>>
+    public <E extends IEntity<?> & Identifiable<?>, R1, R2, R3, R4, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>>
             CriteriaQuery<R4> related(E entity, A1 r1, A2 r2, A3 r3, A4 r4) {
         return doRelated(entity, r1, r2, r3, r4);
     }
 
-    public <E extends IEntity & Identifiable<?>, R1 extends IEntity, R2 extends IEntity, R3 extends IEntity, R4 extends IEntity, R5 extends IEntity, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>, A5 extends Attribute<? super R4, ?> & Bindable<R5>>
+    public <E extends IEntity<?> & Identifiable<?>, R1, R2, R3, R4, R5, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>, A5 extends Attribute<? super R4, ?> & Bindable<R5>>
             CriteriaQuery<R5> related(E entity, A1 r1, A2 r2, A3 r3, A4 r4, A5 r5) {
         return doRelated(entity, r1, r2, r3, r4, r5);
     }
 
-    public <E extends IEntity & Identifiable<?>, R1 extends IEntity, R2 extends IEntity, R3 extends IEntity, R4 extends IEntity, R5 extends IEntity, R6 extends IEntity, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>, A5 extends Attribute<? super R4, ?> & Bindable<R5>, A6 extends Attribute<? super R5, ?> & Bindable<R6>>
+    public <E extends IEntity<?> & Identifiable<?>, R1, R2, R3, R4, R5, R6, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>, A5 extends Attribute<? super R4, ?> & Bindable<R5>, A6 extends Attribute<? super R5, ?> & Bindable<R6>>
             CriteriaQuery<R6> related(E entity, A1 r1, A2 r2, A3 r3, A4 r4, A5 r5, A6 r6) {
         return doRelated(entity, r1, r2, r3, r4, r5, r6);
     }
 
-    public <E extends IEntity & Identifiable<?>, R1 extends IEntity, R2 extends IEntity, R3 extends IEntity, R4 extends IEntity, R5 extends IEntity, R6 extends IEntity, R7 extends IEntity, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>, A5 extends Attribute<? super R4, ?> & Bindable<R5>, A6 extends Attribute<? super R5, ?> & Bindable<R6>, A7 extends Attribute<? super R6, ?> & Bindable<R7>>
+    public <E extends IEntity<?> & Identifiable<?>, R1, R2, R3, R4, R5, R6, R7, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>, A5 extends Attribute<? super R4, ?> & Bindable<R5>, A6 extends Attribute<? super R5, ?> & Bindable<R6>, A7 extends Attribute<? super R6, ?> & Bindable<R7>>
             CriteriaQuery<R7> related(E entity, A1 r1, A2 r2, A3 r3, A4 r4, A5 r5, A6 r6, A7 r7) {
         return doRelated(entity, r1, r2, r3, r4, r5, r6, r7);
     }
 
-    public <E extends IEntity & Identifiable<?>, R1 extends IEntity, R2 extends IEntity, R3 extends IEntity, R4 extends IEntity, R5 extends IEntity, R6 extends IEntity, R7 extends IEntity, R8 extends IEntity, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>, A5 extends Attribute<? super R4, ?> & Bindable<R5>, A6 extends Attribute<? super R5, ?> & Bindable<R6>, A7 extends Attribute<? super R6, ?> & Bindable<R7>, A8 extends Attribute<? super R7, ?> & Bindable<R8>>
+    public <E extends IEntity<?> & Identifiable<?>, R1, R2, R3, R4, R5, R6, R7, R8, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>, A5 extends Attribute<? super R4, ?> & Bindable<R5>, A6 extends Attribute<? super R5, ?> & Bindable<R6>, A7 extends Attribute<? super R6, ?> & Bindable<R7>, A8 extends Attribute<? super R7, ?> & Bindable<R8>>
             CriteriaQuery<R8> related(E entity, A1 r1, A2 r2, A3 r3, A4 r4, A5 r5, A6 r6, A7 r7, A8 r8) {
         return doRelated(entity, r1, r2, r3, r4, r5, r6, r7, r8);
     }
 
 
-    private <E extends IEntity & Identifiable<?>, R> CriteriaQuery<R> doRelated(E entity, Attribute<?, ?>... attributes) {
+    private <E extends IEntity<?> & Identifiable<?>, R> CriteriaQuery<R> doRelated(E entity, Attribute<?, ?>... attributes) {
         CriteriaQuery<Object> query = em.apply().getCriteriaBuilder().createQuery();
         @SuppressWarnings("unchecked")
         Root<E> root = (Root<E>) query.from(typeProvider.getEntityClass(entity));
@@ -175,47 +175,47 @@ private <E extends IEntity & Identifiable<?>, R> CriteriaQuery<R> doRelated(E en
         return ret;
     }
 
-    public <E extends IEntity, A1 extends Attribute<? super E, ?> & Bindable<R1>, R1 extends IEntity>
+    public <E, A1 extends Attribute<? super E, ?> & Bindable<R1>, R1>
     CriteriaQuery<R1> related(A1 r1, CriteriaQuery<E> query) {
         return doRelated(query, r1);
     }
 
-    public <E extends IEntity & Identifiable<?>, R1 extends IEntity, R2 extends IEntity, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>>
+    public <E extends Identifiable<?>, R1, R2, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>>
     CriteriaQuery<R2> related(A1 r1, A2 r2, CriteriaQuery<E> query) {
         return doRelated(query, r1, r2);
     }
 
-    public <E extends IEntity & Identifiable<?>, R1 extends IEntity, R2 extends IEntity, R3 extends IEntity, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>>
+    public <E extends Identifiable<?>, R1, R2, R3, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>>
     CriteriaQuery<R3> related(A1 r1, A2 r2, A3 r3, CriteriaQuery<E> query) {
         return doRelated(query, r1, r2, r3);
     }
     
-    public <E extends IEntity & Identifiable<?>, R1 extends IEntity, R2 extends IEntity, R3 extends IEntity, R4 extends IEntity, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>>
+    public <E extends Identifiable<?>, R1, R2, R3, R4, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>>
     CriteriaQuery<R4> related(A1 r1, A2 r2, A3 r3, A4 r4, CriteriaQuery<E> query) {
         return doRelated(query, r1, r2, r3, r4);
     }
     
-    public <E extends IEntity & Identifiable<?>, R1 extends IEntity, R2 extends IEntity, R3 extends IEntity, R4 extends IEntity, R5 extends IEntity, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>, A5 extends Attribute<? super R4, ?> & Bindable<R5>>
+    public <E extends Identifiable<?>, R1, R2, R3, R4, R5, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>, A5 extends Attribute<? super R4, ?> & Bindable<R5>>
     CriteriaQuery<R5> related(A1 r1, A2 r2, A3 r3, A4 r4, A5 r5, CriteriaQuery<E> query) {
         return doRelated(query, r1, r2, r3, r4, r5);
     }
     
-    public <E extends IEntity & Identifiable<?>, R1 extends IEntity, R2 extends IEntity, R3 extends IEntity, R4 extends IEntity, R5 extends IEntity, R6 extends IEntity, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>, A5 extends Attribute<? super R4, ?> & Bindable<R5>, A6 extends Attribute<? super R5, ?> & Bindable<R6>>
+    public <E extends Identifiable<?>, R1, R2, R3, R4, R5, R6, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>, A5 extends Attribute<? super R4, ?> & Bindable<R5>, A6 extends Attribute<? super R5, ?> & Bindable<R6>>
     CriteriaQuery<R6> related(A1 r1, A2 r2, A3 r3, A4 r4, A5 r5, A6 r6, CriteriaQuery<E> query) {
         return doRelated(query, r1, r2, r3, r4, r5, r6);
     }
     
-    public <E extends IEntity & Identifiable<?>, R1 extends IEntity, R2 extends IEntity, R3 extends IEntity, R4 extends IEntity, R5 extends IEntity, R6 extends IEntity, R7 extends IEntity, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>, A5 extends Attribute<? super R4, ?> & Bindable<R5>, A6 extends Attribute<? super R5, ?> & Bindable<R6>, A7 extends Attribute<? super R6, ?> & Bindable<R7>>
+    public <E extends Identifiable<?>, R1, R2, R3, R4, R5, R6, R7, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>, A5 extends Attribute<? super R4, ?> & Bindable<R5>, A6 extends Attribute<? super R5, ?> & Bindable<R6>, A7 extends Attribute<? super R6, ?> & Bindable<R7>>
     CriteriaQuery<R7> related(A1 r1, A2 r2, A3 r3, A4 r4, A5 r5, A6 r6, A7 r7, CriteriaQuery<E> query) {
         return doRelated(query, r1, r2, r3, r4, r5, r6, r7);
     }
     
-    public <E extends IEntity & Identifiable<?>, R1 extends IEntity, R2 extends IEntity, R3 extends IEntity, R4 extends IEntity, R5 extends IEntity, R6 extends IEntity, R7 extends IEntity, R8 extends IEntity, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>, A5 extends Attribute<? super R4, ?> & Bindable<R5>, A6 extends Attribute<? super R5, ?> & Bindable<R6>, A7 extends Attribute<? super R6, ?> & Bindable<R7>, A8 extends Attribute<? super R7, ?> & Bindable<R8>>
+    public <E extends Identifiable<?>, R1, R2, R3, R4, R5, R6, R7, R8, A1 extends Attribute<? super E, ?> & Bindable<R1>, A2 extends Attribute<? super R1, ?> & Bindable<R2>, A3 extends Attribute<? super R2, ?> & Bindable<R3>, A4 extends Attribute<? super R3, ?> & Bindable<R4>, A5 extends Attribute<? super R4, ?> & Bindable<R5>, A6 extends Attribute<? super R5, ?> & Bindable<R6>, A7 extends Attribute<? super R6, ?> & Bindable<R7>, A8 extends Attribute<? super R7, ?> & Bindable<R8>>
     CriteriaQuery<R8> related(A1 r1, A2 r2, A3 r3, A4 r4, A5 r5, A6 r6, A7 r7, A8 r8, CriteriaQuery<E> query) {
         return doRelated(query, r1, r2, r3, r4, r5, r6, r7, r8);
     }
 
-    private <E extends IEntity, R>
+    private <E, R>
     CriteriaQuery<R> doRelated(CriteriaQuery<E> query, Attribute<?,?>... attributes) {
         CriteriaQuery<Object> q = em.apply().getCriteriaBuilder().createQuery();
 
diff --git a/src/main/java/fi/solita/utils/query/generation/NativeQuery.java b/src/main/java/fi/solita/utils/query/generation/NativeQuery.java
index f397e71..b6ed34c 100644
--- a/src/main/java/fi/solita/utils/query/generation/NativeQuery.java
+++ b/src/main/java/fi/solita/utils/query/generation/NativeQuery.java
@@ -61,11 +61,11 @@ public NativeQueryVoid(String query, Map<String, Pair<?, Option<Type<?>>>> param
             super(query, Collections.<Pair<String, Option<Type<?>>>>emptyList(), params);
         }
 
-        public <E extends IEntity> NativeQuerySingleEntity<E> returns(Type<E> entityType) {
+        public <E extends IEntity<?>> NativeQuerySingleEntity<E> returns(Type<E> entityType) {
             return new NativeQuerySingleEntity<E>(query, withRetval(ENTITY_RETURN_VALUE, entityType), params);
         }
         
-        public <E extends IEntity> NativeQuerySingleEntity<Option<E>> returnsOptional(Type.Optional<E> entityType) {
+        public <E extends IEntity<?>> NativeQuerySingleEntity<Option<E>> returnsOptional(Type.Optional<E> entityType) {
             return new NativeQuerySingleEntity<Option<E>>(query, withRetval(ENTITY_RETURN_VALUE, entityType), params);
         }
         
diff --git a/src/main/java/fi/solita/utils/query/meta/generators/ConstructorsAsJpaProjections.java b/src/main/java/fi/solita/utils/query/meta/generators/ConstructorsAsJpaProjections.java
index 318a7fa..8344a97 100644
--- a/src/main/java/fi/solita/utils/query/meta/generators/ConstructorsAsJpaProjections.java
+++ b/src/main/java/fi/solita/utils/query/meta/generators/ConstructorsAsJpaProjections.java
@@ -1,5 +1,17 @@
 package fi.solita.utils.query.meta.generators;
 
+import static fi.solita.utils.functional.Collections.newList;
+import static fi.solita.utils.functional.Functional.cons;
+import static fi.solita.utils.functional.Functional.filter;
+import static fi.solita.utils.functional.Functional.flatMap;
+import static fi.solita.utils.functional.Functional.map;
+import static fi.solita.utils.functional.Functional.mkString;
+import static fi.solita.utils.functional.Functional.zip;
+import static fi.solita.utils.functional.Functional.zipWithIndex;
+import static fi.solita.utils.functional.FunctionalA.concat;
+import static fi.solita.utils.functional.FunctionalS.range;
+import static fi.solita.utils.functional.Option.Some;
+import static fi.solita.utils.functional.Transformers.prepend;
 import static fi.solita.utils.meta.Helpers.boxed;
 import static fi.solita.utils.meta.Helpers.containedType;
 import static fi.solita.utils.meta.Helpers.element2Constructors;
@@ -19,18 +31,6 @@
 import static fi.solita.utils.meta.generators.Content.EmptyLine;
 import static fi.solita.utils.meta.generators.Content.catchBlock;
 import static fi.solita.utils.meta.generators.Content.reflectionInvokationArgs;
-import static fi.solita.utils.functional.Collections.newList;
-import static fi.solita.utils.functional.Functional.cons;
-import static fi.solita.utils.functional.Functional.mkString;
-import static fi.solita.utils.functional.Functional.zip;
-import static fi.solita.utils.functional.Functional.zipWithIndex;
-import static fi.solita.utils.functional.FunctionalA.concat;
-import static fi.solita.utils.functional.Functional.filter;
-import static fi.solita.utils.functional.Functional.flatMap;
-import static fi.solita.utils.functional.Functional.map;
-import static fi.solita.utils.functional.FunctionalS.range;
-import static fi.solita.utils.functional.Option.Some;
-import static fi.solita.utils.functional.Transformers.prepend;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -56,15 +56,15 @@
 import javax.persistence.metamodel.SetAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 
-import fi.solita.utils.meta.Helpers;
-import fi.solita.utils.meta.generators.Generator;
-import fi.solita.utils.meta.generators.GeneratorOptions;
 import fi.solita.utils.functional.Apply;
 import fi.solita.utils.functional.Collections;
 import fi.solita.utils.functional.Function1;
 import fi.solita.utils.functional.Function3;
 import fi.solita.utils.functional.Option;
 import fi.solita.utils.functional.Transformer;
+import fi.solita.utils.meta.Helpers;
+import fi.solita.utils.meta.generators.Generator;
+import fi.solita.utils.meta.generators.GeneratorOptions;
 import fi.solita.utils.query.EntityRepresentation;
 import fi.solita.utils.query.IEntity;
 import fi.solita.utils.query.Id;
@@ -103,7 +103,7 @@ public String transform(CharSequence source) {
 
     public static Function3<Helpers.EnvDependent, ConstructorsAsJpaProjections.Options, Map.Entry<Integer, ExecutableElement>, Iterable<String>> constructorGen = new Function3<Helpers.EnvDependent, ConstructorsAsJpaProjections.Options, Map.Entry<Integer, ExecutableElement>, Iterable<String>>() {
         @Override
-        public Iterable<String> apply(Helpers.EnvDependent helper, ConstructorsAsJpaProjections.Options options, Map.Entry<Integer, ExecutableElement> entry) {
+        public Iterable<String> apply(final Helpers.EnvDependent helper, ConstructorsAsJpaProjections.Options options, Map.Entry<Integer, ExecutableElement> entry) {
             ExecutableElement constructor = entry.getValue();
             TypeElement enclosingElement = (TypeElement) constructor.getEnclosingElement();
             String enclosingElementQualifiedName = qualifiedName.apply(enclosingElement);
@@ -117,9 +117,14 @@ public Iterable<String> apply(Helpers.EnvDependent helper, ConstructorsAsJpaProj
                 Class<?> attributeClass;
                 String otherTypeParams;
                 TypeMirror argumentType = argument.asType();
-                if (helper.isSubtype(argumentType, Id.class)) {
+                if (helper.isSameType(argumentType, Id.class)) {
                     attributeClass = SingularAttribute.class;
-                    otherTypeParams = "? extends " + importType(EntityRepresentation.class);
+                    String elementType = containedType(argument);
+                    otherTypeParams = "? extends " + importType(EntityRepresentation.class) + (elementType.equals("?") ? "<?>" : "<? super " + importTypes(elementType) +">");
+                } else if (helper.isSubtype(argumentType, Id.class)) {
+                    attributeClass = SingularAttribute.class;
+                    // TODO: real paramerer type
+                    otherTypeParams = "? extends " + importType(EntityRepresentation.class) + "<?>";
                 } else {
                     Elements elements = helper.elementUtils;
                     Types types = helper.typeUtils;
@@ -146,10 +151,25 @@ public Iterable<String> apply(Helpers.EnvDependent helper, ConstructorsAsJpaProj
                         }
                         
                         String elementType = containedType(argument);
-                        if (isEntity || isId) {
-                            elementType = importType(EntityRepresentation.class);
+                        if (elementType.startsWith(Id.class.getName())) {
+                            elementType = containedType(elementType);
+                        } /*else {
+                            elementType = containedType(Helpers.typeMirror2QualifiedName.apply(find(new Predicate<TypeMirror>() {
+                                    @Override
+                                    public boolean accept(TypeMirror candidate) {
+                                        return helper.isSameType(candidate, Id.class);
+                                    }
+                                }, types.directSupertypes(elements.getTypeElement(containedType(elementType)).asType())).get()));
+                        }*/
+                        if (isEntity) {
+                            elementType = elementType.startsWith("?") ? elementType : "? super " + elementType;
+                            elementType = "? extends " + importType(EntityRepresentation.class) + "<" + importTypes(elementType) + ">";
+                        } else if (isId) {
+                            // TODO: real parameter type
+                            elementType = "? extends " + importType(EntityRepresentation.class) + "<?>";
+                        } else {
+                            elementType = elementType.startsWith("?") ? importTypes(elementType) : "? extends " + importTypes(elementType);
                         }
-                        elementType = elementType.startsWith("?") ? elementType : "? extends " + elementType;
                         
                         if (isExactlyCollection) {
                             otherTypeParams = "? extends " + importType(Collection.class) + "<" + elementType +  ">, " + elementType;
diff --git a/src/main/java/fi/solita/utils/query/projection/Project.java b/src/main/java/fi/solita/utils/query/projection/Project.java
index 360d557..4e7d48c 100644
--- a/src/main/java/fi/solita/utils/query/projection/Project.java
+++ b/src/main/java/fi/solita/utils/query/projection/Project.java
@@ -51,137 +51,137 @@ public List<Integer> getIndexesOfIdWrappingParameters() {
         };
     }
 
-    public static <E extends IEntity & Identifiable<?>> MetaJpaConstructor<E,Id<E>,Id<E>> id() {
+    public static <E extends IEntity<?> & Identifiable<?>> MetaJpaConstructor<E,Id<E>,Id<E>> id() {
         return Constructors.id();
     }
 
-    public static <E extends IEntity, T> MetaJpaConstructor<E,T,T> value(SingularAttribute<? super E, T> attribute) {
+    public static <E, T> MetaJpaConstructor<E,T,T> value(SingularAttribute<? super E, T> attribute) {
         checkOptionalAttributes(attribute);
         return Constructors.value(attribute);
     }
 
-    public static <E extends IEntity, T> MetaJpaConstructor<E,T,T> value(PluralAttribute<? super E, T, ?> attribute) {
+    public static <E, T> MetaJpaConstructor<E,T,T> value(PluralAttribute<? super E, T, ?> attribute) {
         checkOptionalAttributes(attribute);
         return Constructors.value(attribute);
     }
 
-    public static <E extends IEntity, LEFT, RIGHT> MetaJpaConstructor<E,Pair<LEFT,RIGHT>,Map.Entry<LEFT,RIGHT>> pair(Attribute<? super E, LEFT> left, Attribute<? super E, RIGHT> right) {
+    public static <E, LEFT, RIGHT> MetaJpaConstructor<E,Pair<LEFT,RIGHT>,Map.Entry<LEFT,RIGHT>> pair(Attribute<? super E, LEFT> left, Attribute<? super E, RIGHT> right) {
         checkOptionalAttributes(left);
         checkOptionalAttributes(right);
         return Constructors.pair(left, right);
     }
 
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1> MetaJpaConstructor<E,Tuple1<T1>,Tuple1<T1>> tuple(Attribute<? super E, T1> t1) {
+    public static <E, T1> MetaJpaConstructor<E,Tuple1<T1>,Tuple1<T1>> tuple(Attribute<? super E, T1> t1) {
         return makeTuple(t1);
     }
 
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2> MetaJpaConstructor<E,Tuple2<T1, T2>,Tuple2<T1,T2>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2) {
+    public static <E, T1, T2> MetaJpaConstructor<E,Tuple2<T1, T2>,Tuple2<T1,T2>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2) {
         return makeTuple(t1, t2);
     }
 
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3> MetaJpaConstructor<E,Tuple3<T1, T2, T3>,Tuple3<T1, T2, T3>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3) {
+    public static <E, T1, T2, T3> MetaJpaConstructor<E,Tuple3<T1, T2, T3>,Tuple3<T1, T2, T3>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3) {
         return makeTuple(t1, t2, t3);
     }
 
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4> MetaJpaConstructor<E,Tuple4<T1, T2, T3, T4>,Tuple4<T1, T2, T3, T4>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4) {
+    public static <E, T1, T2, T3, T4> MetaJpaConstructor<E,Tuple4<T1, T2, T3, T4>,Tuple4<T1, T2, T3, T4>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4) {
         return makeTuple(t1, t2, t3, t4);
     }
 
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5> MetaJpaConstructor<E,Tuple5<T1, T2, T3, T4, T5>,Tuple5<T1, T2, T3, T4, T5>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5) {
+    public static <E, T1, T2, T3, T4, T5> MetaJpaConstructor<E,Tuple5<T1, T2, T3, T4, T5>,Tuple5<T1, T2, T3, T4, T5>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5) {
         return makeTuple(t1, t2, t3, t4, t5);
     }
 
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6> MetaJpaConstructor<E,Tuple6<T1, T2, T3, T4, T5, T6>,Tuple6<T1, T2, T3, T4, T5, T6>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6) {
+    public static <E, T1, T2, T3, T4, T5, T6> MetaJpaConstructor<E,Tuple6<T1, T2, T3, T4, T5, T6>,Tuple6<T1, T2, T3, T4, T5, T6>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6) {
         return makeTuple(t1, t2, t3, t4, t5, t6);
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6, T7> MetaJpaConstructor<E,Tuple7<T1, T2, T3, T4, T5, T6, T7>,Tuple7<T1, T2, T3, T4, T5, T6, T7>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7) {
+    public static <E, T1, T2, T3, T4, T5, T6, T7> MetaJpaConstructor<E,Tuple7<T1, T2, T3, T4, T5, T6, T7>,Tuple7<T1, T2, T3, T4, T5, T6, T7>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7) {
         return makeTuple(t1, t2, t3, t4, t5, t6, t7);
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6, T7, T8> MetaJpaConstructor<E,Tuple8<T1, T2, T3, T4, T5, T6, T7, T8>,Tuple8<T1, T2, T3, T4, T5, T6, T7, T8>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8) {
+    public static <E, T1, T2, T3, T4, T5, T6, T7, T8> MetaJpaConstructor<E,Tuple8<T1, T2, T3, T4, T5, T6, T7, T8>,Tuple8<T1, T2, T3, T4, T5, T6, T7, T8>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8) {
         return makeTuple(t1, t2, t3, t4, t5, t6, t7, t8);
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6, T7, T8, T9> MetaJpaConstructor<E,Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9>,Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9) {
+    public static <E, T1, T2, T3, T4, T5, T6, T7, T8, T9> MetaJpaConstructor<E,Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9>,Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9) {
         return makeTuple(t1, t2, t3, t4, t5, t6, t7, t8, t9);
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> MetaJpaConstructor<E,Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>,Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10) {
+    public static <E, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> MetaJpaConstructor<E,Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>,Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10) {
         return makeTuple(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10);
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> MetaJpaConstructor<E,Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>,Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11) {
+    public static <E, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> MetaJpaConstructor<E,Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>,Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11) {
         return makeTuple(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11);
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> MetaJpaConstructor<E,Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>,Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12) {
+    public static <E, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> MetaJpaConstructor<E,Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>,Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12) {
         return makeTuple(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12);
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> MetaJpaConstructor<E,Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>,Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13) {
+    public static <E, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> MetaJpaConstructor<E,Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>,Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13) {
         return makeTuple(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13);
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> MetaJpaConstructor<E,Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>,Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14) {
+    public static <E, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> MetaJpaConstructor<E,Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>,Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14) {
         return makeTuple(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14);
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> MetaJpaConstructor<E,Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>,Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14, Attribute<? super E, T15> t15) {
+    public static <E, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> MetaJpaConstructor<E,Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>,Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14, Attribute<? super E, T15> t15) {
         return makeTuple(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15);
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> MetaJpaConstructor<E,Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>,Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14, Attribute<? super E, T15> t15, Attribute<? super E, T16> t16) {
+    public static <E, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> MetaJpaConstructor<E,Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>,Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14, Attribute<? super E, T15> t15, Attribute<? super E, T16> t16) {
         return makeTuple(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16);
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> MetaJpaConstructor<E,Tuple17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>,Tuple17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14, Attribute<? super E, T15> t15, Attribute<? super E, T16> t16, Attribute<? super E, T17> t17) {
+    public static <E, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> MetaJpaConstructor<E,Tuple17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>,Tuple17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14, Attribute<? super E, T15> t15, Attribute<? super E, T16> t16, Attribute<? super E, T17> t17) {
         return makeTuple(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17);
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> MetaJpaConstructor<E,Tuple18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>,Tuple18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14, Attribute<? super E, T15> t15, Attribute<? super E, T16> t16, Attribute<? super E, T17> t17, Attribute<? super E, T18> t18) {
+    public static <E, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> MetaJpaConstructor<E,Tuple18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>,Tuple18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14, Attribute<? super E, T15> t15, Attribute<? super E, T16> t16, Attribute<? super E, T17> t17, Attribute<? super E, T18> t18) {
         return makeTuple(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18);
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> MetaJpaConstructor<E,Tuple19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>,Tuple19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14, Attribute<? super E, T15> t15, Attribute<? super E, T16> t16, Attribute<? super E, T17> t17, Attribute<? super E, T18> t18, Attribute<? super E, T19> t19) {
+    public static <E, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> MetaJpaConstructor<E,Tuple19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>,Tuple19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14, Attribute<? super E, T15> t15, Attribute<? super E, T16> t16, Attribute<? super E, T17> t17, Attribute<? super E, T18> t18, Attribute<? super E, T19> t19) {
         return makeTuple(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19);
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> MetaJpaConstructor<E,Tuple20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>,Tuple20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14, Attribute<? super E, T15> t15, Attribute<? super E, T16> t16, Attribute<? super E, T17> t17, Attribute<? super E, T18> t18, Attribute<? super E, T19> t19, Attribute<? super E, T20> t20) {
+    public static <E, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> MetaJpaConstructor<E,Tuple20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>,Tuple20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14, Attribute<? super E, T15> t15, Attribute<? super E, T16> t16, Attribute<? super E, T17> t17, Attribute<? super E, T18> t18, Attribute<? super E, T19> t19, Attribute<? super E, T20> t20) {
         return makeTuple(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20);
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> MetaJpaConstructor<E,Tuple21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>,Tuple21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14, Attribute<? super E, T15> t15, Attribute<? super E, T16> t16, Attribute<? super E, T17> t17, Attribute<? super E, T18> t18, Attribute<? super E, T19> t19, Attribute<? super E, T20> t20, Attribute<? super E, T21> t21) {
+    public static <E, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> MetaJpaConstructor<E,Tuple21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>,Tuple21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14, Attribute<? super E, T15> t15, Attribute<? super E, T16> t16, Attribute<? super E, T17> t17, Attribute<? super E, T18> t18, Attribute<? super E, T19> t19, Attribute<? super E, T20> t20, Attribute<? super E, T21> t21) {
         return makeTuple(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20, t21);
     }
     
     @SuppressWarnings("unchecked")
-    public static <E extends IEntity, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> MetaJpaConstructor<E,Tuple22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>,Tuple22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14, Attribute<? super E, T15> t15, Attribute<? super E, T16> t16, Attribute<? super E, T17> t17, Attribute<? super E, T18> t18, Attribute<? super E, T19> t19, Attribute<? super E, T20> t20, Attribute<? super E, T21> t21, Attribute<? super E, T22> t22) {
+    public static <E, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> MetaJpaConstructor<E,Tuple22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>,Tuple22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> tuple(Attribute<? super E, T1> t1, Attribute<? super E, T2> t2, Attribute<? super E, T3> t3, Attribute<? super E, T4> t4, Attribute<? super E, T5> t5, Attribute<? super E, T6> t6, Attribute<? super E, T7> t7, Attribute<? super E, T8> t8, Attribute<? super E, T9> t9, Attribute<? super E, T10> t10, Attribute<? super E, T11> t11, Attribute<? super E, T12> t12, Attribute<? super E, T13> t13, Attribute<? super E, T14> t14, Attribute<? super E, T15> t15, Attribute<? super E, T16> t16, Attribute<? super E, T17> t17, Attribute<? super E, T18> t18, Attribute<? super E, T19> t19, Attribute<? super E, T20> t20, Attribute<? super E, T21> t21, Attribute<? super E, T22> t22) {
         return makeTuple(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20, t21, t22);
     }
     
-    private static <E extends IEntity, T extends Tuple> MetaJpaConstructor<E,T,T> makeTuple(Attribute<? super E,?>... attributes) {
+    private static <E, T extends Tuple> MetaJpaConstructor<E,T,T> makeTuple(Attribute<? super E,?>... attributes) {
         for (Attribute<? super E, ?> a: attributes) {
             checkOptionalAttributes(a);
         }
diff --git a/src/main/java/fi/solita/utils/query/projection/ProjectionHelper.java b/src/main/java/fi/solita/utils/query/projection/ProjectionHelper.java
index 028154f..1c96093 100644
--- a/src/main/java/fi/solita/utils/query/projection/ProjectionHelper.java
+++ b/src/main/java/fi/solita/utils/query/projection/ProjectionHelper.java
@@ -130,7 +130,7 @@ private <T> Selection<?> transformSelectionForQuery(Attribute<?,?> param, boolea
             logger.info("PseudoAttribute detected: {}", pseudo);
             Expression<?> s = pseudo.getSelectionForQuery(em.apply(), selection);
             doRestrictions(selection, param); // to restrict e.g. SelfAttribute, if so wanted.
-            return unwrap(AdditionalQueryPerformingAttribute.class, param).isDefined() || constructorExpectsId && IEntity.class.isAssignableFrom(s.getJavaType()) ? ((Path<IEntity>)s).get(id((Class<IEntity>)s.getJavaType(), em.apply())) : s;
+            return unwrap(AdditionalQueryPerformingAttribute.class, param).isDefined() || constructorExpectsId && IEntity.class.isAssignableFrom(s.getJavaType()) ? ((Path<IEntity<?>>)s).get(id((Class<IEntity<?>>)s.getJavaType(), em.apply())) : s;
         }
         
         if (unwrap(AdditionalQueryPerformingAttribute.class, param).isDefined()) {
@@ -174,11 +174,11 @@ Iterable<Object> performAdditionalQueriesForPlaceholderValues(MetaJpaConstructor
         
         Iterable<Object> ret = values;
         if (shouldPerformAdditionalQuery(attr)) {
-            List<Id<IEntity>> ids = (List<Id<IEntity>>)(Object)newList(values);
+            List<Id<IEntity<?>>> ids = (List<Id<IEntity<?>>>)(Object)newList(values);
             if (!ids.isEmpty()) {
                 logger.info("Preforming additional query for Attribute: {}", attr);
                 Class<?> projectionType = projection.getConstructorParameterTypes().get(index);
-                List<Object> r = doAdditionalQuery(projectionType, (Attribute<IEntity,?>)attr, isId(projectionType), isWrapperOfIds(projection, index), isDistinctable(projection, index), ids);
+                List<Object> r = doAdditionalQuery(projectionType, (Attribute<IEntity<?>,?>)attr, isId(projectionType), isWrapperOfIds(projection, index), isDistinctable(projection, index), ids);
                 ret = r;
                 if (r.size() != ids.size()) {
                     throw new RuntimeException("Whoops, a bug");
@@ -190,7 +190,7 @@ Iterable<Object> performAdditionalQueriesForPlaceholderValues(MetaJpaConstructor
         return ret;
     }
 
-    private <SOURCE extends IEntity> List<Object> doAdditionalQuery(Class<?> projectionType, Attribute<SOURCE, ?> attr, boolean isId, boolean isWrapperOfIds, boolean isDistinctable, Iterable<Id<SOURCE>> sourceIdsToQuery) {
+    private <SOURCE extends IEntity<?>> List<Object> doAdditionalQuery(Class<?> projectionType, Attribute<SOURCE, ?> attr, boolean isId, boolean isWrapperOfIds, boolean isDistinctable, Iterable<Id<SOURCE>> sourceIdsToQuery) {
         logger.debug("doAdditionalQuery({},{},{},{},{},{})", new Object[] {projectionType, attr, isId, isWrapperOfIds, isDistinctable, sourceIdsToQuery});
         final Map<?, List<Object>> targetQueryResults = queryTargetsOfSources(attr, isId, isWrapperOfIds, isDistinctable, sourceIdsToQuery);
 
@@ -205,7 +205,7 @@ public List<Object> transform(Object source) {
         return ret;
     }
     
-    private <SOURCE extends IEntity> Map<Id<SOURCE>,List<Object>> queryTargetsOfSources(final Attribute<SOURCE, ?> target, boolean isId, boolean isWrapperOfIds, boolean isDistinctable, Iterable<Id<SOURCE>> sourceIds) {
+    private <SOURCE extends IEntity<?>> Map<Id<SOURCE>,List<Object>> queryTargetsOfSources(final Attribute<SOURCE, ?> target, boolean isId, boolean isWrapperOfIds, boolean isDistinctable, Iterable<Id<SOURCE>> sourceIds) {
         logger.debug("queryTargetsOfSources({},{},{},{},{})", new Object[] {target, isId, isWrapperOfIds, isDistinctable, sourceIds});
         Collection<Object[]> results = queryTargets(target, isId, isWrapperOfIds, isDistinctable, sourceIds);
         
@@ -257,7 +257,7 @@ public Object transform(Iterable<Object> source) {
     }
     
     @SuppressWarnings("unchecked")
-    private <SOURCE extends IEntity, SOURCE_ID,R> Collection<Object[]> queryTargets(Attribute<SOURCE, ?> target, boolean isId, boolean isWrapperOfIds, boolean isDistinctable, Iterable<SOURCE_ID> sourceIds) {
+    private <SOURCE extends IEntity<?>, SOURCE_ID,R> Collection<Object[]> queryTargets(Attribute<SOURCE, ?> target, boolean isId, boolean isWrapperOfIds, boolean isDistinctable, Iterable<SOURCE_ID> sourceIds) {
         logger.debug("queryTargets({},{},{},{},{})", new Object[] {sourceIds, target, isId, isWrapperOfIds, isDistinctable});
         Class<SOURCE> sourceClass = target.getDeclaringType() != null ? target.getDeclaringType().getJavaType() : ((Id<SOURCE>)head(sourceIds)).getOwningClass();
         CriteriaQuery<Object[]> query = em.apply().getCriteriaBuilder().createQuery(Object[].class);
diff --git a/src/main/java/fi/solita/utils/query/projection/ProjectionResultUtil.java b/src/main/java/fi/solita/utils/query/projection/ProjectionResultUtil.java
index 5c1611e..6e4f9f0 100644
--- a/src/main/java/fi/solita/utils/query/projection/ProjectionResultUtil.java
+++ b/src/main/java/fi/solita/utils/query/projection/ProjectionResultUtil.java
@@ -28,6 +28,7 @@
 import java.util.TreeSet;
 
 import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.Bindable;
 import javax.persistence.metamodel.SingularAttribute;
 
 import org.slf4j.Logger;
@@ -159,7 +160,13 @@ static Object transformPseudoResultToActualValue(Attribute<?,?> attribute, Objec
     static Object wrapNullsToOptionsWhereAppropriate(Attribute<?,?> attribute, Object resultFromDb) {
         logger.debug("wrapNullsToOptionsWhereAppropriate({},{})", attribute, resultFromDb);
         Object ret;
-        if (attribute.isCollection() || isRequiredByQueryAttribute(attribute)) {
+        if (attribute.isCollection()) {
+            if (!(resultFromDb instanceof Collection) && isOption(attribute)) {
+                ret = Option.of(resultFromDb);
+            } else {
+                ret = resultFromDb;
+            }
+        } else if (isRequiredByQueryAttribute(attribute)) {
             ret = resultFromDb;
         } else {
             ret = Option.of(resultFromDb);
@@ -183,12 +190,23 @@ static Object convertNullsToEmbeddableWhereRequired(Attribute<?,?> attribute, Ob
         return ret;
     }
     
+    static boolean isOption(Attribute<?,?> attr) {
+        if (attr instanceof Bindable) {
+            Class<?> b = ((Bindable<?>) attr).getBindableJavaType();
+            return b != null && Option.class.isAssignableFrom(b);
+        }
+        return false;
+    }
+    
     /**
      * Removes all Option.None, and unwrap Option.Some from collections
      */
     static Object removeNonesAndSomesFromCollections(Attribute<?,?> attribute, Object resultFromDb) {
         logger.debug("removeNonesAndSomesFromCollections({},{})", attribute, resultFromDb);
         Object ret;
+        if (isOption(attribute)) {
+            return resultFromDb;
+        }
         if (resultFromDb instanceof List) {
             ret = newList(map(optionGet, filter(not(isNoneOrNull), (Collection<?>)resultFromDb)));
         } else if (resultFromDb instanceof SortedSet) {
diff --git a/src/main/java/fi/solita/utils/query/projection/Select.java b/src/main/java/fi/solita/utils/query/projection/Select.java
index dfceff5..eb81fe0 100644
--- a/src/main/java/fi/solita/utils/query/projection/Select.java
+++ b/src/main/java/fi/solita/utils/query/projection/Select.java
@@ -17,7 +17,7 @@ public abstract class Select {
     /**
      * Include the whole entity itself in the projection (instead of an attribute of it)
      */
-    public static <T extends IEntity> SingularAttribute<T, T> self() {
+    public static <T extends IEntity<?>> SingularAttribute<T, T> self() {
         return PseudoAttribute.Constructors.self();
     }
 
diff --git a/src/test/java/fi/solita/utils/query/Department.java b/src/test/java/fi/solita/utils/query/Department.java
index 4570d4c..b2adc50 100644
--- a/src/test/java/fi/solita/utils/query/Department.java
+++ b/src/test/java/fi/solita/utils/query/Department.java
@@ -19,7 +19,7 @@
 
 @javax.persistence.Entity
 @Access(javax.persistence.AccessType.FIELD)
-public class Department implements IEntity, Identifiable<Department.ID>, Removable {
+public class Department implements IEntity<Department>, Identifiable<Department.ID>, Removable {
 
     @Embeddable
     public static class ID extends LongId<Department> {
diff --git a/src/test/java/fi/solita/utils/query/Dto.java b/src/test/java/fi/solita/utils/query/Dto.java
index b1bdaf0..321267a 100644
--- a/src/test/java/fi/solita/utils/query/Dto.java
+++ b/src/test/java/fi/solita/utils/query/Dto.java
@@ -37,7 +37,7 @@ public Dto(ID _, Id<?> id) {
     public Dto(VALUE _, Object val) {
         this.value = val;
     }
-    public Dto(ENTITY _, IEntity val) {
+    public Dto(ENTITY _, IEntity<?> val) {
         this.value = val;
     }
     public Dto(EMBEDDABLE _, Report val) {
@@ -46,7 +46,7 @@ public Dto(EMBEDDABLE _, Report val) {
     public Dto(OPTIONAL_ID _, Option<Id<?>> val) {
         this.value = val;
     }
-    public Dto(OPTIONAL_ENTITY _, Option<? extends IEntity> val) {
+    public Dto(OPTIONAL_ENTITY _, Option<? extends IEntity<?>> val) {
         this.value = val;
     }
     public Dto(OPTIONAL_VALUE _, Option<?> val) {
@@ -61,7 +61,7 @@ public Dto(COLLECTION_OF_IDS _, Collection<Id<?>> val) {
     public Dto(COLLECTION_OF_VALUES _, Collection<?> val) {
         this.value = val;
     }
-    public Dto(COLLECTION_OF_ENTITIES _, Collection<? extends IEntity> val) {
+    public Dto(COLLECTION_OF_ENTITIES _, Collection<? extends IEntity<?>> val) {
         this.value = val;
     }
     public Dto(COLLECTION_OF_EMBEDDABLES _, Collection<Report> val) {
@@ -73,7 +73,7 @@ public Dto(SET_OF_IDS _, Set<Id<?>> val) {
     public Dto(SET_OF_VALUES _, Set<?> val) {
         this.value = val;
     }
-    public Dto(SET_OF_ENTITIES _, Set<? extends IEntity> val) {
+    public Dto(SET_OF_ENTITIES _, Set<? extends IEntity<?>> val) {
         this.value = val;
     }
     public Dto(SET_OF_EMBEDDABLES _, Set<Report> val) {
@@ -85,7 +85,7 @@ public Dto(LIST_OF_IDS _, List<Id<?>> val) {
     public Dto(LIST_OF_VALUES _, List<?> val) {
         this.value = val;
     }
-    public Dto(LIST_OF_ENTITIES _, List<? extends IEntity> val) {
+    public Dto(LIST_OF_ENTITIES _, List<? extends IEntity<?>> val) {
         this.value = val;
     }
     public Dto(LIST_OF_EMBEDDABLES _, List<Report> val) {
diff --git a/src/test/java/fi/solita/utils/query/Employee.java b/src/test/java/fi/solita/utils/query/Employee.java
index 14591dc..6370266 100644
--- a/src/test/java/fi/solita/utils/query/Employee.java
+++ b/src/test/java/fi/solita/utils/query/Employee.java
@@ -17,7 +17,7 @@
 
 @javax.persistence.Entity
 @Access(javax.persistence.AccessType.FIELD)
-public class Employee implements IEntity, Identifiable<Employee.ID> {
+public class Employee implements IEntity<Employee>, Identifiable<Employee.ID> {
 
     @Embeddable
     public static class ID extends LongId<Employee> {
diff --git a/src/test/java/fi/solita/utils/query/GeneratorTest.java b/src/test/java/fi/solita/utils/query/GeneratorTest.java
index c4daeaf..eedc2cc 100644
--- a/src/test/java/fi/solita/utils/query/GeneratorTest.java
+++ b/src/test/java/fi/solita/utils/query/GeneratorTest.java
@@ -10,9 +10,12 @@
 import fi.solita.utils.query._.C;
 import fi.solita.utils.query._.D;
 import fi.solita.utils.query._.E;
+import fi.solita.utils.query._.F;
+import fi.solita.utils.query._.G;
+import fi.solita.utils.query._.H;
 import fi.solita.utils.query.projection.Select;
 
-class Foo implements IEntity {
+class Foo implements IEntity<Foo> {
 }
 
 class FooId implements Id<Foo> {
@@ -28,6 +31,9 @@ enum B {_}
     enum C {_}
     enum D {_}
     enum E {_}
+    enum F {_}
+    enum G {_}
+    enum H {_}
 }
 
 class FooDto {
@@ -41,6 +47,12 @@ public FooDto(_.D _, Option<FooId> a) {
     }
     public FooDto(_.E _, Option<? extends Id<Foo>> a) {
     }
+    public FooDto(_.F _, Foo a) {
+    }
+    public FooDto(_.G _, Option<Foo> a) {
+    }
+    public FooDto(_.H _, Option<? extends Foo> a) {
+    }
 }
 
 public class GeneratorTest {
@@ -52,5 +64,8 @@ public void generatedConstructorAcceptsIdRegardlessOfWhetherUsingInterfaceOrConc
          FooDto_.c3(Select.literal(C._), Select.literal(Some(new Foo())));
          FooDto_.c4(Select.literal(D._), Select.literal(Some(new Foo())));
          FooDto_.c5(Select.literal(E._), Select.literal(Some(new Foo())));
+         FooDto_.c6(Select.literal(F._), Select.literal(new Foo()));
+         FooDto_.c7(Select.literal(G._), Select.literal(Some(new Foo())));
+         FooDto_.c8(Select.literal(H._), Select.literal(Some(new Foo())));
     }
 }
diff --git a/src/test/java/fi/solita/utils/query/Municipality.java b/src/test/java/fi/solita/utils/query/Municipality.java
index c044c70..c3e5f71 100644
--- a/src/test/java/fi/solita/utils/query/Municipality.java
+++ b/src/test/java/fi/solita/utils/query/Municipality.java
@@ -21,7 +21,7 @@
 
 @Entity
 @Access(AccessType.FIELD)
-public class Municipality implements IEntity, Identifiable<Municipality.ID> {
+public class Municipality implements IEntity<Municipality>, Identifiable<Municipality.ID> {
 
     @Embeddable
     public static class ID extends LongId<Municipality> {
diff --git a/src/test/java/fi/solita/utils/query/QueryTestBase.java b/src/test/java/fi/solita/utils/query/QueryTestBase.java
index 5fe617d..3c4f5d6 100644
--- a/src/test/java/fi/solita/utils/query/QueryTestBase.java
+++ b/src/test/java/fi/solita/utils/query/QueryTestBase.java
@@ -18,8 +18,8 @@ public abstract class QueryTestBase {
     @PersistenceContext
     protected EntityManager em;
     
-    protected void persist(IEntity... entities) {
-        for (IEntity e: entities) {
+    protected void persist(IEntity<?>... entities) {
+        for (IEntity<?> e: entities) {
             em.persist(e);
         }
     }