From d3b58e37de6150f58150d2446892421010b5fef6 Mon Sep 17 00:00:00 2001
From: Christian Beikov <christian.beikov@gmail.com>
Date: Fri, 2 Mar 2018 03:00:11 +0100
Subject: [PATCH] [#209, #442] Allow to build with JDK 9. Add initial support
 for Hibernate 5.3 and DataNucleus 5.1. Adapt parameter handling in custom sql
 queries. Fix subview attribute flusher oversight. Documentation update

---
 .travis.yml                                   |  195 +-
 CHANGELOG.md                                  |   12 +
 README.md                                     |  121 +-
 .../resources/archetype-resources/pom.xml     |    2 +-
 build.sh                                      |    4 +-
 .../impl/AbstractCTECriteriaBuilder.java      |    1 +
 .../impl/AbstractCommonQueryBuilder.java      |    2 +-
 ...stractDeleteCollectionCriteriaBuilder.java |    2 +
 ...stractInsertCollectionCriteriaBuilder.java |    2 +
 .../AbstractModificationCriteriaBuilder.java  |    3 +-
 ...stractUpdateCollectionCriteriaBuilder.java |    2 +
 .../BaseFinalSetOperationBuilderImpl.java     |    3 +
 .../impl/BaseInsertCriteriaBuilderImpl.java   |    1 +
 .../persistence/impl/ExtendedParameter.java   |   29 +
 .../impl/PaginatedCriteriaBuilderImpl.java    |   27 +-
 .../persistence/impl/PaginatedTypedQuery.java |  388 +++-
 .../persistence/impl/ParameterManager.java    |   15 +-
 .../impl/query/AbstractCustomQuery.java       |  255 ++-
 .../impl/query/CTEQuerySpecification.java     |   19 +-
 ...nDeleteModificationQuerySpecification.java |   12 +-
 ...nInsertModificationQuerySpecification.java |   12 +-
 ...nUpdateModificationQuerySpecification.java |   12 +-
 .../impl/query/CustomQuerySpecification.java  |   44 +-
 .../query/CustomReturningSQLTypedQuery.java   |    6 +-
 .../impl/query/CustomSQLQuery.java            |    2 +-
 .../impl/query/CustomSQLTypedQuery.java       |    4 +-
 .../impl/query/DefaultQuerySpecification.java |   12 +-
 .../query/ModificationQuerySpecification.java |   29 +-
 .../impl/query/QuerySpecification.java        |    7 +-
 ...nDeleteModificationQuerySpecification.java |   10 +-
 ...nInsertModificationQuerySpecification.java |   10 +-
 ...nUpdateModificationQuerySpecification.java |   10 +-
 ...turningModificationQuerySpecification.java |   16 +-
 .../query/SetOperationQuerySpecification.java |   28 +-
 .../persistence/impl/util/SetView.java        |  111 +
 .../src/main/antlr4/imports/JPQL_lexer.g4     |    2 +-
 .../parser/SimpleQueryGenerator.java          |    6 +-
 .../expression/ParameterExpression.java       |    6 +-
 core/testsuite/pom.xml                        |  556 ++++-
 core/testsuite/transaction.log                |    0
 dist/bom/pom.xml                              |   20 +-
 dist/full/pom.xml                             |    8 +
 .../core/manual/en_US/02_getting_started.adoc |  137 +-
 .../manual/en_US/02_getting_started.adoc      |   53 +
 .../manual/en_US/12_spring_data.adoc          |  108 +-
 .../manual/en_US/13_deltaspike_data.adoc      |   14 +-
 .../MetamodelBuildingContextImpl.java         |    4 +-
 .../view/impl/metamodel/ViewMappingImpl.java  |    6 +-
 .../view/impl/proxy/ProxyFactory.java         |   70 +-
 .../update/flush/SubviewAttributeFlusher.java |    8 +-
 entity-view/testsuite/pom.xml                 |  534 ++++-
 .../update/AbstractEntityViewUpdateTest.java  |    5 -
 .../converter/EntityViewUpdateBlobTest.java   |    4 +-
 examples/showcase/runner/cdi/pom.xml          |   95 +
 examples/showcase/runner/spring/pom.xml       |   65 +
 examples/spring-data-rest/pom.xml             |   24 +-
 integration/datanucleus-5.1/pom.xml           |  164 ++
 .../datanucleus/CTEAnnotationReader.java      |   77 +
 .../DataNucleus51ExtendedQuerySupport.java    |  121 ++
 .../datanucleus/DataNucleus51JpaProvider.java |  410 ++++
 .../AbstractJpqlFunctionSQLMethod.java        |   94 +
 .../datanucleus/function/CustomSQLText.java   |   51 +
 ...cleus51EntityManagerFactoryIntegrator.java |  332 +++
 .../DataNucleusFunctionRenderContext.java     |   66 +
 .../DataNucleusJpqlFunctionAdapter.java       |  182 ++
 .../JpqlFunctionInstanceSQLMethod.java        |   40 +
 .../function/JpqlFunctionSQLMethod.java       |   41 +
 .../QueryGeneratorInvocationHandler.java      |   44 +
 .../src/main/resources/META-INF/MANIFEST.MF   |    7 +
 .../src/main/resources/plugin.xml             |   32 +
 integration/deltaspike-data/api/pom.xml       |   12 +
 .../{impl => impl-1.7}/pom.xml                |   16 +-
 .../CustomPartialBeanBindingExtension.java    |    0
 .../impl/DeltaspikeExtensionDeactivator.java  |    0
 .../impl/EntityViewRepositoryExtension.java   |    0
 .../EntityViewAwareQueryBuilderFactory.java   |    0
 .../EntityViewDelegateQueryBuilder.java       |    0
 .../builder/EntityViewMethodQueryBuilder.java |    0
 .../impl/builder/EntityViewQueryBuilder.java  |    0
 .../EntityViewQueryBuilderContext.java        |    0
 .../WrappedEntityViewQueryBuilder.java        |    0
 .../builder/part/EntityViewAndQueryPart.java  |    0
 .../part/EntityViewBasePropertyQueryPart.java |    0
 .../part/EntityViewConnectingQueryPart.java   |    0
 .../builder/part/EntityViewOrQueryPart.java   |    0
 .../part/EntityViewOrderByQueryPart.java      |    0
 .../part/EntityViewPropertyQueryPart.java     |    0
 .../builder/part/EntityViewQueryPart.java     |    0
 .../builder/part/EntityViewQueryRoot.java     |    0
 .../builder/part/OrderByQueryAttribute.java   |    0
 .../data/impl/builder/part/QueryOperator.java |    0
 .../postprocessor/FlushModePostProcessor.java |    0
 .../postprocessor/HintPostProcessor.java      |    0
 .../postprocessor/LockModePostProcessor.java  |    0
 .../OrderByCriteriaBuilderPostProcessor.java  |    0
 ...aginationCriteriaBuilderPostProcessor.java |    0
 .../result/EntityViewDefaultQueryResult.java  |    0
 .../result/EntityViewQueryProcessor.java      |    0
 .../data/impl/criteria/QueryCriteria.java     |    0
 .../handler/CriteriaBuilderPostProcessor.java |    0
 .../impl/handler/CriteriaSupportHandler.java  |    0
 .../impl/handler/EntityManagerRefLookup.java  |    0
 .../handler/EntityViewAwareQueryHandler.java  |    0
 .../EntityViewCdiQueryInvocationContext.java  |    0
 ...tyViewCdiQueryInvocationContextHolder.java |    0
 .../data/impl/handler/EntityViewContext.java  |    0
 .../EntityViewDelegateQueryHandler.java       |    0
 .../EntityViewJpaQueryPostProcessor.java      |    0
 .../impl/handler/EntityViewManagerRef.java    |    0
 .../handler/EntityViewManagerRefLookup.java   |    0
 .../EntityViewQueryProcessorFactory.java      |    0
 .../impl/handler/EntityViewQueryRunner.java   |    0
 .../handler/EntityViewRepositoryHandler.java  |    0
 .../TransactionalEntityViewQueryRunner.java   |    0
 .../meta/EntityViewRepositoryComponent.java   |    0
 .../meta/EntityViewRepositoryComponents.java  |    0
 ...EntityViewRepositoryComponentsFactory.java |    0
 .../impl/meta/EntityViewRepositoryMethod.java |    0
 .../data/impl/param/Parameters.java           |    0
 .../EntityViewInvocationContextWrapper.java   |    0
 .../META-INF/apache-deltaspike.properties     |    0
 .../src/main/resources/META-INF/beans.xml     |    0
 integration/deltaspike-data/impl-1.8/pom.xml  |  126 ++
 .../CustomPartialBeanBindingExtension.java    |  120 ++
 .../impl/DeltaspikeExtensionDeactivator.java  |   33 +
 .../EntityViewAwareQueryBuilderFactory.java   |   62 +
 .../EntityViewDelegateQueryBuilder.java       |  123 ++
 .../builder/EntityViewMethodQueryBuilder.java |   68 +
 .../impl/builder/EntityViewQueryBuilder.java  |   55 +
 .../EntityViewQueryBuilderContext.java        |   48 +
 .../WrappedEntityViewQueryBuilder.java        |   42 +
 .../builder/part/EntityViewAndQueryPart.java  |   49 +
 .../part/EntityViewBasePropertyQueryPart.java |   58 +
 .../part/EntityViewConnectingQueryPart.java}  |   28 +-
 .../builder/part/EntityViewOrQueryPart.java   |   57 +
 .../part/EntityViewOrderByQueryPart.java      |   69 +
 .../part/EntityViewPropertyQueryPart.java     |   68 +
 .../builder/part/EntityViewQueryPart.java     |   44 +
 .../builder/part/EntityViewQueryRoot.java     |  108 +
 .../builder/part/OrderByQueryAttribute.java   |   92 +
 .../data/impl/builder/part/QueryOperator.java |   82 +
 .../postprocessor/FlushModePostProcessor.java |   45 +
 .../postprocessor/HintPostProcessor.java      |   46 +
 .../postprocessor/LockModePostProcessor.java  |   45 +
 .../OrderByCriteriaBuilderPostProcessor.java  |   63 +
 ...aginationCriteriaBuilderPostProcessor.java |   40 +
 .../result/EntityViewDefaultQueryResult.java  |  299 +++
 .../data/impl/criteria/QueryCriteria.java     |  186 ++
 .../handler/CriteriaBuilderPostProcessor.java |   28 +
 .../impl/handler/CriteriaSupportHandler.java  |  199 ++
 .../handler/EntityViewAwareQueryHandler.java  |  129 ++
 .../EntityViewCdiQueryInvocationContext.java  |  152 ++
 ...tyViewCdiQueryInvocationContextHolder.java |   60 +
 .../data/impl/handler/EntityViewContext.java  |   33 +
 .../EntityViewDelegateQueryHandler.java       |   24 +
 .../impl/handler/EntityViewManagerRef.java    |   86 +
 .../handler/EntityViewManagerRefLookup.java   |  101 +
 .../impl/handler/EntityViewQueryRunner.java   |   31 +
 .../handler/EntityViewRepositoryHandler.java  |  193 ++
 .../TransactionalEntityViewQueryRunner.java   |   71 +
 .../EntityViewAwareRepositoryMetadata.java    |   53 +
 ...iewAwareRepositoryMetadataInitializer.java |  164 ++
 ...tityViewAwareRepositoryMethodMetadata.java |   57 +
 ...reRepositoryMethodMetadataInitializer.java |  237 +++
 .../EntityViewInvocationContextWrapper.java   |   33 +
 .../META-INF/apache-deltaspike.properties     |    1 +
 .../src/main/resources/META-INF/beans.xml     |   24 +
 integration/deltaspike-data/pom.xml           |    3 +-
 .../testsuite/log4j.properties                |   22 +
 integration/deltaspike-data/testsuite/pom.xml | 1872 ++++++++++++++++-
 .../main/resources/META-INF/persistence.xml   |   11 +-
 .../AbstractEntityViewRepositoryTest.java     |   58 +-
 .../ExtendedEntityViewRepositoryTest.java     |    8 +-
 .../producer/EntityManagerProducer.java       |   24 +-
 .../src/test/resources/logging.properties     |   10 +
 integration/entity-view-cdi/pom.xml           |   82 +-
 .../hibernate/Hibernate4Access.java           |    7 +
 .../hibernate/Hibernate43Access.java          |    7 +
 .../hibernate/Hibernate52Access.java          |    7 +
 integration/hibernate-5.3/pom.xml             |  105 +
 .../CustomBasicCollectionPersister.java       |   54 +
 .../hibernate/CustomOneToManyPersister.java   |   54 +
 .../CustomPersisterClassResolver.java         |   37 +
 .../hibernate/Hibernate53Access.java          |  227 ++
 .../Hibernate53DelegatingDialect.java         |  909 ++++++++
 ...rnate53EntityManagerFactoryIntegrator.java |  102 +
 .../hibernate/Hibernate53Integrator.java      |   80 +
 .../hibernate/Hibernate53LimitHandler.java    |   81 +
 .../Hibernate53LimitHandlingDialect.java      |   41 +
 .../Hibernate53MetadataContributor.java       |   88 +
 .../Hibernate53ServiceContributor.java        |   50 +
 ...nate53SessionFactoryInvocationHandler.java |   47 +
 .../Hibernate53SessionInvocationHandler.java  |   47 +
 .../JdbcCoordinatorInvocationHandler.java     |   64 +
 .../hibernate/NativeTableNameFormatter.java   |   41 +
 .../PreparedStatementInvocationHandler.java   |   74 +
 .../hibernate/StatementPreparerImpl.java      |  200 ++
 ...org.hibernate.boot.spi.MetadataContributor |   16 +
 .../hibernate/Hibernate5Access.java           |    7 +
 .../hibernate/Hibernate60Access.java          |    7 +
 .../hibernate/base/HibernateAccess.java       |    3 +
 .../base/HibernateExtendedQuerySupport.java   |    3 +-
 integration/pom.xml                           |    2 +
 integration/spring-data/1.x/pom.xml           | 1271 -----------
 integration/spring-data/2.x/pom.xml           | 1271 -----------
 integration/spring-data/base/pom.xml          | 1269 -----------
 integration/spring-data/rest/pom.xml          | 1269 -----------
 .../spring-data/testsuite/log4j.properties    |   22 +
 integration/spring-data/testsuite/pom.xml     |  749 +++++--
 .../data/testsuite}/entity/Document.java      |    5 +-
 .../spring/data/testsuite}/entity/Person.java |   10 +-
 .../resources/META-INF/persistence.xml        |    3 +
 .../AbstractSpringTest.java                   |   21 +-
 .../DocumentRepositoryTest.java               |   34 +-
 .../accessor/DocumentAccessor.java            |    2 +-
 .../accessor/DocumentAccessors.java           |    6 +-
 .../config/BlazePersistenceConfiguration.java |    2 +-
 ...emPropertyBasedActiveProfilesResolver.java |    2 +-
 .../repository/DocumentEntityRepository.java  |    6 +-
 .../repository/DocumentRepository.java        |    4 +-
 .../repository/DocumentViewRepository.java    |    6 +-
 .../tx/TransactionalWorkService.java          |    2 +-
 .../{impl => testsuite}/tx/TxVoidWork.java    |    2 +-
 .../data/{impl => testsuite}/tx/TxWork.java   |    2 +-
 .../view/DocumentView.java                    |    4 +-
 .../{impl => testsuite}/view/PersonView.java  |    4 +-
 .../spring/data/impl/application-config.xml   |   10 +-
 .../src/test/resources/logging.properties     |   43 +
 jpa-criteria/testsuite/pom.xml                |  535 +++++
 parent/pom.xml                                |   61 +-
 pom.xml                                       |   14 +-
 testsuite-base/datanucleus/pom.xml            |    4 -
 .../base/AbstractPersistenceTest.java         |   23 +-
 .../base/AbstractPersistenceTest.java         |    6 +
 .../base/jpa/AbstractJpaPersistenceTest.java  |  103 +-
 travis/install_jdk.sh                         |   20 +
 travis/install_jdk_ea.sh                      |   20 +
 website/pom.xml                               |   13 +
 website/src/main/jbake/content/downloads.adoc |   35 +-
 website/src/main/jbake/templates/feed.ftl     |    2 +-
 website/src/main/jbake/templates/news.ftl     |    2 +-
 241 files changed, 13983 insertions(+), 5878 deletions(-)
 create mode 100644 core/impl/src/main/java/com/blazebit/persistence/impl/ExtendedParameter.java
 create mode 100644 core/impl/src/main/java/com/blazebit/persistence/impl/util/SetView.java
 delete mode 100644 core/testsuite/transaction.log
 create mode 100644 integration/datanucleus-5.1/pom.xml
 create mode 100644 integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/CTEAnnotationReader.java
 create mode 100644 integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51ExtendedQuerySupport.java
 create mode 100644 integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51JpaProvider.java
 create mode 100644 integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/AbstractJpqlFunctionSQLMethod.java
 create mode 100644 integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/CustomSQLText.java
 create mode 100644 integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleus51EntityManagerFactoryIntegrator.java
 create mode 100644 integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusFunctionRenderContext.java
 create mode 100644 integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusJpqlFunctionAdapter.java
 create mode 100644 integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionInstanceSQLMethod.java
 create mode 100644 integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionSQLMethod.java
 create mode 100644 integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/QueryGeneratorInvocationHandler.java
 create mode 100644 integration/datanucleus-5.1/src/main/resources/META-INF/MANIFEST.MF
 create mode 100644 integration/datanucleus-5.1/src/main/resources/plugin.xml
 rename integration/deltaspike-data/{impl => impl-1.7}/pom.xml (89%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/EntityViewRepositoryExtension.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilderContext.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewAndQueryPart.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewBasePropertyQueryPart.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewConnectingQueryPart.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrQueryPart.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrderByQueryPart.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewPropertyQueryPart.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryPart.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/OrderByQueryAttribute.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/QueryOperator.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/PaginationCriteriaBuilderPostProcessor.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewQueryProcessor.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/criteria/QueryCriteria.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaBuilderPostProcessor.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityManagerRefLookup.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewContext.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewDelegateQueryHandler.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewJpaQueryPostProcessor.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRef.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponent.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponents.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponentsFactory.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryMethod.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/Parameters.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/resources/META-INF/apache-deltaspike.properties (100%)
 rename integration/deltaspike-data/{impl => impl-1.7}/src/main/resources/META-INF/beans.xml (100%)
 create mode 100644 integration/deltaspike-data/impl-1.8/pom.xml
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilderContext.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewAndQueryPart.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewBasePropertyQueryPart.java
 rename integration/deltaspike-data/{impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/RepositoryEntityView.java => impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewConnectingQueryPart.java} (51%)
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrQueryPart.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrderByQueryPart.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewPropertyQueryPart.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryPart.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/OrderByQueryAttribute.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/QueryOperator.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/PaginationCriteriaBuilderPostProcessor.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/criteria/QueryCriteria.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaBuilderPostProcessor.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewContext.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewDelegateQueryHandler.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRef.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadata.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadataInitializer.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadata.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadataInitializer.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/resources/META-INF/apache-deltaspike.properties
 create mode 100644 integration/deltaspike-data/impl-1.8/src/main/resources/META-INF/beans.xml
 create mode 100644 integration/deltaspike-data/testsuite/log4j.properties
 create mode 100644 integration/hibernate-5.3/pom.xml
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53Access.java
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53DelegatingDialect.java
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53EntityManagerFactoryIntegrator.java
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53Integrator.java
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53LimitHandler.java
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53LimitHandlingDialect.java
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53MetadataContributor.java
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53ServiceContributor.java
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53SessionFactoryInvocationHandler.java
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53SessionInvocationHandler.java
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/NativeTableNameFormatter.java
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java
 create mode 100644 integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java
 create mode 100644 integration/hibernate-5.3/src/main/resources/META-INF/services/org.hibernate.boot.spi.MetadataContributor
 create mode 100644 integration/spring-data/testsuite/log4j.properties
 rename integration/spring-data/testsuite/src/{test/java/com/blazebit/persistence/spring/data/impl => main/java/com/blazebit/persistence/spring/data/testsuite}/entity/Document.java (95%)
 rename integration/spring-data/testsuite/src/{test/java/com/blazebit/persistence/spring/data/impl => main/java/com/blazebit/persistence/spring/data/testsuite}/entity/Person.java (93%)
 rename integration/spring-data/testsuite/src/{test => main}/resources/META-INF/persistence.xml (82%)
 rename integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/{impl => testsuite}/AbstractSpringTest.java (74%)
 rename integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/{impl => testsuite}/DocumentRepositoryTest.java (93%)
 rename integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/{impl => testsuite}/accessor/DocumentAccessor.java (92%)
 rename integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/{impl => testsuite}/accessor/DocumentAccessors.java (95%)
 rename integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/{impl => testsuite}/config/BlazePersistenceConfiguration.java (97%)
 rename integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/{impl => testsuite}/config/SystemPropertyBasedActiveProfilesResolver.java (94%)
 rename integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/{impl => testsuite}/repository/DocumentEntityRepository.java (82%)
 rename integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/{impl => testsuite}/repository/DocumentRepository.java (93%)
 rename integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/{impl => testsuite}/repository/DocumentViewRepository.java (82%)
 rename integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/{impl => testsuite}/tx/TransactionalWorkService.java (95%)
 rename integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/{impl => testsuite}/tx/TxVoidWork.java (92%)
 rename integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/{impl => testsuite}/tx/TxWork.java (92%)
 rename integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/{impl => testsuite}/view/DocumentView.java (87%)
 rename integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/{impl => testsuite}/view/PersonView.java (86%)
 create mode 100644 integration/spring-data/testsuite/src/test/resources/logging.properties
 create mode 100644 travis/install_jdk.sh
 create mode 100644 travis/install_jdk_ea.sh

diff --git a/.travis.yml b/.travis.yml
index 4292bc6ee9..317124a463 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ cache:
     - '$HOME/.m2/repository'
 before_install:
   - sh -c "if [ '$RDBMS' = 'firebird' ]; then sh travis/before_install_firebird.sh; fi"
+  - sh -c "if [ '$JDK' = '10' ]; then unset _JAVA_OPTIONS && . ./travis/install_jdk.sh; fi"
+  - sh -c "if [ '$JDK' = '11' ]; then unset _JAVA_OPTIONS && . ./travis/install_jdk_ea.sh; fi"
 install:
   - sh -c "if [ '$LATEST_MAVEN' = 'true' ]; then sh travis/install_latest_maven.sh; fi"
 before_script:
@@ -56,7 +58,7 @@ matrix:
       sudo: true
       services:
         - docker
-    - env: JPAPROVIDER=hibernate-5.2 RDBMS=h2 SPRING_DATA=spring-data-2.0.x
+    - env: JPAPROVIDER=hibernate-5.2 RDBMS=h2 SPRING_DATA=spring-data-2.0.x DELTASPIKE=deltaspike-1.8
       jdk: oraclejdk8
 #    - env: JPAPROVIDER=hibernate-5.2 RDBMS=sqlite
 #      jdk: oraclejdk8
@@ -102,7 +104,7 @@ matrix:
 # eclipselink
 ################################################
     - env: JPAPROVIDER=eclipselink RDBMS=h2
-      jdk: openjdk7
+      jdk: oraclejdk8
 #    - env: JPAPROVIDER=eclipselink RDBMS=mysql
 #      dist: trusty
 #      sudo: required
@@ -157,6 +159,74 @@ matrix:
 #    - env: JPAPROVIDER=openjpa RDBMS=firebird
 #      sudo: true
 
+################################################
+# hibernate-5.3
+################################################
+#    - env: JPAPROVIDER=hibernate-5.3 RDBMS=h2
+#      jdk: oraclejdk8
+#    - env: JPAPROVIDER=hibernate-5.3 RDBMS=mysql
+#      jdk: oraclejdk8
+#      dist: trusty
+#      sudo: required
+#    - env: JPAPROVIDER=hibernate-5.3 RDBMS=postgresql
+#      jdk: oraclejdk8
+#      addons:
+#        postgresql: "9.3"
+#    - env: JPAPROVIDER=hibernate-5.3 RDBMS=mssql
+#      jdk: oraclejdk8
+#      sudo: true
+#      services:
+#        - docker
+#    - env: JPAPROVIDER=hibernate-5.3 RDBMS=db2
+#      jdk: oraclejdk8
+#      sudo: true
+#      services:
+#        - docker
+#    - env: JPAPROVIDER=hibernate-5.3 RDBMS=oracle
+#      jdk: oraclejdk8
+#      sudo: true
+#      services:
+#        - docker
+#    - env: JPAPROVIDER=hibernate-5.3 RDBMS=sqlite
+#      jdk: oraclejdk8
+#    - env: JPAPROVIDER=hibernate-5.3 RDBMS=firebird
+#      jdk: oraclejdk8
+#      sudo: true
+
+################################################
+# datanucleus-5.1
+################################################
+#    - env: JPAPROVIDER=datanucleus-5.1 RDBMS=h2
+#      jdk: oraclejdk8
+#    - env: JPAPROVIDER=datanucleus-5.1 RDBMS=mysql
+#      jdk: oraclejdk8
+#      dist: trusty
+#      sudo: required
+#    - env: JPAPROVIDER=datanucleus-5.1 RDBMS=postgresql
+#      jdk: oraclejdk8
+#      addons:
+#        postgresql: "9.3"
+#    - env: JPAPROVIDER=datanucleus-5.1 RDBMS=mssql
+#      jdk: oraclejdk8
+#      sudo: true
+#      services:
+#        - docker
+#    - env: JPAPROVIDER=datanucleus-5.1 RDBMS=db2
+#      jdk: oraclejdk8
+#      sudo: true
+#      services:
+#        - docker
+#    - env: JPAPROVIDER=datanucleus-5.1 RDBMS=oracle
+#      jdk: oraclejdk8
+#      sudo: true
+#      services:
+#        - docker
+#    - env: JPAPROVIDER=datanucleus-5.1 RDBMS=sqlite
+#      jdk: oraclejdk8
+#    - env: JPAPROVIDER=datanucleus-5.1 RDBMS=firebird
+#      jdk: oraclejdk8
+#      sudo: true
+
 ################################################
 # hibernate-5.1
 ################################################
@@ -229,13 +299,13 @@ matrix:
 # hibernate-4.3
 ################################################
     - env: JPAPROVIDER=hibernate-4.3 RDBMS=h2
-      jdk: openjdk7
+      jdk: oraclejdk8
     - env: JPAPROVIDER=hibernate-4.3 RDBMS=mysql
-      jdk: openjdk7
+      jdk: oraclejdk8
       dist: trusty
       sudo: required
     - env: JPAPROVIDER=hibernate-4.3 RDBMS=postgresql
-      jdk: openjdk7
+      jdk: oraclejdk8
       addons:
         postgresql: "9.3"
     - env: JPAPROVIDER=hibernate-4.3 RDBMS=mssql
@@ -244,7 +314,7 @@ matrix:
       services:
         - docker
     - env: JPAPROVIDER=hibernate-4.3 RDBMS=db2
-      jdk: openjdk7
+      jdk: oraclejdk8
       sudo: true
       services:
         - docker
@@ -262,13 +332,13 @@ matrix:
 # hibernate-4.2
 ################################################
     - env: JPAPROVIDER=hibernate RDBMS=h2
-      jdk: openjdk7
+      jdk: oraclejdk8
     - env: JPAPROVIDER=hibernate RDBMS=mysql
-      jdk: openjdk7
+      jdk: oraclejdk8
       dist: trusty
       sudo: required
     - env: JPAPROVIDER=hibernate RDBMS=postgresql
-      jdk: openjdk7
+      jdk: oraclejdk8
       addons:
         postgresql: "9.3"
     - env: JPAPROVIDER=hibernate RDBMS=mssql
@@ -277,7 +347,7 @@ matrix:
       services:
         - docker
     - env: JPAPROVIDER=hibernate RDBMS=db2
-      jdk: openjdk7
+      jdk: oraclejdk8
       sudo: true
       services:
         - docker
@@ -332,19 +402,114 @@ matrix:
 #      jdk: oraclejdk8
 
 ################################################
-# JDK 9
+# JDK 9+
 ################################################
-# JDK 9 - Not going to work until javassist is fixed
+    - env: JPAPROVIDER=hibernate-5.2 RDBMS=h2 JDK=10 LATEST_MAVEN=true
+    - env: JPAPROVIDER=hibernate-5.2 RDBMS=h2 JDK=11 LATEST_MAVEN=true
     - env: JPAPROVIDER=hibernate-5.2 RDBMS=h2 JDK=9 LATEST_MAVEN=true
       addons:
         apt:
           packages:
             - oracle-java9-installer
       jdk: oraclejdk9
-  allow_failures:
-    - env: JPAPROVIDER=hibernate-5.2 RDBMS=h2 JDK=9 LATEST_MAVEN=true
+    - env: JPAPROVIDER=datanucleus-5 RDBMS=h2 JDK=9 LATEST_MAVEN=true
+      addons:
+        apt:
+          packages:
+            - oracle-java9-installer
+      jdk: oraclejdk9
+    - env: JPAPROVIDER=eclipselink RDBMS=h2 JDK=9 LATEST_MAVEN=true
       addons:
         apt:
           packages:
             - oracle-java9-installer
-      jdk: oraclejdk9
\ No newline at end of file
+      jdk: oraclejdk9
+#    - env: JPAPROVIDER=hibernate-5.3 RDBMS=h2 JDK=9 LATEST_MAVEN=true
+#      addons:
+#        apt:
+#          packages:
+#            - oracle-java9-installer
+#      jdk: oraclejdk9
+#    - env: JPAPROVIDER=datanucleus-5.1 RDBMS=h2 JDK=9 LATEST_MAVEN=true
+#      addons:
+#        apt:
+#          packages:
+#            - oracle-java9-installer
+#      jdk: oraclejdk9
+################################################
+# Skip JDK 9 profile combinations for older JPA provider versions
+################################################
+#    - env: JPAPROVIDER=hibernate-5.1 RDBMS=h2 JDK=9 LATEST_MAVEN=true
+#      addons:
+#        apt:
+#          packages:
+#            - oracle-java9-installer
+#      jdk: oraclejdk9
+#    - env: JPAPROVIDER=hibernate-5.0 RDBMS=h2 JDK=9 LATEST_MAVEN=true
+#      addons:
+#        apt:
+#          packages:
+#            - oracle-java9-installer
+#      jdk: oraclejdk9
+#    - env: JPAPROVIDER=hibernate-4.3 RDBMS=h2 JDK=9 LATEST_MAVEN=true
+#      addons:
+#        apt:
+#          packages:
+#            - oracle-java9-installer
+#      jdk: oraclejdk9
+#    - env: JPAPROVIDER=hibernate-4.2 RDBMS=h2 JDK=9 LATEST_MAVEN=true
+#      addons:
+#        apt:
+#          packages:
+#            - oracle-java9-installer
+#      jdk: oraclejdk9
+#    - env: JPAPROVIDER=datanucleus-4 RDBMS=h2 JDK=9 LATEST_MAVEN=true
+#      addons:
+#        apt:
+#          packages:
+#            - oracle-java9-installer
+#      jdk: oraclejdk9
+  allow_failures:
+    - env: JPAPROVIDER=hibernate-5.2 RDBMS=h2 JDK=11 LATEST_MAVEN=true
+#    - env: JPAPROVIDER=hibernate-5.3 RDBMS=h2 JDK=9 LATEST_MAVEN=true
+#      addons:
+#        apt:
+#          packages:
+#            - oracle-java9-installer
+#      jdk: oraclejdk9
+#    - env: JPAPROVIDER=datanucleus-5.1 RDBMS=h2 JDK=9 LATEST_MAVEN=true
+#      addons:
+#        apt:
+#          packages:
+#            - oracle-java9-installer
+#      jdk: oraclejdk9
+#    - env: JPAPROVIDER=hibernate-5.1 RDBMS=h2 JDK=9 LATEST_MAVEN=true
+#      addons:
+#        apt:
+#          packages:
+#            - oracle-java9-installer
+#      jdk: oraclejdk9
+#    - env: JPAPROVIDER=hibernate-5.0 RDBMS=h2 JDK=9 LATEST_MAVEN=true
+#      addons:
+#        apt:
+#          packages:
+#            - oracle-java9-installer
+#      jdk: oraclejdk9
+#    - env: JPAPROVIDER=hibernate-4.3 RDBMS=h2 JDK=9 LATEST_MAVEN=true
+#      addons:
+#        apt:
+#          packages:
+#            - oracle-java9-installer
+#      jdk: oraclejdk9
+#    - env: JPAPROVIDER=hibernate-4.2 RDBMS=h2 JDK=9 LATEST_MAVEN=true
+#      addons:
+#        apt:
+#          packages:
+#            - oracle-java9-installer
+#      jdk: oraclejdk9
+#    - env: JPAPROVIDER=datanucleus-4 RDBMS=h2 JDK=9 LATEST_MAVEN=true
+#      addons:
+#        apt:
+#          packages:
+#            - oracle-java9-installer
+#      jdk: oraclejdk9
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8905698635..7b37a3da19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,12 +12,21 @@ Not yet released
 * Add method to enable query result caching
 * `CorrelationBuilder` now returns `CorrelationQueryBuilder` that offers extended functionality
 * Updatable attributes by default now allow all known subtypes that don't introduce cycles, rather than requiring the user to specify all allowed subtypes
+* Spring Data Rest integration offering first class keyset pagination support
+* Support for Spring Data 2.0 via a new integration module
+* Support for DeltaSpike Data 1.8 via a new integration module
+* Experimental support for Hibernate 5.3 and DataNucleus 5.1
+* Support for compiling and running on JDK 9 & 10
+* Add Automatic-Module-Name manifest entry for all modules
+* Support for positional parameters
+* Improve error messages for various error scenarios
 
 ### Bug fixes
 
 * `EntityViewManager` was wrongly passed to `@PostCreate` Java 8 default methods in interfaces
 * Fix illegal Entity-To-Association-Id rewrite
 * Fix some bugs related to updatable inverse collection mappings
+* Fix some small bugs related to the use of normal entity views and the change model API
 
 ### Backwards-incompatible changes
 
@@ -27,6 +36,9 @@ Not yet released
 * Renamed `whereExpressionSubqueries` to `setWhereExpressionSubqueries`
 * Renamed `havingExpressionSubqueries` to `setHavingExpressionSubqueries`
 * Renamed `onExpressionSubqueries` to `setOnExpressionSubqueries`
+* Package renamings for many modules to avoid split package problem on JDK 9
+* Rename SpringData integration module since it was for 1.11 only and add module for 2.0
+* Rename DeltaSpike integration module since it was for 1.7 only and add module for 1.8
 
 ## 1.2.0-Alpha4
 
diff --git a/README.md b/README.md
index e2d0fa6a02..6e5fe9a618 100644
--- a/README.md
+++ b/README.md
@@ -115,6 +115,78 @@ Java EE archetype:
 mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-java-ee-sample" "-DarchetypeVersion=1.2.0-Alpha4"
 ```
 
+## Supported Java runtimes
+
+All projects are built for Java 7 except for the ones where dependencies already use Java 8 like e.g. Hibernate 5.2, Spring Data 2.0 etc.
+So you are going to need a JDK 8 for building the project.
+
+We also support building the project with JDK 9 and try to keep up with newer versions.
+If you want to run your application on a Java 9 JVM you need to handle the fact that JDK 9+ doesn't export the JAXB and JTA APIs anymore.
+In fact, JDK 11 will even remove the modules so the command line flags to add modules to the classpath won't work.
+
+Since libraries like Hibernate and others require these APIs you need to make them available. The easiest way to get these APIs back on the classpath is to package them along with your application.
+This will also work when running on Java 8. We suggest you add the following dependencies.
+
+```xml
+<dependency>
+    <groupId>javax.xml.bind</groupId>
+    <artifactId>jaxb-api</artifactId>
+    <version>2.2.11</version>
+</dependency>
+<dependency>
+    <groupId>com.sun.xml.bind</groupId>
+    <artifactId>jaxb-core</artifactId>
+    <version>2.2.11</version>
+</dependency>
+<dependency>
+    <groupId>com.sun.xml.bind</groupId>
+    <artifactId>jaxb-impl</artifactId>
+    <version>2.2.11</version>
+</dependency>
+<dependency>
+    <groupId>javax.transaction</groupId>
+    <artifactId>javax.transaction-api</artifactId>
+    <version>1.2</version>
+    <!-- In a managed environment like Java EE, use 'provided'. Otherwise use 'compile' -->
+    <scope>provided</scope>
+</dependency>
+<dependency>
+    <groupId>javax.activation</groupId>
+    <artifactId>activation</artifactId>
+    <version>1.1.1</version>
+    <!-- In a managed environment like Java EE, use 'provided'. Otherwise use 'compile' -->
+    <scope>provided</scope>
+</dependency>
+<dependency>
+    <groupId>javax.annotation</groupId>
+    <artifactId>javax.annotation-api</artifactId>
+    <version>1.3.2</version>
+    <!-- In a managed environment like Java EE, use 'provided'. Otherwise use 'compile' -->
+    <scope>provided</scope>
+</dependency>
+```
+
+The `javax.transaction` and `javax.activation` dependencies are especially relevant for the JPA metamodel generation.
+
+## Supported environments/libraries
+
+The bare minimum is JPA 2.0. If you want to use the JPA Criteria API module, you will also have to add the JPA 2 compatibility module.
+Generally, we support the usage in Java EE 6+ or Spring 4+ applications.
+
+See the following table for an overview of supported versions.
+
+Module                         | Minimum version                   | Supported versions
+----------------------------------------------------------------------------------------
+Hibernate integration          | Hibernate 4.2                     | 4.2, 4.3, 5.0, 5.1, 5.2, 5.3 (not all features are available in older versions)
+EclipseLink integration        | EclipseLink 2.6                   | 2.6 (Probably 2.4 and 2.5 work as well, but only tested against 2.6)
+DataNucleus integration        | DataNucleus 4.1                   | 4.1, 5.0
+OpenJPA integration            | N/A                               | (Currently not usable. OpenJPA doesn't seem to be actively developed anymore and no users asked for support yet)
+Entity View CDI integration    | CDI 1.0                           | 1.0, 1.1, 1.2
+Entity View Spring integration | Spring 4.3                        | 4.3, 5.0
+DeltaSpike Data integration    | DeltaSpike 1.7                    | 1.7, 1.8
+Spring Data integration        | Spring Data 1.11                  | 1.11, 2.0
+Spring Data Rest integration   | Spring Data 1.11, Spring MVC 4.3  | Spring Data 1.11 + Spring MVC 4.3, Spring Data 2.0 + Spring MVC 5.0
+
 ## Manual setup
 
 For compiling you will only need API artifacts and for the runtime you need impl and integration artifacts.
@@ -207,10 +279,25 @@ Blaze-Persistence DeltaSpike Data integration
     <version>${blaze-persistence.version}</version>
     <scope>compile</scope>
 </dependency>
+```
+
+Blaze-Persistence DeltaSpike Data 1.8 integration
+
+```xml
+<dependency>
+    <groupId>com.blazebit</groupId>
+    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.8</artifactId>
+    <version>${blaze-persistence.version}</version>
+    <scope>runtime</scope>
+</dependency>
+```
 
+Blaze-Persistence DeltaSpike Data 1.7 integration
+
+```xml
 <dependency>
     <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-deltaspike-data-impl</artifactId>
+    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.7</artifactId>
     <version>${blaze-persistence.version}</version>
     <scope>runtime</scope>
 </dependency>
@@ -218,6 +305,17 @@ Blaze-Persistence DeltaSpike Data integration
 
 Blaze-Persistence JPA provider integration module dependencies
 
+Hibernate 5.3
+
+```xml
+<dependency>
+    <groupId>com.blazebit</groupId>
+    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
+    <version>${blaze-persistence.version}</version>
+    <scope>runtime</scope>
+</dependency>
+```
+
 Hibernate 5.2
 
 ```xml
@@ -262,7 +360,18 @@ Hibernate 4.2
 </dependency>
 ```
 
-Datanucleus
+Datanucleus 5.1
+
+```xml
+<dependency>
+    <groupId>com.blazebit</groupId>
+    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
+    <version>${blaze-persistence.version}</version>
+    <scope>runtime</scope>
+</dependency>
+```
+
+Datanucleus 4 and 5
 
 ```xml
 <dependency>
@@ -482,15 +591,17 @@ Click on *Check project* and checkstyle will run once for the whole project, the
 ## Testing a JPA provider and DBMS combination
 
 By default, a Maven build `mvn clean install` will test against H2 and Hibernate 5.2 but you can activate different profiles to test other combinations.
-To test a specific combination, you need to activate at least 3 profiles
+To test a specific combination, you need to activate at least 4 profiles
 
 * One of the JPA provider profiles
+** `hibernate-5.3`
 ** `hibernate-5.2`
 ** `hibernate-5.1`
 ** `hibernate-5.0`
 ** `hibernate-4.3`
 ** `hibernate`
 ** `eclipselink`
+** `datanucleus-5.1`
 ** `datanucleus-5`
 ** `datanucleus-4`
 ** `openjpa`
@@ -506,6 +617,9 @@ To test a specific combination, you need to activate at least 3 profiles
 * A Spring data profile
 ** `spring-data-2.0.x`
 ** `spring-data-1.11.x`
+* A Deltaspike profile
+** `deltaspike-1.7`
+** `deltaspike-1.8`
 
 The default DBMS connection infos are defined via Maven properties, so you can override them in a build by passing the properties as system properties.
 
@@ -534,6 +648,7 @@ After that, the entities in the project *core/testsuite* have to be enhanced. Th
 
 * DataNucleus 4: `mvn -P "datanucleus-4" -pl core/testsuite datanucleus:enhance`
 * DataNucleus 5: `mvn -P "datanucleus-5" -pl core/testsuite datanucleus:enhance`
+* DataNucleus 5.1: `mvn -P "datanucleus-5.1" -pl core/testsuite datanucleus:enhance`
 
 After doing that, you should be able to execute any test in IntelliJ.
 
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/pom.xml b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/pom.xml
index 259b7e54f2..b57ead44d8 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/pom.xml
@@ -111,7 +111,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-deltaspike-data-impl</artifactId>
+            <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.8</artifactId>
         </dependency>
 
         <!-- Test dependencies -->
diff --git a/build.sh b/build.sh
index 232130ee94..1506552968 100755
--- a/build.sh
+++ b/build.sh
@@ -24,7 +24,7 @@ if [ "$TRAVIS_REPO_SLUG" == "Blazebit/blaze-persistence" ] &&
     [ "$TRAVIS_BRANCH" == "master" ] &&
     [ "$JPAPROVIDER" == "hibernate-5.2" ] &&
     [ "$RDBMS" == "h2" ]; then
-  exec ${MVN_BIN} -P ${JPAPROVIDER},${RDBMS},${SPRING_DATA:-spring-data-1.11.x} install
+  exec ${MVN_BIN} -P ${JPAPROVIDER},${RDBMS},${SPRING_DATA:-spring-data-1.11.x},${DELTASPIKE:-deltaspike-1.7} install
 else
   if [ "$TRAVIS_REPO_SLUG" == "Blazebit/blaze-persistence" ] &&
     [ "$TRAVIS_BRANCH" == "master" ] &&
@@ -38,5 +38,5 @@ else
     : # do nothing right now
   fi
   
-  eval exec ${MVN_BIN} -P ${JPAPROVIDER},${RDBMS},${SPRING_DATA:-spring-data-1.11.x} install --projects "core/testsuite,entity-view/testsuite,jpa-criteria/testsuite" -am $PROPERTIES
+  eval exec ${MVN_BIN} -P ${JPAPROVIDER},${RDBMS},${SPRING_DATA:-spring-data-1.11.x},${DELTASPIKE:-deltaspike-1.7} install --projects "core/testsuite,entity-view/testsuite,jpa-criteria/testsuite,integration/deltaspike-data/testsuite,integration/spring-data/testsuite,examples/spring-data-rest,examples/showcase/runner/spring,examples/showcase/runner/cdi" -am $PROPERTIES
 fi
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCTECriteriaBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCTECriteriaBuilder.java
index b230776856..0c020b3455 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCTECriteriaBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCTECriteriaBuilder.java
@@ -116,6 +116,7 @@ protected Query getQuery() {
             QuerySpecification querySpecification = new CTEQuerySpecification(
                     this,
                     query,
+                    parameterManager.getParameters(),
                     parameterListNames,
                     limit,
                     offset,
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCommonQueryBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCommonQueryBuilder.java
index 03a3942dd8..b28c4531c5 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCommonQueryBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCommonQueryBuilder.java
@@ -1551,7 +1551,7 @@ protected TypedQuery<QueryResultType> getTypedQuery() {
         boolean shouldRenderCteNodes = renderCteNodes(false);
         List<CTENode> ctes = shouldRenderCteNodes ? getCteNodes(baseQuery, false) : Collections.EMPTY_LIST;
         QuerySpecification querySpecification = new CustomQuerySpecification(
-                this, baseQuery, parameterListNames, limit, offset, keyRestrictedLeftJoinAliases, entityFunctionNodes, mainQuery.cteManager.isRecursive(), ctes, shouldRenderCteNodes
+                this, baseQuery, parameterManager.getParameters(), parameterListNames, limit, offset, keyRestrictedLeftJoinAliases, entityFunctionNodes, mainQuery.cteManager.isRecursive(), ctes, shouldRenderCteNodes
         );
 
         TypedQuery<QueryResultType> query = new CustomSQLTypedQuery<QueryResultType>(
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractDeleteCollectionCriteriaBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractDeleteCollectionCriteriaBuilder.java
index 3aa109910b..56f2caecad 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractDeleteCollectionCriteriaBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractDeleteCollectionCriteriaBuilder.java
@@ -150,6 +150,7 @@ private <R> QuerySpecification getQuerySpecification(Query baseQuery, Query exam
                     this,
                     baseQuery,
                     exampleQuery,
+                    parameterManager.getParameters(),
                     parameterListNames,
                     mainQuery.cteManager.isRecursive(),
                     ctes,
@@ -167,6 +168,7 @@ private <R> QuerySpecification getQuerySpecification(Query baseQuery, Query exam
                     this,
                     baseQuery,
                     exampleQuery,
+                    parameterManager.getParameters(),
                     parameterListNames,
                     mainQuery.cteManager.isRecursive(),
                     ctes,
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractInsertCollectionCriteriaBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractInsertCollectionCriteriaBuilder.java
index 7f3bb8c3b5..5fcc260c3a 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractInsertCollectionCriteriaBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractInsertCollectionCriteriaBuilder.java
@@ -201,6 +201,7 @@ private <R> QuerySpecification getQuerySpecification(Query baseQuery, Query exam
                     this,
                     baseQuery,
                     exampleQuery,
+                    parameterManager.getParameters(),
                     parameterListNames,
                     keyRestrictedLeftJoinAliases,
                     entityFunctionNodes,
@@ -219,6 +220,7 @@ private <R> QuerySpecification getQuerySpecification(Query baseQuery, Query exam
                     this,
                     baseQuery,
                     exampleQuery,
+                    parameterManager.getParameters(),
                     parameterListNames,
                     keyRestrictedLeftJoinAliases,
                     entityFunctionNodes,
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractModificationCriteriaBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractModificationCriteriaBuilder.java
index 9ea1f06202..5c045a3a77 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractModificationCriteriaBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractModificationCriteriaBuilder.java
@@ -183,6 +183,7 @@ protected Query getQuery(Map<DbmsModificationState, String> includedModification
                     this,
                     query,
                     getCountExampleQuery(),
+                    parameterManager.getParameters(),
                     parameterListNames,
                     mainQuery.cteManager.isRecursive(),
                     ctes,
@@ -346,7 +347,7 @@ protected <R> TypedQuery<ReturningResult<R>> getExecuteWithReturningQuery(TypedQ
         boolean shouldRenderCteNodes = renderCteNodes(false);
         List<CTENode> ctes = shouldRenderCteNodes ? getCteNodes(baseQuery, false) : Collections.EMPTY_LIST;
         QuerySpecification querySpecification = new ReturningModificationQuerySpecification<R>(
-                this, baseQuery, exampleQuery, parameterListNames, mainQuery.cteManager.isRecursive(), ctes, shouldRenderCteNodes, returningColumns, objectBuilder
+                this, baseQuery, exampleQuery, parameterManager.getParameters(), parameterListNames, mainQuery.cteManager.isRecursive(), ctes, shouldRenderCteNodes, returningColumns, objectBuilder
         );
 
         CustomReturningSQLTypedQuery query = new CustomReturningSQLTypedQuery<R>(
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractUpdateCollectionCriteriaBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractUpdateCollectionCriteriaBuilder.java
index 723d5d320e..a3cf40102b 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractUpdateCollectionCriteriaBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractUpdateCollectionCriteriaBuilder.java
@@ -248,6 +248,7 @@ private <R> QuerySpecification getQuerySpecification(Query baseQuery, Query exam
                     this,
                     baseQuery,
                     exampleQuery,
+                    parameterManager.getParameters(),
                     parameterListNames,
                     mainQuery.cteManager.isRecursive(),
                     ctes,
@@ -267,6 +268,7 @@ private <R> QuerySpecification getQuerySpecification(Query baseQuery, Query exam
                     this,
                     baseQuery,
                     exampleQuery,
+                    parameterManager.getParameters(),
                     parameterListNames,
                     mainQuery.cteManager.isRecursive(),
                     ctes,
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/BaseFinalSetOperationBuilderImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/BaseFinalSetOperationBuilderImpl.java
index 80351b2b5a..317a6c389f 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/BaseFinalSetOperationBuilderImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/BaseFinalSetOperationBuilderImpl.java
@@ -269,6 +269,7 @@ protected TypedQuery<T> getTypedQuery() {
                 setOperationManager.getOperator(),
                 getOrderByElements(),
                 setOperationManager.isNested(),
+                parameterManager.getParameters(),
                 parameterListNames,
                 limit,
                 offset,
@@ -299,6 +300,8 @@ protected TypedQuery<T> getTypedQuery() {
             }
         }
 
+        parameterManager.parameterizeQuery(query);
+
         return applyObjectBuilder(query);
     }
     
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/BaseInsertCriteriaBuilderImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/BaseInsertCriteriaBuilderImpl.java
index 7dc7640f0f..c7c910c77e 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/BaseInsertCriteriaBuilderImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/BaseInsertCriteriaBuilderImpl.java
@@ -173,6 +173,7 @@ protected Query getQuery(Map<DbmsModificationState, String> includedModification
                 this,
                 query,
                 getCountExampleQuery(),
+                parameterManager.getParameters(),
                 parameterListNames,
                 keyRestrictedLeftJoinAliases,
                 entityFunctionNodes,
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/ExtendedParameter.java b/core/impl/src/main/java/com/blazebit/persistence/impl/ExtendedParameter.java
new file mode 100644
index 0000000000..109a0774f4
--- /dev/null
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/ExtendedParameter.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.impl;
+
+import javax.persistence.Parameter;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public interface ExtendedParameter<T> extends Parameter<T> {
+
+    public boolean isCollectionValued();
+
+}
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedCriteriaBuilderImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedCriteriaBuilderImpl.java
index 95c8869b22..24df7e3025 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedCriteriaBuilderImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedCriteriaBuilderImpl.java
@@ -38,12 +38,14 @@
 import com.blazebit.persistence.impl.transform.ExpressionTransformerGroup;
 import com.blazebit.persistence.parser.util.JpaMetamodelUtils;
 
+import javax.persistence.Parameter;
 import javax.persistence.TypedQuery;
 import javax.persistence.metamodel.Attribute;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -176,7 +178,7 @@ private <X> TypedQuery<X> getCountQuery(String countQueryString, Class<X> result
         boolean shouldRenderCteNodes = renderCteNodes(false);
         List<CTENode> ctes = shouldRenderCteNodes ? getCteNodes(baseQuery, false) : Collections.EMPTY_LIST;
         QuerySpecification querySpecification = new CustomQuerySpecification(
-                this, baseQuery, parameterListNames, null, null, keyRestrictedLeftJoinAliases, entityFunctionNodes, mainQuery.cteManager.isRecursive(), ctes, shouldRenderCteNodes
+                this, baseQuery, parameterManager.getParameters(), parameterListNames, null, null, keyRestrictedLeftJoinAliases, entityFunctionNodes, mainQuery.cteManager.isRecursive(), ctes, shouldRenderCteNodes
         );
 
         TypedQuery<X> countQuery = new CustomSQLTypedQuery<X>(
@@ -220,7 +222,20 @@ public PaginatedTypedQuery<T> getQuery() {
             objectQuery = entry.getKey();
             objectBuilder = entry.getValue();
         }
-        PaginatedTypedQuery<T> query = new PaginatedTypedQuery<T>(countQuery, idQuery, objectQuery, objectBuilder, entityId, firstResult, maxResults, needsNewIdList, keysetExtraction, keysetMode, keysetPage);
+        PaginatedTypedQuery<T> query = new PaginatedTypedQuery<>(
+                countQuery,
+                idQuery,
+                objectQuery,
+                objectBuilder,
+                parameterManager.getParameters(),
+                entityId,
+                firstResult,
+                maxResults,
+                needsNewIdList,
+                keysetExtraction,
+                keysetMode,
+                keysetPage
+        );
         return query;
     }
 
@@ -372,7 +387,7 @@ private Map.Entry<TypedQuery<T>, KeysetExtractionObjectBuilder<T>> getObjectQuer
             boolean shouldRenderCteNodes = renderCteNodes(false);
             List<CTENode> ctes = shouldRenderCteNodes ? getCteNodes(baseQuery, false) : Collections.EMPTY_LIST;
             QuerySpecification querySpecification = new CustomQuerySpecification(
-                    this, baseQuery, parameterListNames, null, null, keyRestrictedLeftJoinAliases, entityFunctionNodes, mainQuery.cteManager.isRecursive(), ctes, shouldRenderCteNodes
+                    this, baseQuery, parameterManager.getParameters(), parameterListNames, null, null, keyRestrictedLeftJoinAliases, entityFunctionNodes, mainQuery.cteManager.isRecursive(), ctes, shouldRenderCteNodes
             );
 
             query = new CustomSQLTypedQuery<T>(
@@ -425,7 +440,7 @@ private TypedQuery<Object[]> getIdQuery(String idQueryString, boolean normalQuer
         boolean shouldRenderCteNodes = renderCteNodes(false);
         List<CTENode> ctes = shouldRenderCteNodes ? getCteNodes(baseQuery, false) : Collections.EMPTY_LIST;
         QuerySpecification querySpecification = new CustomQuerySpecification(
-                this, baseQuery, parameterListNames, null, null, keyRestrictedLeftJoinAliases, entityFunctionNodes, mainQuery.cteManager.isRecursive(), ctes, shouldRenderCteNodes
+                this, baseQuery, parameterManager.getParameters(), parameterListNames, null, null, keyRestrictedLeftJoinAliases, entityFunctionNodes, mainQuery.cteManager.isRecursive(), ctes, shouldRenderCteNodes
         );
 
         TypedQuery<Object[]> idQuery = new CustomSQLTypedQuery<Object[]>(
@@ -458,8 +473,10 @@ private TypedQuery<T> getObjectQueryById(boolean normalQueryMode, Set<JoinNode>
         List<EntityFunctionNode> entityFunctionNodes = getEntityFunctionNodes(baseQuery);
         boolean shouldRenderCteNodes = renderCteNodes(false);
         List<CTENode> ctes = shouldRenderCteNodes ? getCteNodes(baseQuery, false) : Collections.EMPTY_LIST;
+        Set<Parameter<?>> parameters = new HashSet<>(parameterManager.getParameters());
+        parameters.add(baseQuery.getParameter(ID_PARAM_NAME));
         QuerySpecification querySpecification = new CustomQuerySpecification(
-                this, baseQuery, parameterListNames, null, null, keyRestrictedLeftJoinAliases, entityFunctionNodes, mainQuery.cteManager.isRecursive(), ctes, shouldRenderCteNodes
+                this, baseQuery, parameters, parameterListNames, null, null, keyRestrictedLeftJoinAliases, entityFunctionNodes, mainQuery.cteManager.isRecursive(), ctes, shouldRenderCteNodes
         );
 
         TypedQuery<T> query = new CustomSQLTypedQuery<T>(
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedTypedQuery.java b/core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedTypedQuery.java
index bf1fcb1ef8..27478ca28f 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedTypedQuery.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedTypedQuery.java
@@ -22,6 +22,7 @@
 import com.blazebit.persistence.impl.keyset.KeysetMode;
 import com.blazebit.persistence.impl.keyset.KeysetPageImpl;
 import com.blazebit.persistence.impl.keyset.KeysetPaginationHelper;
+import com.blazebit.persistence.impl.util.SetView;
 
 import javax.persistence.FlushModeType;
 import javax.persistence.LockModeType;
@@ -29,6 +30,7 @@
 import javax.persistence.NonUniqueResultException;
 import javax.persistence.Parameter;
 import javax.persistence.PersistenceException;
+import javax.persistence.Query;
 import javax.persistence.TemporalType;
 import javax.persistence.TypedQuery;
 import java.io.Serializable;
@@ -44,6 +46,8 @@ public class PaginatedTypedQuery<X> implements TypedQuery<X> {
     private final TypedQuery<?> idQuery;
     private final TypedQuery<X> objectQuery;
     private final KeysetExtractionObjectBuilder<X> objectBuilder;
+    private final Map<String, Parameter<?>> parameters;
+    private final Map<String, ParameterLocation> parameterToQuery;
     private final Object entityId;
     private int firstResult;
     private int pageSize;
@@ -53,11 +57,12 @@ public class PaginatedTypedQuery<X> implements TypedQuery<X> {
     private final KeysetMode keysetMode;
     private final KeysetPage keysetPage;
 
-    public PaginatedTypedQuery(TypedQuery<?> countQuery, TypedQuery<?> idQuery, TypedQuery<X> objectQuery, KeysetExtractionObjectBuilder<X> objectBuilder, Object entityId, int firstResult, int pageSize, boolean needsNewIdList, boolean keysetExtraction, KeysetMode keysetMode, KeysetPage keysetPage) {
+    public PaginatedTypedQuery(TypedQuery<?> countQuery, TypedQuery<?> idQuery, TypedQuery<X> objectQuery, KeysetExtractionObjectBuilder<X> objectBuilder, Set<Parameter<?>> parameters, Object entityId, int firstResult, int pageSize, boolean needsNewIdList, boolean keysetExtraction, KeysetMode keysetMode, KeysetPage keysetPage) {
         this.countQuery = countQuery;
         this.idQuery = idQuery;
         this.objectQuery = objectQuery;
         this.objectBuilder = objectBuilder;
+        this.parameterToQuery = new HashMap<>(parameters.size());
         this.entityId = entityId;
         this.firstResult = firstResult;
         this.pageSize = pageSize;
@@ -65,6 +70,41 @@ public PaginatedTypedQuery(TypedQuery<?> countQuery, TypedQuery<?> idQuery, Type
         this.keysetExtraction = keysetExtraction;
         this.keysetMode = keysetMode;
         this.keysetPage = keysetPage;
+
+        Map<String, Parameter<?>> params = new HashMap<>(parameters.size());
+        for (Parameter<?> parameter : parameters) {
+            params.put(parameter.getName(), parameter);
+        }
+
+        this.parameters = Collections.unmodifiableMap(params);
+
+        if (countQuery != null) {
+            for (Parameter<?> parameter : countQuery.getParameters()) {
+                parameterToQuery.put(parameter.getName(), ParameterLocation.COUNT);
+            }
+        }
+        if (idQuery != null) {
+            for (Parameter<?> parameter : idQuery.getParameters()) {
+                ParameterLocation parameterLocation = parameterToQuery.get(parameter.getName());
+                if (parameterLocation == null) {
+                    parameterLocation = ParameterLocation.ID;
+                } else {
+                    parameterLocation = parameterLocation.andId();
+                }
+                parameterToQuery.put(parameter.getName(), parameterLocation);
+            }
+        }
+        if (objectQuery != null) {
+            for (Parameter<?> parameter : objectQuery.getParameters()) {
+                ParameterLocation parameterLocation = parameterToQuery.get(parameter.getName());
+                if (parameterLocation == null) {
+                    parameterLocation = ParameterLocation.OBJECT;
+                } else {
+                    parameterLocation = parameterLocation.andObject();
+                }
+                parameterToQuery.put(parameter.getName(), parameterLocation);
+            }
+        }
     }
 
     @Override
@@ -240,27 +280,20 @@ public Map<String, Object> getHints() {
 
     @Override
     public <T> TypedQuery<X> setParameter(Parameter<T> param, T value) {
-        String name = param.getName();
-        if (name == null) {
-            int position = param.getPosition();
-            if (objectQuery.getParameter(position) != null) {
-                objectQuery.setParameter(position, value);
+        if (param.getName() == null) {
+            List<Query> queries = parameterToQuery.get(Integer.toString(param.getPosition())).getQueries(countQuery, idQuery, objectQuery);
+            for (Query query : queries) {
+                query.setParameter(param.getPosition(), value);
             }
-            if (idQuery != null && idQuery.getParameter(position) != null) {
-                idQuery.setParameter(position, value);
-            }
-            if (countQuery.getParameter(position) != null) {
-                countQuery.setParameter(position, value);
+        } else if (Character.isDigit(param.getName().charAt(0))) {
+            List<Query> queries = parameterToQuery.get(param.getName()).getQueries(countQuery, idQuery, objectQuery);
+            for (Query query : queries) {
+                query.setParameter(Integer.parseInt(param.getName()), value);
             }
         } else {
-            if (objectQuery.getParameter(name) != null) {
-                objectQuery.setParameter(name, value);
-            }
-            if (idQuery != null && idQuery.getParameter(name) != null) {
-                idQuery.setParameter(name, value);
-            }
-            if (countQuery.getParameter(name) != null) {
-                countQuery.setParameter(name, value);
+            List<Query> queries = parameterToQuery.get(param.getName()).getQueries(countQuery, idQuery, objectQuery);
+            for (Query query : queries) {
+                query.setParameter(param.getName(), value);
             }
         }
         return this;
@@ -268,27 +301,20 @@ public <T> TypedQuery<X> setParameter(Parameter<T> param, T value) {
 
     @Override
     public TypedQuery<X> setParameter(Parameter<Calendar> param, Calendar value, TemporalType temporalType) {
-        String name = param.getName();
-        if (name == null) {
-            int position = param.getPosition();
-            if (objectQuery.getParameter(position) != null) {
-                objectQuery.setParameter(position, value, temporalType);
+        if (param.getName() == null) {
+            List<Query> queries = parameterToQuery.get(Integer.toString(param.getPosition())).getQueries(countQuery, idQuery, objectQuery);
+            for (Query query : queries) {
+                query.setParameter(param.getPosition(), value, temporalType);
             }
-            if (idQuery != null && idQuery.getParameter(position) != null) {
-                idQuery.setParameter(position, value, temporalType);
-            }
-            if (countQuery.getParameter(position) != null) {
-                countQuery.setParameter(position, value, temporalType);
+        } else if (Character.isDigit(param.getName().charAt(0))) {
+            List<Query> queries = parameterToQuery.get(param.getName()).getQueries(countQuery, idQuery, objectQuery);
+            for (Query query : queries) {
+                query.setParameter(Integer.parseInt(param.getName()), value, temporalType);
             }
         } else {
-            if (objectQuery.getParameter(name) != null) {
-                objectQuery.setParameter(name, value, temporalType);
-            }
-            if (idQuery != null && idQuery.getParameter(name) != null) {
-                idQuery.setParameter(name, value, temporalType);
-            }
-            if (countQuery.getParameter(name) != null) {
-                countQuery.setParameter(name, value, temporalType);
+            List<Query> queries = parameterToQuery.get(param.getName()).getQueries(countQuery, idQuery, objectQuery);
+            for (Query query : queries) {
+                query.setParameter(param.getName(), value, temporalType);
             }
         }
         return this;
@@ -296,27 +322,20 @@ public TypedQuery<X> setParameter(Parameter<Calendar> param, Calendar value, Tem
 
     @Override
     public TypedQuery<X> setParameter(Parameter<Date> param, Date value, TemporalType temporalType) {
-        String name = param.getName();
-        if (name == null) {
-            int position = param.getPosition();
-            if (objectQuery.getParameter(position) != null) {
-                objectQuery.setParameter(position, value, temporalType);
+        if (param.getName() == null) {
+            List<Query> queries = parameterToQuery.get(Integer.toString(param.getPosition())).getQueries(countQuery, idQuery, objectQuery);
+            for (Query query : queries) {
+                query.setParameter(param.getPosition(), value, temporalType);
             }
-            if (idQuery != null && idQuery.getParameter(position) != null) {
-                idQuery.setParameter(position, value, temporalType);
-            }
-            if (countQuery.getParameter(position) != null) {
-                countQuery.setParameter(position, value, temporalType);
+        } else if (Character.isDigit(param.getName().charAt(0))) {
+            List<Query> queries = parameterToQuery.get(param.getName()).getQueries(countQuery, idQuery, objectQuery);
+            for (Query query : queries) {
+                query.setParameter(Integer.parseInt(param.getName()), value, temporalType);
             }
         } else {
-            if (objectQuery.getParameter(name) != null) {
-                objectQuery.setParameter(name, value, temporalType);
-            }
-            if (idQuery != null && idQuery.getParameter(name) != null) {
-                idQuery.setParameter(name, value, temporalType);
-            }
-            if (countQuery.getParameter(name) != null) {
-                countQuery.setParameter(name, value, temporalType);
+            List<Query> queries = parameterToQuery.get(param.getName()).getQueries(countQuery, idQuery, objectQuery);
+            for (Query query : queries) {
+                query.setParameter(param.getName(), value, temporalType);
             }
         }
         return this;
@@ -339,60 +358,43 @@ public TypedQuery<X> setParameter(String name, Date value, TemporalType temporal
 
     @Override
     public TypedQuery<X> setParameter(int position, Object value) {
-        throw new IllegalArgumentException("Positional parameters unsupported!");
+        return setParameter((Parameter<Object>) getParameter(position), value);
     }
 
     @Override
     public TypedQuery<X> setParameter(int position, Calendar value, TemporalType temporalType) {
-        throw new IllegalArgumentException("Positional parameters unsupported!");
+        return setParameter(getParameter(position, Calendar.class), value, temporalType);
     }
 
     @Override
     public TypedQuery<X> setParameter(int position, Date value, TemporalType temporalType) {
-        throw new IllegalArgumentException("Positional parameters unsupported!");
+        return setParameter(getParameter(position, Date.class), value, temporalType);
     }
 
     @Override
     public Set<Parameter<?>> getParameters() {
-        Set<Parameter<?>> parameters = new HashSet<Parameter<?>>();
-        parameters.addAll(objectQuery.getParameters());
-
-        if (idQuery != null) {
-            parameters.addAll(idQuery.getParameters());
-        }
-
-        parameters.addAll(countQuery.getParameters());
-        return parameters;
+        return new SetView<>(parameters.values());
     }
 
     @Override
     public Parameter<?> getParameter(String name) {
-        Parameter<?> parameter = objectQuery.getParameter(name);
-        if (parameter != null) {
-            return parameter;
-        }
-        if (idQuery != null) {
-            parameter = idQuery.getParameter(name);
-            if (parameter != null) {
-                return parameter;
-            }
+        Parameter<?> param = parameters.get(name);
+        if (param == null) {
+            throw new IllegalArgumentException("Couldn't find parameter with name '" + name + "'!");
         }
-        return countQuery.getParameter(name);
+        return param;
     }
 
     @Override
     public <T> Parameter<T> getParameter(String name, Class<T> type) {
-        Parameter<T> parameter = objectQuery.getParameter(name, type);
-        if (parameter != null) {
-            return parameter;
-        }
-        if (idQuery != null) {
-            parameter = idQuery.getParameter(name, type);
-            if (parameter != null) {
-                return parameter;
-            }
+        Parameter<?> param = getParameter(name);
+        if (!param.getParameterType().isAssignableFrom(type)) {
+            throw new IllegalArgumentException(
+                    "The parameter with the name '" + name + "' has the type '" + param.getParameterType().getName() +
+                            "' which is not assignable to requested type '" + type.getName() + "'"
+            );
         }
-        return countQuery.getParameter(name, type);
+        return (Parameter<T>) param;
     }
 
     @Override
@@ -408,47 +410,49 @@ public boolean isBound(Parameter<?> param) {
 
     @Override
     public <T> T getParameterValue(Parameter<T> param) {
-        T value = objectQuery.getParameterValue(param);
-        if (value != null) {
-            return value;
-        }
-        if (idQuery != null) {
-            value = idQuery.getParameterValue(param);
-            if (value != null) {
-                return value;
-            }
+        if (param.getName() == null) {
+            Query query = parameterToQuery.get(Integer.toString(param.getPosition())).getQuery(countQuery, idQuery, objectQuery);
+            return (T) query.getParameterValue(param.getPosition());
+        } else if (Character.isDigit(param.getName().charAt(0))) {
+            Query query = parameterToQuery.get(param.getName()).getQuery(countQuery, idQuery, objectQuery);
+            return (T) query.getParameterValue(Integer.parseInt(param.getName()));
+        } else {
+            Query query = parameterToQuery.get(param.getName()).getQuery(countQuery, idQuery, objectQuery);
+            return (T) query.getParameterValue(param.getName());
         }
-        return countQuery.getParameterValue(param);
     }
 
     @Override
     public Object getParameterValue(String name) {
-        Object value = objectQuery.getParameterValue(name);
-        if (value != null) {
-            return value;
-        }
-        if (idQuery != null) {
-            value = idQuery.getParameterValue(name);
-            if (value != null) {
-                return value;
-            }
-        }
-        return countQuery.getParameterValue(name);
+        Query query = parameterToQuery.get(name).getQuery(countQuery, idQuery, objectQuery);
+        return query.getParameterValue(name);
     }
 
     @Override
     public Object getParameterValue(int position) {
-        throw new IllegalArgumentException("Positional parameters unsupported!");
+        Query query = parameterToQuery.get(Integer.toString(position)).getQuery(countQuery, idQuery, objectQuery);
+        return query.getParameterValue(position);
     }
 
     @Override
     public Parameter<?> getParameter(int position) {
-        throw new IllegalArgumentException("Positional parameters unsupported!");
+        Parameter<?> param = parameters.get(Integer.toString(position));
+        if (param == null) {
+            throw new IllegalArgumentException("Couldn't find parameter with position '" + position + "'!");
+        }
+        return param;
     }
 
     @Override
     public <T> Parameter<T> getParameter(int position, Class<T> type) {
-        throw new IllegalArgumentException("Positional parameters unsupported!");
+        Parameter<?> param = getParameter(position);
+        if (!param.getParameterType().isAssignableFrom(type)) {
+            throw new IllegalArgumentException(
+                    "The parameter at position '" + position + "' has the type '" + param.getParameterType().getName() +
+                    "' which is not assignable to requested type '" + type.getName() + "'"
+            );
+        }
+        return (Parameter<T>) param;
     }
 
     @Override
@@ -477,4 +481,166 @@ public LockModeType getLockMode() {
     public <T> T unwrap(Class<T> cls) {
         throw new PersistenceException("Unsupported unwrap: " + cls.getName());
     }
+
+    /**
+     * @author Christian Beikov
+     * @since 1.2.0
+     */
+    private static enum ParameterLocation {
+        COUNT {
+            @Override
+            public ParameterLocation andId() {
+                return COUNT_ID;
+            }
+
+            @Override
+            public ParameterLocation andObject() {
+                return COUNT_OBJECT;
+            }
+
+            @Override
+            public Query getQuery(Query countQuery, Query idQuery, Query objectQuery) {
+                return countQuery;
+            }
+
+            @Override
+            public List<Query> getQueries(Query countQuery, Query idQuery, Query objectQuery) {
+                return Collections.singletonList(countQuery);
+            }
+        },
+        COUNT_ID {
+            @Override
+            public ParameterLocation andId() {
+                return this;
+            }
+
+            @Override
+            public ParameterLocation andObject() {
+                return COUNT_ID_OBJECT;
+            }
+
+            @Override
+            public Query getQuery(Query countQuery, Query idQuery, Query objectQuery) {
+                return countQuery;
+            }
+
+            @Override
+            public List<Query> getQueries(Query countQuery, Query idQuery, Query objectQuery) {
+                return Arrays.asList(countQuery, idQuery);
+            }
+        },
+        COUNT_ID_OBJECT {
+            @Override
+            public ParameterLocation andId() {
+                return this;
+            }
+
+            @Override
+            public ParameterLocation andObject() {
+                return this;
+            }
+
+            @Override
+            public Query getQuery(Query countQuery, Query idQuery, Query objectQuery) {
+                return countQuery;
+            }
+
+            @Override
+            public List<Query> getQueries(Query countQuery, Query idQuery, Query objectQuery) {
+                return Arrays.asList(countQuery, idQuery, objectQuery);
+            }
+        },
+        COUNT_OBJECT {
+            @Override
+            public ParameterLocation andId() {
+                return COUNT_ID_OBJECT;
+            }
+
+            @Override
+            public ParameterLocation andObject() {
+                return this;
+            }
+
+            @Override
+            public Query getQuery(Query countQuery, Query idQuery, Query objectQuery) {
+                return countQuery;
+            }
+
+            @Override
+            public List<Query> getQueries(Query countQuery, Query idQuery, Query objectQuery) {
+                return Arrays.asList(countQuery, objectQuery);
+            }
+        },
+        ID {
+            @Override
+            public ParameterLocation andId() {
+                return this;
+            }
+
+            @Override
+            public ParameterLocation andObject() {
+                return ID_OBJECT;
+            }
+
+            @Override
+            public Query getQuery(Query countQuery, Query idQuery, Query objectQuery) {
+                return idQuery;
+            }
+
+            @Override
+            public List<Query> getQueries(Query countQuery, Query idQuery, Query objectQuery) {
+                return Collections.singletonList(idQuery);
+            }
+        },
+        ID_OBJECT {
+            @Override
+            public ParameterLocation andId() {
+                return this;
+            }
+
+            @Override
+            public ParameterLocation andObject() {
+                return this;
+            }
+
+            @Override
+            public Query getQuery(Query countQuery, Query idQuery, Query objectQuery) {
+                return idQuery;
+            }
+
+            @Override
+            public List<Query> getQueries(Query countQuery, Query idQuery, Query objectQuery) {
+                return Arrays.asList(idQuery, objectQuery);
+            }
+        },
+        OBJECT {
+            @Override
+            public ParameterLocation andId() {
+                return ID_OBJECT;
+            }
+
+            @Override
+            public ParameterLocation andObject() {
+                return this;
+            }
+
+            @Override
+            public Query getQuery(Query countQuery, Query idQuery, Query objectQuery) {
+                return objectQuery;
+            }
+
+            @Override
+            public List<Query> getQueries(Query countQuery, Query idQuery, Query objectQuery) {
+                return Collections.singletonList(objectQuery);
+            }
+        };
+
+        public abstract ParameterLocation andId();
+
+        public abstract ParameterLocation andObject();
+
+        public abstract Query getQuery(Query countQuery, Query idQuery, Query objectQuery);
+
+        public abstract List<Query> getQueries(Query countQuery, Query idQuery, Query objectQuery);
+    }
 }
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/ParameterManager.java b/core/impl/src/main/java/com/blazebit/persistence/impl/ParameterManager.java
index 5262d08b5d..87559a24dc 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/ParameterManager.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/ParameterManager.java
@@ -36,8 +36,8 @@ public class ParameterManager {
 
     private static final String PREFIX = "param_";
     private int counter;
-    private final Map<String, ParameterImpl<?>> parameters = new HashMap<String, ParameterImpl<?>>();
-    private final Map<String, String> valuesParameters = new HashMap<String, String>();
+    private final Map<String, ParameterImpl<?>> parameters = new HashMap<>();
+    private final Map<String, String> valuesParameters = new HashMap<>();
     private final ParameterRegistrationVisitor parameterRegistrationVisitor;
     private final ParameterUnregistrationVisitor parameterUnregistrationVisitor;
 
@@ -139,7 +139,7 @@ public ParameterImpl<?> getParameter(String parameterName) {
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public Set<? extends Parameter<?>> getParameters() {
+    public Set<Parameter<?>> getParameters() {
         return new HashSet<Parameter<?>>(parameters.values());
     }
 
@@ -205,7 +205,7 @@ private String addParameter(Object o, boolean collectionValued, ClauseType claus
             throw new NullPointerException();
         }
         String name = PREFIX + counter++;
-        parameters.put(name, new ParameterImpl<Object>(name, collectionValued, clause, o));
+        parameters.put(name, new ParameterImpl<>(name, collectionValued, clause, o));
         return name;
     }
 
@@ -213,7 +213,7 @@ public void addParameterMapping(String parameterName, Object o, ClauseType claus
         if (parameterName == null) {
             throw new NullPointerException("parameterName");
         }
-        parameters.put(parameterName, new ParameterImpl<Object>(parameterName, o instanceof Collection, clause, o));
+        parameters.put(parameterName, new ParameterImpl<>(parameterName, o instanceof Collection, clause, o));
     }
 
     public void registerParameterName(String parameterName, boolean collectionValued, ClauseType clause) {
@@ -222,7 +222,7 @@ public void registerParameterName(String parameterName, boolean collectionValued
         }
         ParameterImpl<?> parameter = parameters.get(parameterName);
         if (parameter == null) {
-            parameters.put(parameterName, new ParameterImpl<Object>(parameterName, collectionValued, clause));
+            parameters.put(parameterName, new ParameterImpl<>(parameterName, collectionValued, clause));
         } else {
             parameter.getClauseTypes().add(clause);
         }
@@ -306,7 +306,7 @@ public void setParameterType(String parameterName, Class<?> type) {
      * @author Christian Beikov
      * @since 1.2.0
      */
-    static final class ParameterImpl<T> implements Parameter<T> {
+    static final class ParameterImpl<T> implements ExtendedParameter<T> {
 
         private final String name;
         private final Integer position;
@@ -342,6 +342,7 @@ public Integer getPosition() {
             return position;
         }
 
+        @Override
         public boolean isCollectionValued() {
             return collectionValued;
         }
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/AbstractCustomQuery.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/AbstractCustomQuery.java
index cd385d7baf..521a7e78d0 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/AbstractCustomQuery.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/AbstractCustomQuery.java
@@ -18,12 +18,21 @@
 
 import com.blazebit.persistence.impl.ParameterValueTransformer;
 import com.blazebit.persistence.impl.ValuesParameterBinder;
+import com.blazebit.persistence.impl.util.SetView;
 import com.blazebit.persistence.spi.CteQueryWrapper;
 
 import javax.persistence.Parameter;
 import javax.persistence.Query;
 import javax.persistence.TemporalType;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @author Christian Beikov
@@ -34,56 +43,35 @@ public abstract class AbstractCustomQuery<T> implements Query, CteQueryWrapper {
     protected final QuerySpecification<T> querySpecification;
     protected final Map<String, ParameterValueTransformer> transformers;
     protected final Map<String, ValuesParameter> valuesParameters;
-    protected final Map<String, Set<Query>> parameterQueries;
-    protected final Set<Parameter<?>> parameters;
-    protected final Set<String> parametersToSet;
+    protected final Map<String, String> valuesElementParameters;
+    protected final Map<String, Parameter<?>> parameters;
+    protected final Map<String, ValueBinder> valueBinders;
     protected int firstResult;
     protected int maxResults = Integer.MAX_VALUE;
 
     public AbstractCustomQuery(QuerySpecification<T> querySpecification, Map<String, ParameterValueTransformer> transformers, Map<String, String> valuesParameters, Map<String, ValuesParameterBinder> valuesBinders) {
         this.querySpecification = querySpecification;
         Map<String, ValuesParameter> valuesParameterMap = new HashMap<String, ValuesParameter>();
-        Map<String, Set<Query>> parameterQueries = new HashMap<String, Set<Query>>();
-        Set<Parameter<?>> parameters = new HashSet<Parameter<?>>();
-        Set<String> parametersToSet = new HashSet<String>();
-        // TODO: Fix this, currently this builds the complete query plan
-        for (Query q : querySpecification.getParticipatingQueries()) {
-            for (Parameter<?> p : q.getParameters()) {
-                String name = p.getName();
-                String valuesName = valuesParameters.get(name);
-                if (valuesName != null) {
-                    // Replace the name with the values parameter name so the query gets registered for that
-                    name = valuesName;
-                    if (!valuesParameterMap.containsKey(valuesName)) {
-                        ValuesParameter param = new ValuesParameter(valuesName, valuesBinders.get(valuesName));
-                        parameters.add(param);
-                        valuesParameterMap.put(valuesName, param);
-
-                        if (!q.isBound(p)) {
-                            parametersToSet.add(valuesName);
-                        }
-                    }
-                }
-
-                Set<Query> queries = parameterQueries.get(name);
-                if (queries == null) {
-                    queries = new HashSet<Query>();
-                    parameterQueries.put(name, queries);
-                    if (valuesName == null) {
-                        parameters.add(p);
-                        if (!q.isBound(p)) {
-                            parametersToSet.add(name);
-                        }
-                    }
-                }
-                queries.add(q);
+        Map<String, Parameter<?>> parameters = new HashMap<>();
+        this.valueBinders = new HashMap<>(parameters.size());
+
+        for (Parameter<?> p : querySpecification.getParameters()) {
+            String name = p.getName();
+            ValuesParameterBinder valuesParameterBinder = valuesBinders.get(name);
+            if (valuesParameterBinder == null) {
+                parameters.put(name, p);
+                valueBinders.put(name, null);
+            } else {
+                ValuesParameter param = new ValuesParameter(name, valuesParameterBinder);
+                parameters.put(name, param);
+                valueBinders.put(name, null);
+                valuesParameterMap.put(name, param);
             }
         }
         this.transformers = Collections.unmodifiableMap(transformers);
         this.valuesParameters = Collections.unmodifiableMap(valuesParameterMap);
-        this.parameters = Collections.unmodifiableSet(parameters);
-        this.parameterQueries = Collections.unmodifiableMap(parameterQueries);
-        this.parametersToSet = parametersToSet;
+        this.valuesElementParameters = Collections.unmodifiableMap(valuesParameters);
+        this.parameters = Collections.unmodifiableMap(parameters);
     }
 
     public QuerySpecification<T> getQuerySpecification() {
@@ -121,19 +109,38 @@ public int getFirstResult() {
         return firstResult;
     }
 
-    private Set<Query> queries(String name) {
-        Set<Query> queries = parameterQueries.get(name);
-        if (queries == null) {
-            throw new IllegalArgumentException("Parameter '" + name + "' does not exist!");
+    protected void bindParameters() {
+        Set<String> missingParameters = null;
+        for (Query q : querySpecification.getParticipatingQueries()) {
+            for (Parameter<?> p : q.getParameters()) {
+                String name = p.getName();
+                String valuesName = valuesElementParameters.get(name);
+                if (valuesName == null) {
+                    ValueBinder valueBinder = valueBinders.get(name);
+                    if (valueBinder == null) {
+                        if (missingParameters == null) {
+                            missingParameters = new HashSet<>();
+                        }
+                        missingParameters.add(name);
+                    } else {
+                        valueBinder.bind(q, name);
+                    }
+                } else {
+                    ValuesParameter valuesParameter = valuesParameters.get(valuesName);
+                    if (valuesParameter.getValue() == null) {
+                        if (missingParameters == null) {
+                            missingParameters = new HashSet<>();
+                        }
+                        missingParameters.add(name);
+                    } else {
+                        valuesParameter.bind(q);
+                    }
+                }
+            }
         }
-        return queries;
-    }
-
-    protected void validateParameterBindings() {
-        if (parametersToSet.isEmpty()) {
-            return;
+        if (missingParameters != null && !missingParameters.isEmpty()) {
+            throw new IllegalArgumentException("The following parameters have not been set: " + missingParameters);
         }
-        throw new IllegalArgumentException("The following parameters have not been set: " + parametersToSet);
     }
 
     @Override
@@ -156,27 +163,21 @@ public Query setParameter(Parameter<Date> param, Date value, TemporalType tempor
 
     @Override
     public Query setParameter(String name, Object value) {
-        Set<Query> queries = queries(name);
         ValuesParameter valuesParameter = valuesParameters.get(name);
-        if (valuesParameter != null) {
-            parametersToSet.remove(name);
-            for (Query q : queries) {
-                valuesParameter.setValue(value);
-                valuesParameter.bind(q);
+        if (valuesParameter == null) {
+            if (!parameters.containsKey(name)) {
+                throw new IllegalArgumentException("Invalid or unknown parameter with name: " + name);
             }
-        } else if (queries.size() > 0) {
-            querySpecification.onParameterChange(name);
-            parametersToSet.remove(name);
             ParameterValueTransformer transformer = transformers.get(name);
             if (transformer != null) {
                 value = transformer.transform(value);
             }
-
-            for (Query q : queries) {
-                q.setParameter(name, value);
+            if (value instanceof Collection<?>) {
+                querySpecification.onCollectionParameterChange(name, (Collection<?>) value);
             }
+            valueBinders.put(name, new DefaultValueBinder(value));
         } else {
-            throw new IllegalArgumentException("Invalid or unknown parameter with name: " + name);
+            valuesParameter.setValue(value);
         }
 
         return this;
@@ -184,66 +185,47 @@ public Query setParameter(String name, Object value) {
 
     @Override
     public Query setParameter(String name, Calendar value, TemporalType temporalType) {
-        Set<Query> queries = queries(name);
-        if (queries.size() > 0) {
-            querySpecification.onParameterChange(name);
-            parametersToSet.remove(name);
-            for (Query q : queries) {
-                q.setParameter(name, value, temporalType);
-            }
-        } else {
+        if (!parameters.containsKey(name)) {
             throw new IllegalArgumentException("Invalid or unknown parameter with name: " + name);
         }
+        valueBinders.put(name, new CalendarValueBinder(value, temporalType));
 
         return this;
     }
 
     @Override
     public Query setParameter(String name, Date value, TemporalType temporalType) {
-        Set<Query> queries = queries(name);
-        if (queries.size() > 0) {
-            querySpecification.onParameterChange(name);
-            parametersToSet.remove(name);
-            for (Query q : queries) {
-                q.setParameter(name, value, temporalType);
-            }
-        } else {
+        if (!parameters.containsKey(name)) {
             throw new IllegalArgumentException("Invalid or unknown parameter with name: " + name);
         }
+        valueBinders.put(name, new DateValueBinder(value, temporalType));
 
         return this;
     }
 
     @Override
     public Query setParameter(int position, Object value) {
-        throw new IllegalArgumentException("Positional parameters unsupported!");
+        return setParameter(Integer.toString(position), value);
     }
 
     @Override
     public Query setParameter(int position, Calendar value, TemporalType temporalType) {
-        throw new IllegalArgumentException("Positional parameters unsupported!");
+        return setParameter(Integer.toString(position), value, temporalType);
     }
 
     @Override
     public Query setParameter(int position, Date value, TemporalType temporalType) {
-        throw new IllegalArgumentException("Positional parameters unsupported!");
+        return setParameter(Integer.toString(position), value, temporalType);
     }
 
     @Override
     public Set<Parameter<?>> getParameters() {
-        return parameters;
+        return new SetView<>(parameters.values());
     }
 
     @Override
     public Parameter<?> getParameter(String name) {
-        ValuesParameter valuesParameter = valuesParameters.get(name);
-        if (valuesParameter != null) {
-            return valuesParameter;
-        }
-
-        Set<Query> queries = queries(name);
-        Query q = queries.iterator().next();
-        return q.getParameter(name);
+        return parameters.get(name);
     }
 
     @Override
@@ -272,9 +254,7 @@ public boolean isBound(Parameter<?> param) {
             return valuesParameter.getValue() != null;
         }
 
-        Set<Query> queries = queries(param.getName());
-        Query q = queries.iterator().next();
-        return q.isBound(q.getParameter(param.getName()));
+        return valueBinders.get(param.getName()) != null;
     }
 
     @Override
@@ -289,8 +269,8 @@ public Object getParameterValue(String name) {
             return valuesParameter.getValue();
         }
 
-        Set<Query> queries = queries(name);
-        return queries.iterator().next().getParameterValue(name);
+        ValueBinder valueBinder = valueBinders.get(name);
+        return valueBinder == null ? null : valueBinder.getValue();
     }
 
     @Override
@@ -298,6 +278,85 @@ public Object getParameterValue(int position) {
         throw new IllegalArgumentException("Positional parameters unsupported!");
     }
 
+    /**
+     * @author Christian Beikov
+     * @since 1.2.0
+     */
+    static interface ValueBinder {
+        void bind(Query query, String name);
+        Object getValue();
+    }
+
+    /**
+     * @author Christian Beikov
+     * @since 1.2.0
+     */
+    static class DefaultValueBinder implements ValueBinder {
+        private final Object value;
+
+        public DefaultValueBinder(Object value) {
+            this.value = value;
+        }
+
+        @Override
+        public void bind(Query query, String name) {
+            query.setParameter(name, value);
+        }
+
+        @Override
+        public Object getValue() {
+            return value;
+        }
+    }
+
+    /**
+     * @author Christian Beikov
+     * @since 1.2.0
+     */
+    static class CalendarValueBinder implements ValueBinder {
+        private final Calendar value;
+        private final TemporalType temporalType;
+
+        public CalendarValueBinder(Calendar value, TemporalType temporalType) {
+            this.value = value;
+            this.temporalType = temporalType;
+        }
+
+        @Override
+        public void bind(Query query, String name) {
+            query.setParameter(name, value, temporalType);
+        }
+
+        @Override
+        public Object getValue() {
+            return value;
+        }
+    }
+
+    /**
+     * @author Christian Beikov
+     * @since 1.2.0
+     */
+    static class DateValueBinder implements ValueBinder {
+        private final Date value;
+        private final TemporalType temporalType;
+
+        public DateValueBinder(Date value, TemporalType temporalType) {
+            this.value = value;
+            this.temporalType = temporalType;
+        }
+
+        @Override
+        public void bind(Query query, String name) {
+            query.setParameter(name, value, temporalType);
+        }
+
+        @Override
+        public Object getValue() {
+            return value;
+        }
+    }
+
     /**
      * @author Christian Beikov
      * @since 1.2.0
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CTEQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CTEQuerySpecification.java
index 33f05b01dd..317d150d5f 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CTEQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CTEQuerySpecification.java
@@ -19,19 +19,25 @@
 import com.blazebit.persistence.impl.AbstractCommonQueryBuilder;
 import com.blazebit.persistence.impl.plan.SelectQueryPlan;
 
+import javax.persistence.Parameter;
 import javax.persistence.Query;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  *
  * @author Christian Beikov
  * @since 1.2.0
  */
-public class CTEQuerySpecification extends CustomQuerySpecification {
+public class CTEQuerySpecification extends CustomQuerySpecification<Object> {
 
-    public CTEQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Set<String> parameterListNames, String limit, String offset,
+    public CTEQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Set<Parameter<?>> parameters, Set<String> parameterListNames, String limit, String offset,
                                  List<String> keyRestrictedLeftJoinAliases, List<EntityFunctionNode> entityFunctionNodes) {
-        super(commonQueryBuilder, baseQuery, parameterListNames, limit, offset, keyRestrictedLeftJoinAliases, entityFunctionNodes, false, Collections.EMPTY_LIST, false);
+        super(commonQueryBuilder, baseQuery, parameters, parameterListNames, limit, offset, keyRestrictedLeftJoinAliases, entityFunctionNodes, false, Collections.EMPTY_LIST, false);
     }
 
     @Override
@@ -42,6 +48,9 @@ public Query getBaseQuery() {
     @Override
     protected void initialize() {
         List<Query> participatingQueries = new ArrayList<Query>();
+        for (Map.Entry<String, Collection<?>> entry : listParameters.entrySet()) {
+            baseQuery.setParameter(entry.getKey(), entry.getValue());
+        }
 
         String sqlQuery = extendedQuerySupport.getSql(em, baseQuery);
         StringBuilder sqlSb = applySqlTransformations(baseQuery, sqlQuery, participatingQueries);
@@ -55,7 +64,7 @@ protected void initialize() {
     }
 
     @Override
-    public SelectQueryPlan createSelectPlan(int firstResult, int maxResults) {
+    public SelectQueryPlan<Object> createSelectPlan(int firstResult, int maxResults) {
         throw new UnsupportedOperationException();
     }
 
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionDeleteModificationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionDeleteModificationQuerySpecification.java
index 5c6cfa92bd..132ccbf3f9 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionDeleteModificationQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionDeleteModificationQuerySpecification.java
@@ -20,8 +20,10 @@
 import com.blazebit.persistence.impl.util.SqlUtils;
 import com.blazebit.persistence.spi.DbmsModificationState;
 
+import javax.persistence.Parameter;
 import javax.persistence.Query;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -31,7 +33,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-public class CollectionDeleteModificationQuerySpecification extends ModificationQuerySpecification {
+public class CollectionDeleteModificationQuerySpecification<T> extends ModificationQuerySpecification<T> {
 
     public static final String COLLECTION_BASE_QUERY_ALIAS = "_collection";
 
@@ -39,9 +41,9 @@ public class CollectionDeleteModificationQuerySpecification extends Modification
     private final String deleteSql;
     private final Map<String, String> columnExpressionRemappings;
 
-    public CollectionDeleteModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<String> parameterListNames, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes,
+    public CollectionDeleteModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<Parameter<?>> parameters, Set<String> parameterListNames, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes,
                                                           boolean isEmbedded, String[] returningColumns, Map<DbmsModificationState, String> includedModificationStates, Map<String, String> returningAttributeBindingMap, Query deleteExampleQuery, String deleteSql, Map<String, String> columnExpressionRemappings) {
-        super(commonQueryBuilder, baseQuery, exampleQuery, parameterListNames, recursive, ctes, shouldRenderCteNodes, isEmbedded, returningColumns, includedModificationStates, returningAttributeBindingMap);
+        super(commonQueryBuilder, baseQuery, exampleQuery, parameters, parameterListNames, recursive, ctes, shouldRenderCteNodes, isEmbedded, returningColumns, includedModificationStates, returningAttributeBindingMap);
         this.deleteExampleQuery = deleteExampleQuery;
         this.deleteSql = deleteSql;
         this.columnExpressionRemappings = columnExpressionRemappings;
@@ -51,6 +53,10 @@ public CollectionDeleteModificationQuerySpecification(AbstractCommonQueryBuilder
     protected void initialize() {
         List<Query> participatingQueries = new ArrayList<Query>();
 
+        for (Map.Entry<String, Collection<?>> entry : listParameters.entrySet()) {
+            baseQuery.setParameter(entry.getKey(), entry.getValue());
+        }
+
         StringBuilder sqlSb = new StringBuilder(extendedQuerySupport.getSql(em, baseQuery));
 
         // Replace the "select ... from ..." part of the base query by the "delete from collectionTable" part
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionInsertModificationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionInsertModificationQuerySpecification.java
index 9452cd30d4..2b81aec4fc 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionInsertModificationQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionInsertModificationQuerySpecification.java
@@ -19,8 +19,10 @@
 import com.blazebit.persistence.impl.AbstractCommonQueryBuilder;
 import com.blazebit.persistence.spi.DbmsModificationState;
 
+import javax.persistence.Parameter;
 import javax.persistence.Query;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -30,15 +32,15 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-public class CollectionInsertModificationQuerySpecification extends ModificationQuerySpecification {
+public class CollectionInsertModificationQuerySpecification<T> extends ModificationQuerySpecification<T> {
 
     private final Query insertExampleQuery;
     private final String insertSql;
 
-    public CollectionInsertModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<String> parameterListNames,
+    public CollectionInsertModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<Parameter<?>> parameters, Set<String> parameterListNames,
                                                           List<String> keyRestrictedLeftJoinAliases, List<EntityFunctionNode> entityFunctionNodes, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes,
                                                           boolean isEmbedded, String[] returningColumns, Map<DbmsModificationState, String> includedModificationStates, Map<String, String> returningAttributeBindingMap, Query insertExampleQuery, String insertSql) {
-        super(commonQueryBuilder, baseQuery, exampleQuery, parameterListNames, keyRestrictedLeftJoinAliases, entityFunctionNodes, recursive, ctes, shouldRenderCteNodes, isEmbedded, returningColumns, includedModificationStates, returningAttributeBindingMap);
+        super(commonQueryBuilder, baseQuery, exampleQuery, parameters, parameterListNames, keyRestrictedLeftJoinAliases, entityFunctionNodes, recursive, ctes, shouldRenderCteNodes, isEmbedded, returningColumns, includedModificationStates, returningAttributeBindingMap);
         this.insertExampleQuery = insertExampleQuery;
         this.insertSql = insertSql;
     }
@@ -47,6 +49,10 @@ public CollectionInsertModificationQuerySpecification(AbstractCommonQueryBuilder
     protected void initialize() {
         List<Query> participatingQueries = new ArrayList<Query>();
 
+        for (Map.Entry<String, Collection<?>> entry : listParameters.entrySet()) {
+            baseQuery.setParameter(entry.getKey(), entry.getValue());
+        }
+
         String sql = extendedQuerySupport.getSql(em, baseQuery);
         StringBuilder sqlSb = applySqlTransformations(baseQuery, sql, participatingQueries);
         sqlSb.insert(0, insertSql);
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionUpdateModificationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionUpdateModificationQuerySpecification.java
index 53c648e8da..9f32fefc7d 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionUpdateModificationQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionUpdateModificationQuerySpecification.java
@@ -20,8 +20,10 @@
 import com.blazebit.persistence.impl.util.SqlUtils;
 import com.blazebit.persistence.spi.DbmsModificationState;
 
+import javax.persistence.Parameter;
 import javax.persistence.Query;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -31,7 +33,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-public class CollectionUpdateModificationQuerySpecification extends ModificationQuerySpecification {
+public class CollectionUpdateModificationQuerySpecification<T> extends ModificationQuerySpecification<T> {
 
     public static final String COLLECTION_BASE_QUERY_ALIAS = "_collection";
 
@@ -41,9 +43,9 @@ public class CollectionUpdateModificationQuerySpecification extends Modification
     private final Map<String, String> columnOnlyRemappings;
     private final Map<String, String> columnExpressionRemappings;
 
-    public CollectionUpdateModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<String> parameterListNames, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes, boolean isEmbedded, String[] returningColumns,
+    public CollectionUpdateModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<Parameter<?>> parameters, Set<String> parameterListNames, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes, boolean isEmbedded, String[] returningColumns,
                                                           Map<DbmsModificationState, String> includedModificationStates, Map<String, String> returningAttributeBindingMap, Query updateExampleQuery, String updateSql, List<Query> setExpressionContainingUpdateQueries, Map<String, String> columnOnlyRemappings, Map<String, String> columnExpressionRemappings) {
-        super(commonQueryBuilder, baseQuery, exampleQuery, parameterListNames, recursive, ctes, shouldRenderCteNodes, isEmbedded, returningColumns, includedModificationStates, returningAttributeBindingMap);
+        super(commonQueryBuilder, baseQuery, exampleQuery, parameters, parameterListNames, recursive, ctes, shouldRenderCteNodes, isEmbedded, returningColumns, includedModificationStates, returningAttributeBindingMap);
         this.updateExampleQuery = updateExampleQuery;
         this.updateSql = updateSql;
         this.setExpressionContainingUpdateQueries = setExpressionContainingUpdateQueries;
@@ -55,6 +57,10 @@ public CollectionUpdateModificationQuerySpecification(AbstractCommonQueryBuilder
     protected void initialize() {
         List<Query> participatingQueries = new ArrayList<Query>();
 
+        for (Map.Entry<String, Collection<?>> entry : listParameters.entrySet()) {
+            baseQuery.setParameter(entry.getKey(), entry.getValue());
+        }
+
         StringBuilder sqlSb = new StringBuilder(extendedQuerySupport.getSql(em, baseQuery));
         StringBuilder setClauseSqlSb = new StringBuilder(updateSql);
 
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomQuerySpecification.java
index a87b0ff7e5..9445e61b57 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomQuerySpecification.java
@@ -28,8 +28,16 @@
 import com.blazebit.persistence.spi.ServiceProvider;
 
 import javax.persistence.EntityManager;
+import javax.persistence.Parameter;
 import javax.persistence.Query;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  *
@@ -45,7 +53,8 @@ public class CustomQuerySpecification<T> implements QuerySpecification<T> {
 
     protected final DbmsStatementType statementType;
     protected final Query baseQuery;
-    protected final Set<String> parameterListNames;
+    protected final Set<Parameter<?>> parameters;
+    protected final Map<String, Collection<?>> listParameters;
     protected final String limit;
     protected final String offset;
 
@@ -60,7 +69,7 @@ public class CustomQuerySpecification<T> implements QuerySpecification<T> {
     protected List<Query> participatingQueries;
     protected Map<String, String> addedCtes;
 
-    public CustomQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Set<String> parameterListNames, String limit, String offset,
+    public CustomQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Set<Parameter<?>> parameters, Set<String> listParameters, String limit, String offset,
                                     List<String> keyRestrictedLeftJoinAliases, List<EntityFunctionNode> entityFunctionNodes, boolean recursive, List<CTENode> ctes, boolean shouldRenderCtes) {
         this.em = commonQueryBuilder.getEntityManager();
         this.dbmsDialect = commonQueryBuilder.getService(DbmsDialect.class);
@@ -68,10 +77,15 @@ public CustomQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> common
         this.extendedQuerySupport = commonQueryBuilder.getService(ExtendedQuerySupport.class);
         this.statementType = commonQueryBuilder.getStatementType();
         this.baseQuery = baseQuery;
-        this.parameterListNames = parameterListNames;
+        this.parameters = parameters;
+        this.listParameters = new HashMap<>();
         this.limit = limit;
         this.offset = offset;
 
+        for (String listParameter : listParameters) {
+            this.listParameters.put(listParameter, Collections.emptyList());
+        }
+
         this.keyRestrictedLeftJoinAliases = keyRestrictedLeftJoinAliases;
         this.entityFunctionNodes = entityFunctionNodes;
         this.recursive = recursive;
@@ -86,9 +100,9 @@ public ModificationQueryPlan createModificationPlan(int firstResult, int maxResu
     }
 
     @Override
-    public SelectQueryPlan createSelectPlan(int firstResult, int maxResults) {
+    public SelectQueryPlan<T> createSelectPlan(int firstResult, int maxResults) {
         final String sql = getSql();
-        return new CustomSelectQueryPlan(extendedQuerySupport, serviceProvider, baseQuery, participatingQueries, sql, firstResult, maxResults);
+        return new CustomSelectQueryPlan<>(extendedQuerySupport, serviceProvider, baseQuery, participatingQueries, sql, firstResult, maxResults);
     }
 
     @Override
@@ -107,6 +121,12 @@ public List<Query> getParticipatingQueries() {
         return participatingQueries;
     }
 
+    @Override
+    @SuppressWarnings("unchecked")
+    public Set<Parameter<?>> getParameters() {
+        return (Set<Parameter<?>>) (Set) parameters;
+    }
+
     @Override
     public Map<String, String> getAddedCtes() {
         if (dirty) {
@@ -121,14 +141,20 @@ public Query getBaseQuery() {
     }
 
     @Override
-    public void onParameterChange(String parameterName) {
-        if (parameterListNames.contains(parameterName)) {
+    public void onCollectionParameterChange(String parameterName, Collection<?> value) {
+        Collection<?> listParameterValue = listParameters.get(parameterName);
+        if (listParameterValue != null && listParameterValue.size() != value.size()) {
             dirty = true;
+            listParameters.put(parameterName, value);
         }
     }
 
     protected void initialize() {
-        List<Query> participatingQueries = new ArrayList<Query>();
+        List<Query> participatingQueries = new ArrayList<>();
+
+        for (Map.Entry<String, Collection<?>> entry : listParameters.entrySet()) {
+            baseQuery.setParameter(entry.getKey(), entry.getValue());
+        }
 
         String sqlQuery = extendedQuerySupport.getSql(em, baseQuery);
         StringBuilder sqlSb = applySqlTransformations(baseQuery, sqlQuery, participatingQueries);
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomReturningSQLTypedQuery.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomReturningSQLTypedQuery.java
index 1351beec14..cf09df25a7 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomReturningSQLTypedQuery.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomReturningSQLTypedQuery.java
@@ -44,20 +44,20 @@ public CustomReturningSQLTypedQuery(QuerySpecification<ReturningResult<T>> query
     @Override
     @SuppressWarnings("unchecked")
     public List<ReturningResult<T>> getResultList() {
-        validateParameterBindings();
+        bindParameters();
         return querySpecification.createSelectPlan(firstResult, maxResults).getResultList();
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public ReturningResult<T> getSingleResult() {
-        validateParameterBindings();
+        bindParameters();
         return querySpecification.createSelectPlan(firstResult, maxResults).getSingleResult();
     }
 
     @Override
     public int executeUpdate() {
-        validateParameterBindings();
+        bindParameters();
         return querySpecification.createModificationPlan(firstResult, maxResults).executeUpdate();
     }
 
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomSQLQuery.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomSQLQuery.java
index c03867ce37..29fa880648 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomSQLQuery.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomSQLQuery.java
@@ -56,7 +56,7 @@ public Object getSingleResult() {
 
     @Override
     public int executeUpdate() {
-        validateParameterBindings();
+        bindParameters();
         return querySpecification.createModificationPlan(firstResult, maxResults).executeUpdate();
     }
 
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomSQLTypedQuery.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomSQLTypedQuery.java
index d7d7db849f..8abc488f22 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomSQLTypedQuery.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomSQLTypedQuery.java
@@ -46,14 +46,14 @@ public CustomSQLTypedQuery(QuerySpecification querySpecification, TypedQuery<X>
     @Override
     @SuppressWarnings("unchecked")
     public List<X> getResultList() {
-        validateParameterBindings();
+        bindParameters();
         return querySpecification.createSelectPlan(firstResult, maxResults).getResultList();
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public X getSingleResult() {
-        validateParameterBindings();
+        bindParameters();
         return querySpecification.createSelectPlan(firstResult, maxResults).getSingleResult();
     }
 
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/DefaultQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/DefaultQuerySpecification.java
index aeba915920..f792b487d4 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/DefaultQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/DefaultQuerySpecification.java
@@ -24,8 +24,10 @@
 import com.blazebit.persistence.spi.ExtendedQuerySupport;
 
 import javax.persistence.EntityManager;
+import javax.persistence.Parameter;
 import javax.persistence.Query;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -71,6 +73,11 @@ public List<Query> getParticipatingQueries() {
         return Arrays.asList(query);
     }
 
+    @Override
+    public Set<Parameter<?>> getParameters() {
+        return query.getParameters();
+    }
+
     @Override
     public Map<String, String> getAddedCtes() {
         return null;
@@ -82,6 +89,9 @@ public Query getBaseQuery() {
     }
 
     @Override
-    public void onParameterChange(String parameterName) {
+    public void onCollectionParameterChange(String parameterName, Collection value) {
+        if (parameterListNames.contains(parameterName)) {
+            query.setParameter(parameterName, value);
+        }
     }
 }
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/ModificationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/ModificationQuerySpecification.java
index 7cdaa4ba96..0dfd6cfaef 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/ModificationQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/ModificationQuerySpecification.java
@@ -23,15 +23,22 @@
 import com.blazebit.persistence.spi.DbmsLimitHandler;
 import com.blazebit.persistence.spi.DbmsModificationState;
 
+import javax.persistence.Parameter;
 import javax.persistence.Query;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  *
  * @author Christian Beikov
  * @since 1.2.0
  */
-public class ModificationQuerySpecification extends CustomQuerySpecification {
+public class ModificationQuerySpecification<T> extends CustomQuerySpecification<T> {
 
     protected final Query exampleQuery;
     protected final boolean isEmbedded;
@@ -41,15 +48,15 @@ public class ModificationQuerySpecification extends CustomQuerySpecification {
 
     protected Query query;
 
-    public ModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<String> parameterListNames, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes,
+    public ModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<Parameter<?>> parameters, Set<String> parameterListNames, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes,
                                           boolean isEmbedded, String[] returningColumns, Map<DbmsModificationState, String> includedModificationStates, Map<String, String> returningAttributeBindingMap) {
-        this(commonQueryBuilder, baseQuery, exampleQuery, parameterListNames, Collections.<String>emptyList(), Collections.<EntityFunctionNode>emptyList(), recursive, ctes, shouldRenderCteNodes, isEmbedded, returningColumns, includedModificationStates, returningAttributeBindingMap);
+        this(commonQueryBuilder, baseQuery, exampleQuery, parameters, parameterListNames, Collections.<String>emptyList(), Collections.<EntityFunctionNode>emptyList(), recursive, ctes, shouldRenderCteNodes, isEmbedded, returningColumns, includedModificationStates, returningAttributeBindingMap);
     }
 
-    public ModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<String> parameterListNames,
-                List<String> keyRestrictedLeftJoinAliases, List<EntityFunctionNode> entityFunctionNodes, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes,
-                boolean isEmbedded, String[] returningColumns, Map<DbmsModificationState, String> includedModificationStates, Map<String, String> returningAttributeBindingMap) {
-        super(commonQueryBuilder, baseQuery, parameterListNames, null, null, keyRestrictedLeftJoinAliases, entityFunctionNodes, recursive, ctes, shouldRenderCteNodes);
+    public ModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<Parameter<?>> parameters, Set<String> parameterListNames,
+                                          List<String> keyRestrictedLeftJoinAliases, List<EntityFunctionNode> entityFunctionNodes, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes,
+                                          boolean isEmbedded, String[] returningColumns, Map<DbmsModificationState, String> includedModificationStates, Map<String, String> returningAttributeBindingMap) {
+        super(commonQueryBuilder, baseQuery, parameters, parameterListNames, null, null, keyRestrictedLeftJoinAliases, entityFunctionNodes, recursive, ctes, shouldRenderCteNodes);
         this.exampleQuery = exampleQuery;
         this.isEmbedded = isEmbedded;
         this.returningColumns = returningColumns;
@@ -71,7 +78,7 @@ public ModificationQueryPlan createModificationPlan(int firstResult, int maxResu
     }
 
     @Override
-    public SelectQueryPlan createSelectPlan(int firstResult, int maxResults) {
+    public SelectQueryPlan<T> createSelectPlan(int firstResult, int maxResults) {
         throw new UnsupportedOperationException();
     }
 
@@ -84,6 +91,10 @@ public Query getBaseQuery() {
     protected void initialize() {
         List<Query> participatingQueries = new ArrayList<Query>();
 
+        for (Map.Entry<String, Collection<?>> entry : listParameters.entrySet()) {
+            baseQuery.setParameter(entry.getKey(), entry.getValue());
+        }
+
         String sqlQuery = extendedQuerySupport.getSql(em, baseQuery);
         StringBuilder sqlSb = applySqlTransformations(baseQuery, sqlQuery, participatingQueries);
         StringBuilder withClause = applyCtes(sqlSb, baseQuery, participatingQueries);
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/QuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/QuerySpecification.java
index 89b49441ac..f9ec1a534f 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/QuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/QuerySpecification.java
@@ -19,9 +19,12 @@
 import com.blazebit.persistence.impl.plan.ModificationQueryPlan;
 import com.blazebit.persistence.impl.plan.SelectQueryPlan;
 
+import javax.persistence.Parameter;
 import javax.persistence.Query;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  *
@@ -38,10 +41,12 @@ public interface QuerySpecification<T> {
 
     public List<Query> getParticipatingQueries();
 
+    public Set<Parameter<?>> getParameters();
+
     public Map<String, String> getAddedCtes();
 
     public Query getBaseQuery();
 
-    public void onParameterChange(String parameterName);
+    public void onCollectionParameterChange(String parameterName, Collection<?> value);
 
 }
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/ReturningCollectionDeleteModificationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/ReturningCollectionDeleteModificationQuerySpecification.java
index e623311788..fe2397fc5d 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/ReturningCollectionDeleteModificationQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/ReturningCollectionDeleteModificationQuerySpecification.java
@@ -17,12 +17,14 @@
 package com.blazebit.persistence.impl.query;
 
 import com.blazebit.persistence.ReturningObjectBuilder;
+import com.blazebit.persistence.ReturningResult;
 import com.blazebit.persistence.impl.AbstractCommonQueryBuilder;
 import com.blazebit.persistence.impl.plan.CustomReturningModificationQueryPlan;
 import com.blazebit.persistence.impl.plan.ModificationQueryPlan;
 import com.blazebit.persistence.impl.plan.SelectQueryPlan;
 import com.blazebit.persistence.spi.DbmsModificationState;
 
+import javax.persistence.Parameter;
 import javax.persistence.Query;
 import java.util.List;
 import java.util.Map;
@@ -33,14 +35,14 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-public class ReturningCollectionDeleteModificationQuerySpecification<T> extends CollectionDeleteModificationQuerySpecification {
+public class ReturningCollectionDeleteModificationQuerySpecification<T> extends CollectionDeleteModificationQuerySpecification<ReturningResult<T>> {
 
     private final ReturningObjectBuilder<T> objectBuilder;
 
-    public ReturningCollectionDeleteModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<String> parameterListNames, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes,
+    public ReturningCollectionDeleteModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<Parameter<?>> parameters, Set<String> parameterListNames, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes,
                                                                    boolean isEmbedded, String[] returningColumns, Map<DbmsModificationState, String> includedModificationStates, Map<String, String> returningAttributeBindingMap, Query deleteExampleQuery, String deleteSql,
                                                                    Map<String, String> columnExpressionRemappings, ReturningObjectBuilder<T> objectBuilder) {
-        super(commonQueryBuilder, baseQuery, exampleQuery, parameterListNames, recursive, ctes, shouldRenderCteNodes, isEmbedded, returningColumns, includedModificationStates, returningAttributeBindingMap, deleteExampleQuery, deleteSql, columnExpressionRemappings);
+        super(commonQueryBuilder, baseQuery, exampleQuery, parameters, parameterListNames, recursive, ctes, shouldRenderCteNodes, isEmbedded, returningColumns, includedModificationStates, returningAttributeBindingMap, deleteExampleQuery, deleteSql, columnExpressionRemappings);
         this.objectBuilder = objectBuilder;
     }
 
@@ -51,7 +53,7 @@ public ModificationQueryPlan createModificationPlan(int firstResult, int maxResu
     }
 
     @Override
-    public SelectQueryPlan createSelectPlan(int firstResult, int maxResults) {
+    public SelectQueryPlan<ReturningResult<T>> createSelectPlan(int firstResult, int maxResults) {
         final String sql = getSql();
         return new CustomReturningModificationQueryPlan<T>(extendedQuerySupport, serviceProvider, exampleQuery, objectBuilder, participatingQueries, sql, firstResult, maxResults, returningColumns.length == 1 && objectBuilder != null);
     }
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/ReturningCollectionInsertModificationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/ReturningCollectionInsertModificationQuerySpecification.java
index d21e09a7b4..30347e2c41 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/ReturningCollectionInsertModificationQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/ReturningCollectionInsertModificationQuerySpecification.java
@@ -17,12 +17,14 @@
 package com.blazebit.persistence.impl.query;
 
 import com.blazebit.persistence.ReturningObjectBuilder;
+import com.blazebit.persistence.ReturningResult;
 import com.blazebit.persistence.impl.AbstractCommonQueryBuilder;
 import com.blazebit.persistence.impl.plan.CustomReturningModificationQueryPlan;
 import com.blazebit.persistence.impl.plan.ModificationQueryPlan;
 import com.blazebit.persistence.impl.plan.SelectQueryPlan;
 import com.blazebit.persistence.spi.DbmsModificationState;
 
+import javax.persistence.Parameter;
 import javax.persistence.Query;
 import java.util.List;
 import java.util.Map;
@@ -33,13 +35,13 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-public class ReturningCollectionInsertModificationQuerySpecification<T> extends CollectionInsertModificationQuerySpecification {
+public class ReturningCollectionInsertModificationQuerySpecification<T> extends CollectionInsertModificationQuerySpecification<ReturningResult<T>> {
 
     private final ReturningObjectBuilder<T> objectBuilder;
 
-    public ReturningCollectionInsertModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<String> parameterListNames, List<String> keyRestrictedLeftJoinAliases, List<EntityFunctionNode> entityFunctionNodes, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes,
+    public ReturningCollectionInsertModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<Parameter<?>> parameters, Set<String> parameterListNames, List<String> keyRestrictedLeftJoinAliases, List<EntityFunctionNode> entityFunctionNodes, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes,
                                                                    boolean isEmbedded, String[] returningColumns, Map<DbmsModificationState, String> includedModificationStates, Map<String, String> returningAttributeBindingMap, Query insertExampleQuery, String insertSql, ReturningObjectBuilder<T> objectBuilder) {
-        super(commonQueryBuilder, baseQuery, exampleQuery, parameterListNames, keyRestrictedLeftJoinAliases, entityFunctionNodes, recursive, ctes, shouldRenderCteNodes, isEmbedded, returningColumns, includedModificationStates, returningAttributeBindingMap, insertExampleQuery, insertSql);
+        super(commonQueryBuilder, baseQuery, exampleQuery, parameters, parameterListNames, keyRestrictedLeftJoinAliases, entityFunctionNodes, recursive, ctes, shouldRenderCteNodes, isEmbedded, returningColumns, includedModificationStates, returningAttributeBindingMap, insertExampleQuery, insertSql);
         this.objectBuilder = objectBuilder;
     }
 
@@ -50,7 +52,7 @@ public ModificationQueryPlan createModificationPlan(int firstResult, int maxResu
     }
 
     @Override
-    public SelectQueryPlan createSelectPlan(int firstResult, int maxResults) {
+    public SelectQueryPlan<ReturningResult<T>> createSelectPlan(int firstResult, int maxResults) {
         final String sql = getSql();
         return new CustomReturningModificationQueryPlan<T>(extendedQuerySupport, serviceProvider, exampleQuery, objectBuilder, participatingQueries, sql, firstResult, maxResults, returningColumns.length == 1 && objectBuilder != null);
     }
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/ReturningCollectionUpdateModificationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/ReturningCollectionUpdateModificationQuerySpecification.java
index f0c30be6b7..3f74deadbc 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/ReturningCollectionUpdateModificationQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/ReturningCollectionUpdateModificationQuerySpecification.java
@@ -17,12 +17,14 @@
 package com.blazebit.persistence.impl.query;
 
 import com.blazebit.persistence.ReturningObjectBuilder;
+import com.blazebit.persistence.ReturningResult;
 import com.blazebit.persistence.impl.AbstractCommonQueryBuilder;
 import com.blazebit.persistence.impl.plan.CustomReturningModificationQueryPlan;
 import com.blazebit.persistence.impl.plan.ModificationQueryPlan;
 import com.blazebit.persistence.impl.plan.SelectQueryPlan;
 import com.blazebit.persistence.spi.DbmsModificationState;
 
+import javax.persistence.Parameter;
 import javax.persistence.Query;
 import java.util.List;
 import java.util.Map;
@@ -33,14 +35,14 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-public class ReturningCollectionUpdateModificationQuerySpecification<T> extends CollectionUpdateModificationQuerySpecification {
+public class ReturningCollectionUpdateModificationQuerySpecification<T> extends CollectionUpdateModificationQuerySpecification<ReturningResult<T>> {
 
     private final ReturningObjectBuilder<T> objectBuilder;
 
-    public ReturningCollectionUpdateModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<String> parameterListNames, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes,
+    public ReturningCollectionUpdateModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<Parameter<?>> parameters, Set<String> parameterListNames, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes,
                                                                    boolean isEmbedded, String[] returningColumns, Map<DbmsModificationState, String> includedModificationStates, Map<String, String> returningAttributeBindingMap, Query updateExampleQuery, String updateSql, List<Query> setExpressionContainingUpdateQueries,
                                                                    Map<String, String> columnOnlyRemappings, Map<String, String> columnExpressionRemappings, ReturningObjectBuilder<T> objectBuilder) {
-        super(commonQueryBuilder, baseQuery, exampleQuery, parameterListNames, recursive, ctes, shouldRenderCteNodes, isEmbedded, returningColumns, includedModificationStates, returningAttributeBindingMap, updateExampleQuery, updateSql, setExpressionContainingUpdateQueries, columnOnlyRemappings, columnExpressionRemappings);
+        super(commonQueryBuilder, baseQuery, exampleQuery, parameters, parameterListNames, recursive, ctes, shouldRenderCteNodes, isEmbedded, returningColumns, includedModificationStates, returningAttributeBindingMap, updateExampleQuery, updateSql, setExpressionContainingUpdateQueries, columnOnlyRemappings, columnExpressionRemappings);
         this.objectBuilder = objectBuilder;
     }
 
@@ -51,7 +53,7 @@ public ModificationQueryPlan createModificationPlan(int firstResult, int maxResu
     }
 
     @Override
-    public SelectQueryPlan createSelectPlan(int firstResult, int maxResults) {
+    public SelectQueryPlan<ReturningResult<T>> createSelectPlan(int firstResult, int maxResults) {
         final String sql = getSql();
         return new CustomReturningModificationQueryPlan<T>(extendedQuerySupport, serviceProvider, exampleQuery, objectBuilder, participatingQueries, sql, firstResult, maxResults, returningColumns.length == 1 && objectBuilder != null);
     }
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/ReturningModificationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/ReturningModificationQuerySpecification.java
index d263a2ee7a..fbccfcd65e 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/ReturningModificationQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/ReturningModificationQuerySpecification.java
@@ -22,8 +22,14 @@
 import com.blazebit.persistence.impl.plan.ModificationQueryPlan;
 import com.blazebit.persistence.impl.plan.SelectQueryPlan;
 
+import javax.persistence.Parameter;
 import javax.persistence.Query;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  *
@@ -36,9 +42,9 @@ public class ReturningModificationQuerySpecification<T> extends CustomQuerySpeci
     private final String[] returningColumns;
     private final ReturningObjectBuilder<T> objectBuilder;
 
-    public ReturningModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<String> parameterListNames, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes,
+    public ReturningModificationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query baseQuery, Query exampleQuery, Set<Parameter<?>> parameters, Set<String> parameterListNames, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes,
                                                    String[] returningColumns, ReturningObjectBuilder<T> objectBuilder) {
-        super(commonQueryBuilder, baseQuery, parameterListNames, null, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST, recursive, ctes, shouldRenderCteNodes);
+        super(commonQueryBuilder, baseQuery, parameters, parameterListNames, null, null, Collections.EMPTY_LIST, Collections.EMPTY_LIST, recursive, ctes, shouldRenderCteNodes);
         this.exampleQuery = exampleQuery;
         this.returningColumns = returningColumns;
         this.objectBuilder = objectBuilder;
@@ -65,6 +71,10 @@ public Query getBaseQuery() {
     protected void initialize() {
         List<Query> participatingQueries = new ArrayList<Query>();
 
+        for (Map.Entry<String, Collection<?>> entry : listParameters.entrySet()) {
+            baseQuery.setParameter(entry.getKey(), entry.getValue());
+        }
+
         StringBuilder sqlSb = new StringBuilder(extendedQuerySupport.getSql(em, baseQuery));
         StringBuilder withClause = applyCtes(sqlSb, baseQuery, participatingQueries);
         // NOTE: CTEs will only be added, if this is a subquery
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/SetOperationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/SetOperationQuerySpecification.java
index 3d7c221bf5..cdd15d8944 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/SetOperationQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/SetOperationQuerySpecification.java
@@ -22,15 +22,20 @@
 import com.blazebit.persistence.spi.OrderByElement;
 import com.blazebit.persistence.spi.SetOperationType;
 
+import javax.persistence.Parameter;
 import javax.persistence.Query;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  *
  * @author Christian Beikov
  * @since 1.2.0
  */
-public class SetOperationQuerySpecification extends CustomQuerySpecification {
+public class SetOperationQuerySpecification<T> extends CustomQuerySpecification<T> {
 
     private final Query leftMostQuery;
     private final List<Query> setOperands;
@@ -39,9 +44,9 @@ public class SetOperationQuerySpecification extends CustomQuerySpecification {
     private final boolean nested;
 
     public SetOperationQuerySpecification(AbstractCommonQueryBuilder<?, ?, ?, ?, ?> commonQueryBuilder, Query leftMostQuery, Query baseQuery, List<Query> setOperands, SetOperationType operator,
-                                          List<? extends OrderByElement> orderByElements, boolean nested, Set<String> parameterListNames, String limit, String offset,
+                                          List<? extends OrderByElement> orderByElements, boolean nested, Set<Parameter<?>> parameters, Set<String> parameterListNames, String limit, String offset,
                                           List<String> keyRestrictedLeftJoinAliases, List<EntityFunctionNode> entityFunctionNodes, boolean recursive, List<CTENode> ctes, boolean shouldRenderCteNodes) {
-        super(commonQueryBuilder, baseQuery, parameterListNames, limit, offset, keyRestrictedLeftJoinAliases, entityFunctionNodes, recursive, ctes, shouldRenderCteNodes);
+        super(commonQueryBuilder, baseQuery, parameters, parameterListNames, limit, offset, keyRestrictedLeftJoinAliases, entityFunctionNodes, recursive, ctes, shouldRenderCteNodes);
         this.leftMostQuery = leftMostQuery;
         this.setOperands = setOperands;
         this.operator = operator;
@@ -60,13 +65,16 @@ protected void initialize() {
         List<Query> participatingQueries = new ArrayList<Query>();
         List<Query> cteQueries = new ArrayList<Query>();
 
+        bindListParameters(baseQuery);
         if (leftMostQuery instanceof CustomSQLQuery) {
             CustomSQLQuery customQuery = (CustomSQLQuery) leftMostQuery;
+            bindListParameters(leftMostQuery);
             List<Query> customQueryParticipants = customQuery.getParticipatingQueries();
             participatingQueries.addAll(customQueryParticipants);
             sqlQuery = customQuery.getSql();
         } else if (leftMostQuery instanceof CustomSQLTypedQuery<?>) {
             CustomSQLTypedQuery<?> customQuery = (CustomSQLTypedQuery<?>) leftMostQuery;
+            bindListParameters(leftMostQuery);
             List<Query> customQueryParticipants = customQuery.getParticipatingQueries();
             participatingQueries.addAll(customQueryParticipants);
             sqlQuery = customQuery.getSql();
@@ -82,6 +90,7 @@ protected void initialize() {
         for (Query q : this.setOperands) {
             String setOperandSql;
 
+            bindListParameters(q);
             if (q instanceof CustomSQLQuery) {
                 CustomSQLQuery customQuery = (CustomSQLQuery) q;
                 List<Query> customQueryParticipants = customQuery.getParticipatingQueries();
@@ -119,9 +128,16 @@ protected void initialize() {
     }
 
     @Override
-    public SelectQueryPlan createSelectPlan(int firstResult, int maxResults) {
+    public SelectQueryPlan<T> createSelectPlan(int firstResult, int maxResults) {
         final String sql = getSql();
-        return new CustomSelectQueryPlan(extendedQuerySupport, serviceProvider, baseQuery, participatingQueries, sql, firstResult, maxResults);
+        return new CustomSelectQueryPlan<>(extendedQuerySupport, serviceProvider, baseQuery, participatingQueries, sql, firstResult, maxResults);
     }
 
+    private void bindListParameters(Query q) {
+        for (Map.Entry<String, Collection<?>> entry : listParameters.entrySet()) {
+            if (q.getParameter(entry.getKey()) != null) {
+                q.setParameter(entry.getKey(), entry.getValue());
+            }
+        }
+    }
 }
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/util/SetView.java b/core/impl/src/main/java/com/blazebit/persistence/impl/util/SetView.java
new file mode 100644
index 0000000000..0da08c3ee2
--- /dev/null
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/util/SetView.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.impl.util;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+
+/**
+ * A set implementation that allows to provide a set view of a collection.
+ *
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class SetView<E> implements Set<E>, Serializable {
+
+    final Collection<? extends E> c;
+
+    public SetView(Collection<? extends E> c) {
+        if (c == null) {
+            throw new NullPointerException();
+        }
+        this.c = c;
+    }
+
+    public int size() {
+        return c.size();
+    }
+
+    public boolean isEmpty() {
+        return c.isEmpty();
+    }
+
+    public boolean contains(Object o) {
+        return c.contains(o);
+    }
+
+    public Object[] toArray() {
+        return c.toArray();
+    }
+
+    public <T> T[] toArray(T[] a) {
+        return c.toArray(a);
+    }
+
+    public String toString() {
+        return c.toString();
+    }
+
+    public Iterator<E> iterator() {
+        return new Iterator<E>() {
+            private final Iterator<? extends E> i = c.iterator();
+
+            public boolean hasNext() {
+                return i.hasNext();
+            }
+
+            public E next() {
+                return i.next();
+            }
+
+            public void remove() {
+                throw new UnsupportedOperationException();
+            }
+        };
+    }
+
+    public boolean add(E e) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean remove(Object o) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean containsAll(Collection<?> coll) {
+        return c.containsAll(coll);
+    }
+
+    public boolean addAll(Collection<? extends E> coll) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean removeAll(Collection<?> coll) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean retainAll(Collection<?> coll) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void clear() {
+        throw new UnsupportedOperationException();
+    }
+
+}
diff --git a/core/parser/src/main/antlr4/imports/JPQL_lexer.g4 b/core/parser/src/main/antlr4/imports/JPQL_lexer.g4
index b22c484364..213405dfe3 100644
--- a/core/parser/src/main/antlr4/imports/JPQL_lexer.g4
+++ b/core/parser/src/main/antlr4/imports/JPQL_lexer.g4
@@ -137,7 +137,7 @@ Character_literal : '\''JavaLetter'\'';
 
 String_literal : '\'' ~[\']* '\'';
 
-Input_parameter : ':'Identifier;
+Input_parameter : ':'Identifier | '?'Digits;
  
 //Enum_literal : (Identifier'.')+Identifier;
  
diff --git a/core/parser/src/main/java/com/blazebit/persistence/parser/SimpleQueryGenerator.java b/core/parser/src/main/java/com/blazebit/persistence/parser/SimpleQueryGenerator.java
index d02eaa5815..ff1933bfd7 100644
--- a/core/parser/src/main/java/com/blazebit/persistence/parser/SimpleQueryGenerator.java
+++ b/core/parser/src/main/java/com/blazebit/persistence/parser/SimpleQueryGenerator.java
@@ -451,7 +451,11 @@ public void visit(ParameterExpression expression) {
         if (ParameterRenderingMode.LITERAL == parameterRenderingMode && (value = getLiteralParameterValue(expression)) != null) {
             sb.append(value);
         } else {
-            sb.append(":");
+            if (Character.isDigit(paramName.charAt(0))) {
+                sb.append("?");
+            } else {
+                sb.append(":");
+            }
             sb.append(paramName);
         }
     }
diff --git a/core/parser/src/main/java/com/blazebit/persistence/parser/expression/ParameterExpression.java b/core/parser/src/main/java/com/blazebit/persistence/parser/expression/ParameterExpression.java
index 7a5db753c3..acee7f282c 100644
--- a/core/parser/src/main/java/com/blazebit/persistence/parser/expression/ParameterExpression.java
+++ b/core/parser/src/main/java/com/blazebit/persistence/parser/expression/ParameterExpression.java
@@ -79,7 +79,11 @@ public void setCollectionValued(boolean collectionValued) {
 
     @Override
     public String toString() {
-        return ":" + name;
+        if (Character.isDigit(name.charAt(0))) {
+            return "?" + name;
+        } else {
+            return ":" + name;
+        }
     }
 
     @Override
diff --git a/core/testsuite/pom.xml b/core/testsuite/pom.xml
index f1e0285478..fee691d2aa 100644
--- a/core/testsuite/pom.xml
+++ b/core/testsuite/pom.xml
@@ -73,6 +73,28 @@
             <version>1.10.19</version>
         </dependency>
 
+        <!-- Preparation for Java 9+, include a dependency on the JAXB APIs -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${version.annotation}</version>
+        </dependency>
+
     </dependencies>
 
     <profiles>
@@ -600,7 +622,6 @@
                                 </goals>
                                 <phase>generate-sources</phase>
                                 <configuration>
-                                    <compilerArguments>${processor.plugin.compilerArguments}</compilerArguments>
                                     <!-- source output directory -->
                                     <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
                                     <processors>
@@ -616,6 +637,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>1.3.0.Final</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                 </plugins>
@@ -715,6 +761,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-4.3}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                 </plugins>
@@ -814,6 +885,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-5}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                 </plugins>
@@ -913,6 +1009,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-5.1}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                 </plugins>
@@ -1015,6 +1136,155 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-5.2}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>hibernate-5.3</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
+                <additional.source.directory>src/main/hibernate</additional.source.directory>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-entitymanager</artifactId>
+                    <version>${version.hibernate-5.3}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-testing</artifactId>
+                    <version>${version.hibernate-5.3}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <!-- IntelliJ apparently needs the annotation processor here -->
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-jpamodelgen</artifactId>
+                    <version>${version.hibernate-5.3}</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${additional.source.directory}</source>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>add-test-source-hibernate</id>
+                                <phase>generate-test-sources</phase>
+                                <goals>
+                                    <goal>add-test-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>src/test/hibernate</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <!-- Metamodel -->
+                            <dependency>
+                                <groupId>org.hibernate</groupId>
+                                <artifactId>hibernate-jpamodelgen</artifactId>
+                                <version>${version.hibernate-5.3}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                 </plugins>
@@ -1121,6 +1391,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-6.0}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                 </plugins>
@@ -1201,6 +1496,31 @@
                                 <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
                                 <version>${version.eclipselink}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                 </plugins>
@@ -1250,6 +1570,10 @@
                     <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
                     <scope>compile</scope>
                 </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
+                </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <!-- The old version has a bug when generating the static metamodel for PolymorphicPropertyMapBase -->
                 <dependency>
@@ -1335,6 +1659,31 @@
                                 <artifactId>datanucleus-jpa-query</artifactId>
                                 <version>${version.datanucleus.jpa-5}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                 </plugins>
@@ -1384,6 +1733,10 @@
                     <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
                     <scope>compile</scope>
                 </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>
@@ -1454,6 +1807,182 @@
                                 </configuration>
                             </execution>
                         </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>datanucleus-5.1</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
+                <additional.source.directory>src/main/basic</additional.source.directory>
+            </properties>
+            <repositories>
+                <repository>
+                    <id>DataNucleus Nightly</id>
+                    <name>DataNucleus Repository Nightly</name>
+                    <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
+                </repository>
+            </repositories>
+            <dependencies>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>javax.persistence</artifactId>
+                    <version>2.2.0-release</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-core</artifactId>
+                    <version>${version.datanucleus.base-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-api-jpa</artifactId>
+                    <version>${version.datanucleus.api-jpa-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-jpa-query</artifactId>
+                    <version>${version.datanucleus.jpa-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-rdbms</artifactId>
+                    <version>${version.datanucleus.rdbms-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.datanucleus</groupId>
+                        <artifactId>datanucleus-maven-plugin</artifactId>
+                        <version>4.0.0-release</version>
+                        <configuration>
+                            <api>JPA</api>
+                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
+                            <verbose>false</verbose>
+                            <fork>true</fork>
+                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
+                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
+                            <useFileListFile>true</useFileListFile>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>process-classes</phase>
+                                <goals>
+                                    <goal>enhance</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
+                                <version>${project.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${additional.source.directory}</source>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
                     </plugin>
                 </plugins>
             </build>
@@ -1525,6 +2054,31 @@
                                 <artifactId>openjpa-all</artifactId>
                                 <version>${version.openjpa}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                 </plugins>
diff --git a/core/testsuite/transaction.log b/core/testsuite/transaction.log
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/dist/bom/pom.xml b/dist/bom/pom.xml
index 90b72040db..1bd4a04d9c 100644
--- a/dist/bom/pom.xml
+++ b/dist/bom/pom.xml
@@ -131,6 +131,12 @@
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
+                <version>${project.version}</version>
+                <scope>runtime</scope>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-hibernate-6.0</artifactId>
@@ -143,6 +149,12 @@
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
+                <version>${project.version}</version>
+                <scope>runtime</scope>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-eclipselink</artifactId>
@@ -194,7 +206,13 @@
             </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-deltaspike-data-impl</artifactId>
+                <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.7</artifactId>
+                <version>${project.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.blazebit</groupId>
+                <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.8</artifactId>
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
diff --git a/dist/full/pom.xml b/dist/full/pom.xml
index 81ad63e7e1..23ba5058cb 100644
--- a/dist/full/pom.xml
+++ b/dist/full/pom.xml
@@ -97,6 +97,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-integration-hibernate-6.0</artifactId>
@@ -105,6 +109,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-integration-datanucleus</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-integration-eclipselink</artifactId>
diff --git a/documentation/src/main/asciidoc/core/manual/en_US/02_getting_started.adoc b/documentation/src/main/asciidoc/core/manual/en_US/02_getting_started.adoc
index 129c4a4934..d80da63038 100644
--- a/documentation/src/main/asciidoc/core/manual/en_US/02_getting_started.adoc
+++ b/documentation/src/main/asciidoc/core/manual/en_US/02_getting_started.adoc
@@ -53,6 +53,19 @@ The required dependencies for the core module are
 
 Depending on the JPA provider that should be used, one of the following integrations is required
 
+[[maven-setup-hibernate53]]
+===== Hibernate 5.3
+
+[source,xml]
+----
+<dependency>
+    <groupId>com.blazebit</groupId>
+    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
+    <version>${blaze-persistence.version}</version>
+    <scope>runtime</scope>
+</dependency>
+----
+
 [[maven-setup-hibernate52]]
 ===== Hibernate 5.2
 
@@ -105,8 +118,21 @@ Depending on the JPA provider that should be used, one of the following integrat
 </dependency>
 ----
 
+[[maven-setup-datanucleus51]]
+===== Datanucleus 5.1
+
+[source,xml]
+----
+<dependency>
+    <groupId>com.blazebit</groupId>
+    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
+    <version>${blaze-persistence.version}</version>
+    <scope>runtime</scope>
+</dependency>
+----
+
 [[maven-setup-datanucleus]]
-===== Datanucleus
+===== Datanucleus 4 and 5
 
 [source,xml]
 ----
@@ -258,6 +284,115 @@ public class BlazePersistenceConfiguration {
 }
 ----
 
+[[supported-java-runtimes]]
+=== Supported Java runtimes
+
+All projects are built for Java 7 except for the ones where dependencies already use Java 8 like e.g. Hibernate 5.2, Spring Data 2.0 etc.
+So you are going to need at least JDK 8 for building the project.
+
+We also support building the project with JDK 9 and try to keep up with newer versions.
+If you want to run your application on a Java 9 JVM you need to handle the fact that JDK 9+ doesn't export some APIs like the JAXB, JAF, javax.annotations and JTA anymore.
+In fact, JDK 11 will even remove the modules so the command line flags to add modules to the classpath won't work.
+
+Since libraries like Hibernate and others require these APIs you need to make them available. The easiest way to get these APIs back on the classpath is to package them along with your application.
+This will also work when running on Java 8. We suggest you add the following dependencies.
+
+[source,xml]
+----
+<dependency>
+    <groupId>javax.xml.bind</groupId>
+    <artifactId>jaxb-api</artifactId>
+    <version>2.2.11</version>
+</dependency>
+<dependency>
+    <groupId>com.sun.xml.bind</groupId>
+    <artifactId>jaxb-core</artifactId>
+    <version>2.2.11</version>
+</dependency>
+<dependency>
+    <groupId>com.sun.xml.bind</groupId>
+    <artifactId>jaxb-impl</artifactId>
+    <version>2.2.11</version>
+</dependency>
+<dependency>
+    <groupId>javax.transaction</groupId>
+    <artifactId>javax.transaction-api</artifactId>
+    <version>1.2</version>
+    <!-- In a managed environment like Java EE, use 'provided'. Otherwise use 'compile' -->
+    <scope>provided</scope>
+</dependency>
+<dependency>
+    <groupId>javax.activation</groupId>
+    <artifactId>activation</artifactId>
+    <version>1.1.1</version>
+    <!-- In a managed environment like Java EE, use 'provided'. Otherwise use 'compile' -->
+    <scope>provided</scope>
+</dependency>
+<dependency>
+    <groupId>javax.annotation</groupId>
+    <artifactId>javax.annotation-api</artifactId>
+    <version>1.3.2</version>
+    <!-- In a managed environment like Java EE, use 'provided'. Otherwise use 'compile' -->
+    <scope>provided</scope>
+</dependency>
+----
+
+Automatic module names for modules.
+
+|===
+|Module |Automatic module name
+
+|Core API
+|com.blazebit.persistence.core
+
+|Core Impl
+|com.blazebit.persistence.core.impl
+
+|Core Parser
+|com.blazebit.persistence.core.parser
+
+|JPA Criteria API
+|com.blazebit.persistence.criteria
+
+|Core Impl
+|com.blazebit.persistence.criteria.impl
+
+|JPA Criteria JPA2 Compatibility
+|com.blazebit.persistence.criteria.jpa2compatibility
+
+|===
+
+=== Supported environments/libraries
+
+The bare minimum is JPA 2.0. If you want to use the JPA Criteria API module, you will also have to add the JPA 2 compatibility module.
+Generally, we support the usage in Java EE 6+ or Spring 4+ applications.
+
+The following table outlines the supported library versions for the integrations.
+
+|===
+|Module |Automatic module name |Minimum version |Supported versions
+
+|Hibernate integration
+|com.blazebit.persistence.integration.hibernate
+|Hibernate 4.2
+|4.2, 4.3, 5.0, 5.1, 5.2, 5.3 (not all features are available in older versions)
+
+|EclipseLink integration
+|com.blazebit.persistence.integration.eclipselink
+|EclipseLink 2.6
+|2.6 (Probably 2.4 and 2.5 work as well, but only tested against 2.6)
+
+|DataNucleus integration
+|com.blazebit.persistence.integration.datanucleus
+|DataNucleus 4.1
+|4.1, 5.0
+
+|OpenJPA integration
+|com.blazebit.persistence.integration.openjpa
+|N/A
+|(Currently not usable. OpenJPA doesn't seem to be actively developed anymore and no users asked for support yet)
+|===
+
 === First criteria query
 
 This section is supposed to give you a first feeling of how to use the criteria
diff --git a/documentation/src/main/asciidoc/entity-view/manual/en_US/02_getting_started.adoc b/documentation/src/main/asciidoc/entity-view/manual/en_US/02_getting_started.adoc
index 86e4c975ca..9b4fb4cc21 100644
--- a/documentation/src/main/asciidoc/entity-view/manual/en_US/02_getting_started.adoc
+++ b/documentation/src/main/asciidoc/entity-view/manual/en_US/02_getting_started.adoc
@@ -279,6 +279,59 @@ public class BlazePersistenceConfiguration {
 }
 ----
 
+[[supported-java-runtimes]]
+=== Supported Java runtimes
+
+The entity view module like all other modules generally follows what has already been stated in the link:{core_doc}#supported-java-runtimes[core moduel documentation].
+
+Automatic module names for modules.
+
+|===
+|Module |Automatic module name
+
+|Entity View API
+|com.blazebit.persistence.view
+
+|Entity View Impl
+|com.blazebit.persistence.view.impl
+
+|===
+
+=== Supported environments/libraries
+
+Generally, we support the usage in Java EE 6+ or Spring 4+ applications.
+
+The following table outlines the supported library versions for the integrations.
+
+|===
+|Module |Automatic module name |Minimum version |Supported versions
+
+|CDI integration
+|com.blazebit.persistence.integration.view.cdi
+|CDI 1.0
+|1.0, 1.1, 1.2
+
+|Spring integration
+|com.blazebit.persistence.integration.view.spring
+|Spring 4.3
+|4.3, 5.0
+
+|DeltaSpike Data integration
+|com.blazebit.persistence.integration.deltaspike.data
+|DeltaSpike 1.7
+|1.7, 1.8
+
+|Spring Data integration
+|com.blazebit.persistence.integration.spring.data
+|Spring Data 1.11
+|1.11, 2.0
+
+|Spring Data Rest integration
+|com.blazebit.persistence.integration.spring.data.rest
+|Spring Data 1.11, Spring MVC 4.3
+|Spring Data 1.11 + Spring MVC 4.3, Spring Data 2.0 + Spring MVC 5.0
+|===
+
 === First entity view query
 
 This section is supposed to give you a first feeling of how to use entity views.
diff --git a/documentation/src/main/asciidoc/entity-view/manual/en_US/12_spring_data.adoc b/documentation/src/main/asciidoc/entity-view/manual/en_US/12_spring_data.adoc
index 254010f131..312a105092 100644
--- a/documentation/src/main/asciidoc/entity-view/manual/en_US/12_spring_data.adoc
+++ b/documentation/src/main/asciidoc/entity-view/manual/en_US/12_spring_data.adoc
@@ -16,7 +16,7 @@ In short, the following Maven dependencies are required
 ----
 <dependency>
     <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-2x</artifactId>
+    <artifactId>blaze-persistence-integration-spring-data-2.x</artifactId>
     <version>${blaze-persistence.version}</version>
     <scope>compile</scope>
 </dependency>
@@ -143,7 +143,7 @@ public class MyCatController {
 }
 ----
 
-Support for https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#specifications[Spring Data Specifications] can be added to an entity view repository by extending from `com.blazebit.persistence.spring.data.repository.EntityViewSpecificationExecutor`.
+https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#specifications[Spring Data Specifications] can be used without restrictions. There is also the convenience base interface `com.blazebit.persistence.spring.data.repository.EntityViewSpecificationExecutor` that can be extended from.
 
 [source,java]
 ----
@@ -167,5 +167,107 @@ public class MyCatController {
     }
 ----
 
+The integration handles ad-hoc uses of https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#jpa.entity-graph[`@EntityGraph`] by adapting the query generation through call of link:{core_jdoc}/persistence/CriteriaBuilder.html#fetch(java.lang.String...)[`CriteriaBuilder.fetch()`] rather than passing the entity graphs as hints.
+
+Another notable feature the integration provides is the support for the return type `KeysetAwarePage` as a replacement for `Page`.
+By using `KeysetAwarePage` the keyset pagination feature is enabled for the repository method.
+
+[source,java]
+----
+@Transactional(readOnly = true)
+public interface KeysetAwareCatViewRepository extends Repository<Cat, Long> {
+
+    KeysetAwarePage<SimpleCatView> findAll(Pageable pageable);
+}
+----
+
+Note that the `Pageable` should be an instance of `KeysetPageable` if keyset pagination should be used. A `KeysetPageable` can be retrieved through the `KeysetAwarePage` or manually
+by constructing a `KeysetPageRequest`. Note that constructing a `KeysetPageRequest` or actually the contained `KeysetPage` manually is not recommended. When working with Spring MVC,
+the Spring Data Rest integration might come in handy. For stateful server side frameworks, it's best to put the `KeysetAwarePage` into a session like storage
+to be able to use the `previousOrFirst()` and `next()` methods for retrieving `KeysetPageable` objects.
+
 All other Spring Data repository features like restrictions, pagination, slices and ordering are supported as usual.
-Please consult the Spring Data documentation for further information.
\ No newline at end of file
+Please consult the Spring Data documentation for further information.
+
+=== Spring Data Rest integration
+
+The Spring Data Rest integration offers similar pagination features for keyset pagination to what Spring Data already offers for normal pagination.
+First, a keyset pagination enabled repository is needed.
+
+
+[source,java]
+----
+@Transactional(readOnly = true)
+public interface KeysetAwareCatViewRepository extends Repository<Cat, Long> {
+
+    KeysetAwarePage<SimpleCatView> findAll(Pageable pageable);
+}
+----
+
+A controller can then use this repository like the following:
+
+[source,java]
+----
+@Controller
+public class MyCatController {
+
+    @Autowired
+    private KeysetAwareCatViewRepository simpleCatViewRepository;
+
+    @RequestMapping(path = "/cats", method = RequestMethod.GET)
+    public Page<SimpleCatView> getCats(@KeysetConfig(Cat.class) KeysetPageable pageable) {
+        return simpleCatViewRepository.findAll(pageable);
+    }
+----
+
+Note that {projectname} imposes some very important requirements that have to be fulfilled
+
+* There must always be a sort specification
+* The last sort specification must be the entity identifier
+
+For the keyset pagination to kick in, the client has to _remember_ the values by which the sorting is done of the first and the last element of the result.
+The values then need to be passed to the next request as JSON encoded query parameters. The values of the first element should use the parameter `lowest` and the last element the parameter `highest`.
+
+The following will illustrate how this works.
+
+First, the client makes an initial request.
+
+[source]
+----
+GET /cats?page=0&size=3&sort=id,desc
+{
+    content: [
+        { id: 10, name: 'Felix', age: 10 },
+        { id: 9, name: 'Robin', age: 4 },
+        { id: 8, name: 'Billy', age: 7 }
+    ]
+}
+----
+
+It's the responsibility of the client to remember the attributes by which it sorts of the first and last element.
+In this case, `{id: 10}` will be remembered as `lowest` and `{id: 8}` as `highest`. The client also has to remember the page and size which was used to request this data.
+When the client then wants to switch to the next page, it has to pass `lowest` and `highest` as parameters as well as `prevPage` representing the page that was used before.
+
+Note that the following is just an example for illustration. Stringified JSON objects in JavaScript should be encoded view `encodeURI()` before being used as query parameter.
+
+[source]
+----
+GET /cats?page=1&size=3&sort=id,desc&prevPage=0&lowest={id:10}&highest={id:8}
+{
+    content: [
+        { id: 7, name: 'Kitty', age: 1 },
+        { id: 6, name: 'Bob', age: 8 },
+        { id: 5, name: 'Frank', age: 14 }
+    ]
+}
+----
+
+This will make use of keyset pagination as can be seen by looking at the generated JPQL or SQL query.
+
+Note that the client should _drop_ or _forget_ the `lowest`, `highest` and `prevPage` values when
+
+* the page size changes
+* the sorting changes
+* the filtering changes
+
+For a full AngularJS example see the following https://github.com/Blazebit/blaze-persistence/blob/master/examples/spring-data-rest/src/main/resources/static/app.js[example project].
\ No newline at end of file
diff --git a/documentation/src/main/asciidoc/entity-view/manual/en_US/13_deltaspike_data.adoc b/documentation/src/main/asciidoc/entity-view/manual/en_US/13_deltaspike_data.adoc
index 90bd56c2b3..9fb4f3ced4 100644
--- a/documentation/src/main/asciidoc/entity-view/manual/en_US/13_deltaspike_data.adoc
+++ b/documentation/src/main/asciidoc/entity-view/manual/en_US/13_deltaspike_data.adoc
@@ -22,7 +22,19 @@ In addition, the following Maven dependencies are required:
 </dependency>
 <dependency>
     <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-deltaspike-data-impl</artifactId>
+    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.8</artifactId>
+    <version>${blaze-persistence.version}</version>
+    <scope>runtime</scope>
+</dependency>
+----
+
+If you still work with DeltaSpike Data 1.7 you will have to use a different integration as DeltaSpike Data 1.8 changed quite a bit.
+
+[source,xml]
+----
+<dependency>
+    <groupId>com.blazebit</groupId>
+    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.7</artifactId>
     <version>${blaze-persistence.version}</version>
     <scope>runtime</scope>
 </dependency>
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MetamodelBuildingContextImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MetamodelBuildingContextImpl.java
index 99f0d5966e..6be58cbb7c 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MetamodelBuildingContextImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MetamodelBuildingContextImpl.java
@@ -205,8 +205,8 @@ public List<ScalarTargetResolvingExpressionVisitor.TargetType> getPossibleTarget
             return Collections.emptyList();
         }
 
-        // Don't bother with empty expressions, let the validation process handle this
-        if (expression.isEmpty()) {
+        // Don't bother with empty expressions or missing managed type, let the validation process handle this
+        if (expression.isEmpty() || managedType == null) {
             return Collections.emptyList();
         }
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewMappingImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewMappingImpl.java
index edc3e7839b..f64c502fee 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewMappingImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewMappingImpl.java
@@ -473,10 +473,12 @@ private boolean containsAny(MetamodelBuildingContext context, Set<Class<?>> depe
     public ManagedViewTypeImplementor<?> getManagedViewType(MetamodelBuildingContext context) {
         if (viewType == null) {
             if (entityClass == null) {
-                context.addError("No entity class configured in view mapping for entity view class: " + entityViewClass.getName());
+                context.addError("The persistence unit metamodel doesn't contain the entity class configured in view mapping for entity view class: " + entityViewClass.getName());
             }
             ManagedType<?> managedType = context.getEntityMetamodel().getManagedType(entityClass);
-            if (!(managedType instanceof IdentifiableType<?>)) {
+            if (managedType == null) {
+                context.addError("Invalid id attribute mapping for embeddable entity type '" + entityClass.getName() + "' at " + idAttribute.getErrorLocation() + " for managed view type '" + entityViewClass.getName() + "'!");
+            } else if (!(managedType instanceof IdentifiableType<?>)) {
                 if (idAttribute != null) {
                     context.addError("Invalid id attribute mapping for embeddable entity type '" + entityClass.getName() + "' at " + idAttribute.getErrorLocation() + " for managed view type '" + entityViewClass.getName() + "'!");
                 }
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/proxy/ProxyFactory.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/proxy/ProxyFactory.java
index 3e06c5a0c8..aa0fbd47cd 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/proxy/ProxyFactory.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/proxy/ProxyFactory.java
@@ -81,6 +81,7 @@
 
 import javax.persistence.metamodel.EntityType;
 import javax.persistence.metamodel.IdentifiableType;
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -460,34 +461,7 @@ private <T> Class<? extends T> createProxyClass(EntityViewManager entityViewMana
                 createInheritanceConstructors(entityViewManager, constructors, inheritanceBase, managedViewType, subtypeIndex, addedReferenceConstructor, unsafe, cc, initialStateField, mutableStateField, fieldMap, mutableAttributes, mutableAttributeCount);
             }
 
-            try {
-                Class<? extends T> c;
-                if (unsafe) {
-                    c = (Class<? extends T>) UnsafeHelper.define(cc.getName(), cc.toBytecode(), clazz);
-                } else {
-                    c = cc.toClass(clazz.getClassLoader(), null);
-                }
-
-                c.getField("$$_evm").set(null, entityViewManager);
-
-                return c;
-            } catch (CannotCompileException | LinkageError ex) {
-                // If there are multiple proxy factories for the same class loader
-                // we could end up in defining a class multiple times, so we check if the classloader
-                // actually has something to offer
-                LinkageError error;
-                if (ex instanceof LinkageError && (error = (LinkageError) ex) != null
-                        || ex.getCause() instanceof LinkageError && (error = (LinkageError) ex.getCause()) != null) {
-                    try {
-                        return (Class<? extends T>) pool.getClassLoader().loadClass(proxyClassName);
-                    } catch (ClassNotFoundException cnfe) {
-                        // Something we can't handle happened
-                        throw error;
-                    }
-                } else {
-                    throw ex;
-                }
-            }
+            return defineOrGetClass(entityViewManager, unsafe, clazz, proxyClassName, cc);
         } catch (Exception ex) {
             throw new RuntimeException("Probably we did something wrong, please contact us if you see this message.", ex);
         } finally {
@@ -495,6 +469,46 @@ private <T> Class<? extends T> createProxyClass(EntityViewManager entityViewMana
         }
     }
 
+    private <T> Class<? extends T> defineOrGetClass(EntityViewManager entityViewManager, boolean unsafe, Class<?> clazz, String proxyClassName, CtClass cc) throws IOException, IllegalAccessException, NoSuchFieldException, CannotCompileException {
+        try {
+            Class<? extends T> c;
+            if (unsafe) {
+                c = (Class<? extends T>) UnsafeHelper.define(cc.getName(), cc.toBytecode(), clazz);
+            } else {
+                c = cc.toClass(clazz.getClassLoader(), null);
+            }
+
+            c.getField("$$_evm").set(null, entityViewManager);
+
+            return c;
+        } catch (CannotCompileException | LinkageError ex) {
+            // If there are multiple proxy factories for the same class loader
+            // we could end up in defining a class multiple times, so we check if the classloader
+            // actually has something to offer
+            LinkageError error;
+            if (ex instanceof LinkageError && (error = (LinkageError) ex) != null
+                    || ex.getCause() instanceof LinkageError && (error = (LinkageError) ex.getCause()) != null) {
+                try {
+                    return (Class<? extends T>) pool.getClassLoader().loadClass(proxyClassName);
+                } catch (ClassNotFoundException cnfe) {
+                    // Something we can't handle happened
+                    throw error;
+                }
+            } else {
+                throw ex;
+            }
+        } catch (NullPointerException ex) {
+            // With Java 9 it's actually the case that Javassist doesn't throw the LinkageError but instead tries to define the class differently
+            // Too bad that this different path lead to a NullPointerException
+            try {
+                return (Class<? extends T>) pool.getClassLoader().loadClass(proxyClassName);
+            } catch (ClassNotFoundException cnfe) {
+                // Something we can't handle happened
+                throw ex;
+            }
+        }
+    }
+
     private boolean shouldAddDefaultConstructor(boolean hasEmptyConstructor, boolean addedReferenceConstructor, CtField[] attributeFields) {
         // Add the default constructor only for interfaces since abstract classes may omit it
         // Only add the "normal" constructor if there are attributes other than the id attribute available, otherwise we get a duplicate member exception
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/SubviewAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/SubviewAttributeFlusher.java
index 8bd4593683..9ff67e063e 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/SubviewAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/SubviewAttributeFlusher.java
@@ -422,9 +422,11 @@ public DirtyKind getDirtyKind(V initial, V current) {
             return DirtyKind.UPDATED;
         }
 
-        EntityViewUpdater updater = viewToEntityMapper.getUpdater(current);
-        if (updater != null) {
-            return updater.getDirtyChecker().getDirtyKind((DirtyStateTrackable) initial, (DirtyStateTrackable) current);
+        if (initial instanceof DirtyStateTrackable && current instanceof DirtyStateTrackable) {
+            EntityViewUpdater updater = viewToEntityMapper.getUpdater(current);
+            if (updater != null) {
+                return updater.getDirtyChecker().getDirtyKind((DirtyStateTrackable) initial, (DirtyStateTrackable) current);
+            }
         }
 
         return Objects.equals(initial, current) ? DirtyKind.NONE : DirtyKind.UPDATED;
diff --git a/entity-view/testsuite/pom.xml b/entity-view/testsuite/pom.xml
index 723824afa8..55a073e46d 100644
--- a/entity-view/testsuite/pom.xml
+++ b/entity-view/testsuite/pom.xml
@@ -91,6 +91,28 @@
             <artifactId>mockito-all</artifactId>
             <version>1.10.19</version>
         </dependency>
+
+        <!-- Preparation for Java 9+, include a dependency on the JAXB APIs -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${version.annotation}</version>
+        </dependency>
     </dependencies>
 
 
@@ -445,6 +467,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>1.3.0.Final</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -525,6 +572,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-4.3}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -605,6 +677,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-5}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -685,6 +782,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-5.1}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -768,6 +890,136 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-5.2}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-test-source-metamodel</id>
+                                <phase>generate-test-sources</phase>
+                                <goals>
+                                    <goal>add-test-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/test-metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>hibernate-5.3</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-entitymanager</artifactId>
+                    <version>${version.hibernate-5.3}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <!-- IntelliJ apparently needs the annotation processor here -->
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-jpamodelgen</artifactId>
+                    <version>${version.hibernate-5.3}</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process-test</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-test-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <!-- Metamodel -->
+                            <dependency>
+                                <groupId>org.hibernate</groupId>
+                                <artifactId>hibernate-jpamodelgen</artifactId>
+                                <version>${version.hibernate-5.3}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -855,6 +1107,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-6.0}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -940,11 +1217,30 @@
                                 <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
                                 <version>${version.eclipselink}</version>
                             </dependency>
-                            <!-- We need the JTA API for updatable views -->
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
                             <dependency>
                                 <groupId>javax.transaction</groupId>
                                 <artifactId>javax.transaction-api</artifactId>
-                                <version>1.2</version>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
                             </dependency>
                         </dependencies>
                     </plugin>
@@ -1012,6 +1308,10 @@
                     <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
+                </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <!-- The old version has a bug when generating the static metamodel for PolymorphicPropertyMapBase -->
                 <dependency>
@@ -1078,6 +1378,31 @@
                                 <artifactId>datanucleus-jpa-query</artifactId>
                                 <version>${version.datanucleus.jpa-5}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -1144,6 +1469,10 @@
                     <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>
@@ -1195,6 +1524,33 @@
                                 </configuration>
                             </execution>
                         </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
                     </plugin>
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
@@ -1217,6 +1573,155 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>datanucleus-5.1</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
+                <spring.activeProfiles>datanucleus</spring.activeProfiles>
+            </properties>
+            <repositories>
+                <repository>
+                    <id>DataNucleus Nightly</id>
+                    <name>DataNucleus Repository Nightly</name>
+                    <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
+                </repository>
+            </repositories>
+            <dependencies>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>javax.persistence</artifactId>
+                    <version>2.2.0-release</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-core</artifactId>
+                    <version>${version.datanucleus.base-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-api-jpa</artifactId>
+                    <version>${version.datanucleus.api-jpa-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-jpa-query</artifactId>
+                    <version>${version.datanucleus.jpa-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-rdbms</artifactId>
+                    <version>${version.datanucleus.rdbms-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.datanucleus</groupId>
+                        <artifactId>datanucleus-maven-plugin</artifactId>
+                        <version>4.0.0-release</version>
+                        <configuration>
+                            <api>JPA</api>
+                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
+                            <verbose>false</verbose>
+                            <fork>true</fork>
+                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
+                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
+                            <useFileListFile>true</useFileListFile>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>process-classes</phase>
+                                <goals>
+                                    <goal>enhance</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
+                                <version>${project.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${additional.source.directory}</source>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>openjpa</id>
             <properties>
@@ -1264,6 +1769,31 @@
                                 <artifactId>openjpa-all</artifactId>
                                 <version>${version.openjpa}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/AbstractEntityViewUpdateTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/AbstractEntityViewUpdateTest.java
index ca41acb2dd..cb89cff1ce 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/AbstractEntityViewUpdateTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/AbstractEntityViewUpdateTest.java
@@ -341,11 +341,6 @@ protected void assertEmptyChangeModel(T docView) {
         }
     }
 
-    protected void assertUnorderedEquals(List<?> list1, List<?> list2) {
-        assertEquals(list1.size(), list2.size());
-        assertTrue(list1.containsAll(list2));
-    }
-
     protected boolean isFullMode() {
         return mode == FlushMode.FULL;
     }
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/converter/EntityViewUpdateBlobTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/converter/EntityViewUpdateBlobTest.java
index 344e99d947..1ba0b86104 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/converter/EntityViewUpdateBlobTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/converter/EntityViewUpdateBlobTest.java
@@ -19,6 +19,7 @@
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.entity.BlobEntity;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
@@ -49,7 +50,8 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+// NOTE: Not sure why, but Hibernate 4.2 reports the LOB as being closed
+@Category({ NoHibernate42.class, NoDatanucleus.class, NoEclipselink.class})
 public class EntityViewUpdateBlobTest extends AbstractEntityViewUpdateTest<UpdatableBlobEntityView> {
 
     private BlobEntity entity;
diff --git a/examples/showcase/runner/cdi/pom.xml b/examples/showcase/runner/cdi/pom.xml
index a955e14500..87d1018448 100644
--- a/examples/showcase/runner/cdi/pom.xml
+++ b/examples/showcase/runner/cdi/pom.xml
@@ -161,9 +161,62 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+
+        <!-- Preparation for Java 9+, include a dependency on the JAXB APIs -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${version.annotation}</version>
+        </dependency>
     </dependencies>
 
     <profiles>
+        <profile>
+            <id>deltaspike-1.7</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.deltaspike.distribution</groupId>
+                        <artifactId>distributions-bom</artifactId>
+                        <version>${version.deltaspike-1.7}</version>
+                        <type>pom</type>
+                        <scope>import</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
+        <profile>
+            <id>deltaspike-1.8</id>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.deltaspike.distribution</groupId>
+                        <artifactId>distributions-bom</artifactId>
+                        <version>${version.deltaspike-1.8}</version>
+                        <type>pom</type>
+                        <scope>import</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
         <profile>
             <id>showcase-basic</id>
             <dependencies>
@@ -186,6 +239,48 @@
         </profile>
 
         <!-- skip tests for non-hibernate profiles -->
+        <profile>
+            <id>datanucleus-4</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>datanucleus-5</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>datanucleus-5.1</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>eclipselink</id>
             <build>
diff --git a/examples/showcase/runner/spring/pom.xml b/examples/showcase/runner/spring/pom.xml
index a244fe1847..091c3d60da 100644
--- a/examples/showcase/runner/spring/pom.xml
+++ b/examples/showcase/runner/spring/pom.xml
@@ -147,6 +147,28 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+
+        <!-- Preparation for Java 9+, include a dependency on the JAXB APIs -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${version.annotation}</version>
+        </dependency>
     </dependencies>
 
     <profiles>
@@ -181,7 +203,50 @@
             </dependencies>
         </profile>
 
+
         <!-- skip tests for non-hibernate profiles -->
+        <profile>
+            <id>datanucleus-4</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>datanucleus-5</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>datanucleus-5.1</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>eclipselink</id>
             <build>
diff --git a/examples/spring-data-rest/pom.xml b/examples/spring-data-rest/pom.xml
index 53915c4823..62a0bb7800 100644
--- a/examples/spring-data-rest/pom.xml
+++ b/examples/spring-data-rest/pom.xml
@@ -133,6 +133,28 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Preparation for Java 9+, include a dependency on the JAXB APIs -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${version.annotation}</version>
+        </dependency>
     </dependencies>
     
     <build>
@@ -180,7 +202,7 @@
             <id>spring-data-2.0.x</id>
             <properties>
                 <version.spring>5.0.4.RELEASE</version.spring>
-                <version.spring.boot>2.0.0.RC2</version.spring.boot>
+                <version.spring.boot>2.0.0.RELEASE</version.spring.boot>
             </properties>
             <dependencies>
                 <dependency>
diff --git a/integration/datanucleus-5.1/pom.xml b/integration/datanucleus-5.1/pom.xml
new file mode 100644
index 0000000000..17af2bad2f
--- /dev/null
+++ b/integration/datanucleus-5.1/pom.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2014 - 2018 Blazebit.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.blazebit</groupId>
+        <artifactId>blaze-persistence-integration</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Blazebit Persistence Integration DataNucleus 5.1</name>
+
+    <properties>
+        <module.name>com.blazebit.persistence.integration.datanucleus</module.name>
+    </properties>
+
+    <repositories>
+        <repository>
+            <id>DataNucleus Nightly</id>
+            <name>DataNucleus Repository Nightly</name>
+            <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-core-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-apt-utils</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-common-utils</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-integration-jpa-base</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>javax.persistence</artifactId>
+            <version>2.2.0-release</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-core</artifactId>
+            <version>${version.datanucleus.base-5.1}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-api-jpa</artifactId>
+            <version>${version.datanucleus.api-jpa-5.1}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-jpa-query</artifactId>
+            <version>${version.datanucleus.jpa-5.1}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-rdbms</artifactId>
+            <version>${version.datanucleus.rdbms-5.1}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-resource</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>add-resource</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>target/generated/resources</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.bsc.maven</groupId>
+                <artifactId>maven-processor-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>process-resources</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <outputDirectory>target/generated/resources</outputDirectory>
+                            <processors>
+                                <!-- list of processors to use -->
+                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
+                            </processors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <!--
+                        NOTE: We also have a MANIFEST.MF statically defined for the use of a Maven reactor without the packaging phase.
+                        Changes to the following section should therefore also be reflected in that file.
+                        -->
+                        <manifestEntries>
+                            <Automatic-Module-Name>${module.name}</Automatic-Module-Name>
+                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                            <Bundle-Name>blaze-persistence-integration-datanucleus</Bundle-Name>
+                            <Bundle-SymbolicName>com.blazebit.blaze-persistence-integration-datanucleus</Bundle-SymbolicName>
+                            <Bundle-Version>${project.version}</Bundle-Version>
+                            <Bundle-Vendor>Blazebit</Bundle-Vendor>
+                            <Require-Bundle>org.datanucleus,org.datanucleus.api.jpa</Require-Bundle>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/CTEAnnotationReader.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/CTEAnnotationReader.java
new file mode 100644
index 0000000000..a1dd90e3a0
--- /dev/null
+++ b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/CTEAnnotationReader.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.datanucleus;
+
+import com.blazebit.persistence.CTE;
+import com.blazebit.persistence.integration.datanucleus.function.DataNucleus51EntityManagerFactoryIntegrator;
+import org.datanucleus.ClassLoaderResolver;
+import org.datanucleus.api.jpa.metadata.JPAAnnotationReader;
+import org.datanucleus.metadata.AbstractClassMetaData;
+import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.metadata.IdentityType;
+import org.datanucleus.metadata.MetaDataManager;
+import org.datanucleus.metadata.PackageMetaData;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class CTEAnnotationReader extends JPAAnnotationReader {
+
+    private final boolean isDataNucleus4;
+    
+    public CTEAnnotationReader(MetaDataManager mgr) {
+        super(mgr);
+        String[] supportedAnnotationPacakges = new String[supportedPackages.length + 1];
+        System.arraycopy(supportedPackages, 0, supportedAnnotationPacakges, 0, supportedPackages.length);
+        supportedAnnotationPacakges[supportedAnnotationPacakges.length - 1] = "com.blazebit.persistence";
+        setSupportedAnnotationPackages(supportedAnnotationPacakges);
+        isDataNucleus4 = DataNucleus51EntityManagerFactoryIntegrator.MAJOR < 5;
+    }
+
+    @Override
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public AbstractClassMetaData getMetaDataForClass(Class cls, PackageMetaData pmd, ClassLoaderResolver clr) {
+        AbstractClassMetaData cmd = super.getMetaDataForClass(cls, pmd, clr);
+        
+        if (cmd == null) {
+            return null;
+        }
+        
+        if (!cls.isAnnotationPresent(CTE.class)) {
+            return cmd;
+        }
+
+        // TODO: check that no collections are mapped
+        if (isDataNucleus4) {
+            cmd.setIdentityType(IdentityType.NONDURABLE);
+            cmd.addExtension("view-definition", "--");
+
+            for (int i = 0; i < cmd.getNoOfMembers(); i++) {
+                AbstractMemberMetaData mmd = cmd.getMetaDataForMemberAtRelativePosition(i);
+                if (mmd.isPrimaryKey()) {
+                    mmd.setPrimaryKey(false);
+                }
+            }
+        } else {
+            cmd.setIdentityType(IdentityType.APPLICATION);
+            cmd.addExtension("view-definition", "--");
+        }
+        return cmd;
+    }
+
+}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51ExtendedQuerySupport.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51ExtendedQuerySupport.java
new file mode 100644
index 0000000000..9eb0db9567
--- /dev/null
+++ b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51ExtendedQuerySupport.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.datanucleus;
+
+import com.blazebit.apt.service.ServiceProvider;
+import com.blazebit.persistence.ReturningResult;
+import com.blazebit.persistence.spi.ExtendedQuerySupport;
+import org.datanucleus.store.rdbms.query.JPQLQuery;
+import org.datanucleus.store.rdbms.query.RDBMSQueryCompilation;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.lang.reflect.Field;
+import java.util.List;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+@ServiceProvider(ExtendedQuerySupport.class)
+public class DataNucleus51ExtendedQuerySupport implements ExtendedQuerySupport {
+    
+    private static final Field DATASTORE_COMPILATION_FIELD;
+    
+    static {
+        try {
+            DATASTORE_COMPILATION_FIELD = JPQLQuery.class.getDeclaredField("datastoreCompilation");
+            DATASTORE_COMPILATION_FIELD.setAccessible(true);
+        } catch (Exception e) {
+            throw new RuntimeException("Unsupported datanucleus version!", e);
+        }
+    }
+
+    @Override
+    public boolean supportsAdvancedSql() {
+        return false;
+    }
+
+    @Override
+    public String getSql(EntityManager em, Query query) {
+        org.datanucleus.store.query.Query<?> dnQuery = query.unwrap(org.datanucleus.store.query.Query.class);
+        dnQuery.compile();
+        return (String) dnQuery.getNativeQuery();
+    }
+    
+    public List<String> getCascadingDeleteSql(EntityManager em, Query query) {
+        // TODO: implement
+        throw new UnsupportedOperationException("Not yet implemeneted!");
+    }
+
+    @Override
+    public int getSqlSelectAliasPosition(EntityManager em, Query query, String alias) {
+        // TODO: implement
+        throw new UnsupportedOperationException("Not yet implemeneted!");
+    }
+
+    @Override
+    public String getSqlAlias(EntityManager em, Query query, String alias) {
+        // TODO: implement
+        throw new UnsupportedOperationException("Not yet implemeneted!");
+    }
+
+    @Override
+    public int getSqlSelectAttributePosition(EntityManager em, Query query, String alias) {
+        // TODO: implement
+        throw new UnsupportedOperationException("Not yet implemeneted!");
+    }
+
+    @Override
+    @SuppressWarnings("rawtypes")
+    public List getResultList(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query query, String sqlOverride) {
+        applySql(query, sqlOverride);
+        return query.getResultList();
+    }
+    
+    @Override
+    public Object getSingleResult(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query query, String sqlOverride) {
+        applySql(query, sqlOverride);
+        return query.getSingleResult();
+    }
+
+    @Override
+    public int executeUpdate(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query query, String sqlOverride) {
+        applySql(query, sqlOverride);
+        return query.executeUpdate();
+    }
+
+    @Override
+    public ReturningResult<Object[]> executeReturning(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query exampleQuery, String sqlOverride) {
+        // TODO: implement
+        throw new UnsupportedOperationException("Not yet implemeneted!");
+    }
+    
+    private void applySql(Query query, String sqlOverride) {
+        // TODO: parameter handling
+        org.datanucleus.store.query.Query<?> dnQuery = query.unwrap(org.datanucleus.store.query.Query.class);
+        // Disable caching for these queries
+        dnQuery.addExtension("datanucleus.query.compilation.cached", Boolean.FALSE);
+        try {
+            RDBMSQueryCompilation datastoreCompilation = (RDBMSQueryCompilation) DATASTORE_COMPILATION_FIELD.get(dnQuery);
+            datastoreCompilation.setSQL(sqlOverride);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51JpaProvider.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51JpaProvider.java
new file mode 100644
index 0000000000..6d4d9f0ed8
--- /dev/null
+++ b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51JpaProvider.java
@@ -0,0 +1,410 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.datanucleus;
+
+import com.blazebit.persistence.JoinType;
+import com.blazebit.persistence.spi.JoinTable;
+import com.blazebit.persistence.spi.JpaProvider;
+import org.datanucleus.ExecutionContext;
+import org.datanucleus.api.jpa.metamodel.AttributeImpl;
+import org.datanucleus.api.jpa.metamodel.ManagedTypeImpl;
+import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.metadata.ColumnMetaData;
+import org.datanucleus.metadata.EmbeddedMetaData;
+import org.datanucleus.metadata.KeyMetaData;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.persistence.metamodel.EntityType;
+import javax.persistence.metamodel.ManagedType;
+import javax.persistence.metamodel.PluralAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.Type;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author Christian Beikov
+ * @since 1.0.0
+ */
+public class DataNucleus51JpaProvider implements JpaProvider {
+
+    private static final String[] EMPTY = {};
+    private final int major;
+    private final int minor;
+    private final int fix;
+
+    public DataNucleus51JpaProvider(int major, int minor, int fix) {
+        this.major = major;
+        this.minor = minor;
+        this.fix = fix;
+    }
+
+    @Override
+    public boolean supportsJpa21() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsEntityJoin() {
+        return major >= 5;
+    }
+
+    @Override
+    public boolean supportsInsertStatement() {
+        return false;
+    }
+
+    @Override
+    public boolean needsBracketsForListParamter() {
+        return true;
+    }
+
+    @Override
+    public boolean needsJoinSubqueryRewrite() {
+        return false;
+    }
+
+    @Override
+    public String getBooleanExpression(boolean value) {
+        return value ? "TRUE" : "FALSE";
+    }
+
+    @Override
+    public String getBooleanConditionalExpression(boolean value) {
+        return value ? "TRUE" : "FALSE";
+    }
+
+    @Override
+    public String getNullExpression() {
+        return "NULL";
+    }
+
+    @Override
+    public String escapeCharacter(char character) {
+        return Character.toString(character);
+    }
+
+    @Override
+    public boolean supportsNullPrecedenceExpression() {
+        return true;
+    }
+
+    @Override
+    public void renderNullPrecedence(StringBuilder sb, String expression, String resolvedExpression, String order, String nulls) {
+        sb.append(expression);
+        if (order != null) {
+            sb.append(' ').append(order);
+
+            if (nulls != null) {
+                sb.append(" NULLS ").append(nulls);
+            }
+        }
+    }
+
+    @Override
+    public String getOnClause() {
+        return "ON";
+    }
+
+    @Override
+    public String getCollectionValueFunction() {
+        return "VALUE";
+    }
+
+    @Override
+    public boolean supportsCollectionValueDereference() {
+        return true;
+    }
+
+    @Override
+    public Class<?> getDefaultQueryResultType() {
+        return null;
+    }
+
+    @Override
+    public String getCustomFunctionInvocation(String functionName, int argumentCount) {
+        // Careful, PaginatedCriteriaBuilder has some dependency on the "length" of the string for rendering in the count query
+        return functionName + "(";
+    }
+
+    @Override
+    public boolean supportsRootTreat() {
+        // Although it might parse, it isn't really supported for JOINED inheritance as wrong SQL is generated
+        // TODO: create an issue for this
+        return true;
+    }
+
+    @Override
+    public boolean supportsTreatJoin() {
+        return major >= 5;
+    }
+
+    @Override
+    public boolean supportsTreatCorrelation() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsRootTreatJoin() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsRootTreatTreatJoin() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsSubtypePropertyResolving() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsSubtypeRelationResolving() {
+        // Interestingly, joining a relation that is only available on a subtype works
+        return true;
+    }
+
+    @Override
+    public boolean supportsCountStar() {
+        return false;
+    }
+
+    @Override
+    public boolean isForeignJoinColumn(EntityType<?> ownerType, String attributeName) {
+        ManagedTypeImpl<?> managedType = (ManagedTypeImpl<?>) ownerType;
+        String[] parts = attributeName.split("\\.");
+        AbstractMemberMetaData metaData = managedType.getMetadata().getMetaDataForMember(parts[0]);
+        for (int i = 1; i < parts.length; i++) {
+            EmbeddedMetaData embeddedMetaData = metaData.getEmbeddedMetaData();
+            if (embeddedMetaData == null) {
+                // Probably trying to access the id attribute of a ToMany relation
+                return metaData.getJoinMetaData() != null;
+            } else {
+                AbstractMemberMetaData[] metaDatas = embeddedMetaData.getMemberMetaData();
+                metaData = null;
+                for (int j = 0; j < metaDatas.length; j++) {
+                    if (parts[i].equals(metaDatas[j].getName())) {
+                        metaData = metaDatas[j];
+                        break;
+                    }
+                }
+
+                if (metaData == null) {
+                    throw new IllegalArgumentException("Could not find property '" + parts[i] + "' in embeddable type: " + ((AbstractMemberMetaData) embeddedMetaData.getParent()).getType().getName());
+                }
+            }
+        }
+
+        return metaData.getJoinMetaData() != null;
+    }
+
+    @Override
+    public boolean isColumnShared(EntityType<?> ownerType, String attributeName) {
+        return false;
+    }
+
+    @Override
+    public ConstraintType requiresTreatFilter(EntityType<?> ownerType, String attributeName, JoinType joinType) {
+        return ConstraintType.NONE;
+    }
+
+    @Override
+    public String getMappedBy(EntityType<?> ownerType, String attributeName) {
+        AbstractMemberMetaData metaData = getAttribute(ownerType, attributeName).getMetadata();
+        return metaData.getMappedBy();
+    }
+
+    @Override
+    public Map<String, String> getWritableMappedByMappings(EntityType<?> inverseType, EntityType<?> ownerType, String attributeName) {
+        return null;
+    }
+
+    @Override
+    public String[] getColumnNames(EntityType<?> ownerType, String attributeName) {
+        return EMPTY;
+    }
+
+    @Override
+    public String[] getColumnTypes(EntityType<?> ownerType, String attributeName) {
+        return EMPTY;
+    }
+
+    private AttributeImpl<?, ?> getAttribute(ManagedType<?> ownerType, String attributeName) {
+        if (attributeName.indexOf('.') == -1) {
+            return (AttributeImpl<?, ?>) ownerType.getAttribute(attributeName);
+        }
+        ManagedType<?> t = ownerType;
+        SingularAttribute<?, ?> attr = null;
+        String[] parts = attributeName.split("\\.");
+        for (int i = 0; i < parts.length; i++) {
+            attr = t.getSingularAttribute(parts[i]);
+            if (attr.getType().getPersistenceType() != Type.PersistenceType.BASIC) {
+                t = (ManagedType<?>) attr.getType();
+            } else if (i + 1 != parts.length) {
+                throw new IllegalArgumentException("Illegal attribute name for type [" + ownerType.getJavaType().getName() + "]: " + attributeName);
+            }
+        }
+
+        return (AttributeImpl<?, ?>) attr;
+    }
+
+    @Override
+    public JoinTable getJoinTable(EntityType<?> ownerType, String attributeName) {
+        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
+        AbstractMemberMetaData metaData = attribute.getMetadata();
+        if (metaData.getJoinMetaData() != null) {
+            Map<String, String> keyMapping = null;
+            KeyMetaData keyMetaData = metaData.getKeyMetaData();
+            if (keyMetaData != null && keyMetaData.getColumnMetaData() != null) {
+                keyMapping = new HashMap<>();
+                ColumnMetaData[] keyColumnMetaData = keyMetaData.getColumnMetaData();
+                ColumnMetaData[] keyTargetPrimaryKeyColumnMetaData = keyMetaData.getForeignKeyMetaData() == null ? null : keyMetaData.getForeignKeyMetaData().getColumnMetaData();
+                if (keyTargetPrimaryKeyColumnMetaData == null) {
+                    keyMapping.put(keyMetaData.getColumnName(), keyMetaData.getColumnName());
+                } else {
+                    for (int i = 0; i < keyTargetPrimaryKeyColumnMetaData.length; i++) {
+                        keyMapping.put(keyColumnMetaData[i].getName(), keyTargetPrimaryKeyColumnMetaData[i].getName());
+                    }
+                }
+            } else if (metaData.getOrderMetaData() != null) {
+                String columnName = metaData.getOrderMetaData().getColumnName();
+                keyMapping = Collections.singletonMap(columnName, columnName);
+            }
+
+            String tableName;
+            Map<String, String> idColumnMapping;
+            Map<String, String> targetIdColumnMapping;
+            if (metaData.getJoinMetaData().getTable() == null) {
+                tableName = metaData.getTable();
+                idColumnMapping = Collections.emptyMap();
+                targetIdColumnMapping = Collections.emptyMap();
+            } else {
+                tableName = metaData.getJoinMetaData().getTable();
+                ColumnMetaData[] primaryKeyColumnMetaData = metaData.getJoinMetaData().getPrimaryKeyMetaData().getColumnMetaData();
+                ColumnMetaData[] foreignKeyColumnMetaData = metaData.getJoinMetaData().getForeignKeyMetaData().getColumnMetaData();
+                idColumnMapping = new HashMap<>(primaryKeyColumnMetaData.length);
+                for (int i = 0; i < foreignKeyColumnMetaData.length; i++) {
+                    idColumnMapping.put(foreignKeyColumnMetaData[i].getName(), primaryKeyColumnMetaData[i].getName());
+                }
+
+                ColumnMetaData[] targetColumnMetaData = metaData.getJoinMetaData().getColumnMetaData();
+                ColumnMetaData[] targetPrimaryKeyColumnMetaData = metaData.getElementMetaData().getForeignKeyMetaData().getColumnMetaData();
+                targetIdColumnMapping = new HashMap<>(targetPrimaryKeyColumnMetaData.length);
+
+                for (int i = 0; i < targetColumnMetaData.length; i++) {
+                    targetIdColumnMapping.put(targetColumnMetaData[i].getName(), targetPrimaryKeyColumnMetaData[i].getName());
+                }
+            }
+
+            return new JoinTable(
+                    tableName,
+                    idColumnMapping,
+                    keyMapping,
+                    targetIdColumnMapping
+            );
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean isBag(EntityType<?> ownerType, String attributeName) {
+        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
+        if (attribute instanceof PluralAttribute) {
+            PluralAttribute<?, ?, ?> pluralAttr = (PluralAttribute<?, ?, ?>) attribute;
+            if (pluralAttr.getCollectionType() == PluralAttribute.CollectionType.COLLECTION) {
+                return true;
+            } else if (pluralAttr.getCollectionType() == PluralAttribute.CollectionType.LIST) {
+                AbstractMemberMetaData metaData = attribute.getMetadata();
+                return metaData.getOrderMetaData() == null;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean isOrphanRemoval(ManagedType<?> ownerType, String attributeName) {
+        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
+        return attribute != null && attribute.getMetadata().isCascadeRemoveOrphans();
+    }
+
+    @Override
+    public boolean isDeleteCascaded(ManagedType<?> ownerType, String attributeName) {
+        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
+        return attribute != null && attribute.getMetadata().isCascadeDelete();
+    }
+
+    @Override
+    public boolean containsEntity(EntityManager em, Class<?> entityClass, Object id) {
+        ExecutionContext ec = em.unwrap(ExecutionContext.class);
+        return ec.getAttachedObjectForId(ec.newObjectId(entityClass, id)) != null;
+    }
+
+    @Override
+    public boolean supportsSingleValuedAssociationIdExpressions() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsForeignAssociationInOnClause() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsUpdateSetEmbeddable() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsTransientEntityAsParameter() {
+        return false;
+    }
+
+    @Override
+    public boolean needsAssociationToIdRewriteInOnClause() {
+        return false;
+    }
+
+    @Override
+    public boolean needsBrokenAssociationToIdRewriteInOnClause() {
+        return false;
+    }
+
+    @Override
+    public boolean needsTypeConstraintForColumnSharing() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsCollectionTableCleanupOnDelete() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsJoinTableCleanupOnDelete() {
+        return false;
+    }
+
+    @Override
+    public void setCacheable(Query query) {
+        query.setHint("datanucleus.query.results.cached", true);
+    }
+}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/AbstractJpqlFunctionSQLMethod.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/AbstractJpqlFunctionSQLMethod.java
new file mode 100644
index 0000000000..58e1de62fc
--- /dev/null
+++ b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/AbstractJpqlFunctionSQLMethod.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.datanucleus.function;
+
+import com.blazebit.persistence.spi.FunctionRenderContext;
+import com.blazebit.persistence.spi.JpqlFunction;
+import org.datanucleus.store.rdbms.mapping.java.JavaTypeMapping;
+import org.datanucleus.store.rdbms.sql.SQLStatement;
+import org.datanucleus.store.rdbms.sql.expression.BooleanExpression;
+import org.datanucleus.store.rdbms.sql.expression.ByteExpression;
+import org.datanucleus.store.rdbms.sql.expression.CharacterExpression;
+import org.datanucleus.store.rdbms.sql.expression.NumericExpression;
+import org.datanucleus.store.rdbms.sql.expression.SQLExpression;
+import org.datanucleus.store.rdbms.sql.expression.StringExpression;
+import org.datanucleus.store.rdbms.sql.expression.TemporalExpression;
+import org.datanucleus.store.rdbms.sql.method.SQLMethod;
+
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author Christian
+ * @since 1.2.0
+ */
+public abstract class AbstractJpqlFunctionSQLMethod implements JpqlFunction {
+
+    private static final Logger LOG = Logger.getLogger(JpqlFunctionSQLMethod.class.getName());
+    protected final SQLStatement stmt;
+    protected final SQLMethod function;
+
+    public AbstractJpqlFunctionSQLMethod(SQLStatement stmt, SQLMethod function) {
+        this.stmt = stmt;
+        this.function = function;
+    }
+
+    @Override
+    public boolean hasArguments() {
+        // Not sure how to determine that
+        return true;
+    }
+
+    @Override
+    public boolean hasParenthesesIfNoArguments() {
+        // Not sure how to determine that
+        return true;
+    }
+
+    @Override
+    public Class<?> getReturnType(Class<?> firstArgumentType) {
+        if (firstArgumentType == null) {
+            return null;
+        }
+        SQLExpression expression;
+        JavaTypeMapping argumentTypeMapping = stmt.getSQLExpressionFactory().getMappingForType(firstArgumentType, true);
+        if (java.sql.Date.class.isAssignableFrom(firstArgumentType)) {
+            expression = new TemporalExpression(stmt, argumentTypeMapping, "", null);
+        } else if (Byte.class.isAssignableFrom(firstArgumentType)) {
+            expression = new ByteExpression(stmt, null, argumentTypeMapping);
+        } else if (Number.class.isAssignableFrom(firstArgumentType)) {
+            expression = new NumericExpression(stmt, argumentTypeMapping, "");
+        } else if (String.class.isAssignableFrom(firstArgumentType)) {
+            expression = new StringExpression(stmt, null, argumentTypeMapping);
+        } else if (Character.class.isAssignableFrom(firstArgumentType)) {
+            expression = new CharacterExpression(stmt, null, argumentTypeMapping);
+        } else if (Boolean.class.isAssignableFrom(firstArgumentType)) {
+            expression = new BooleanExpression(stmt, argumentTypeMapping, "");
+        } else {
+            throw new UnsupportedOperationException("Unsupported data type: " + firstArgumentType.getName());
+        }
+        SQLExpression resultExpression = getExpression(stmt, expression);
+        return resultExpression.getJavaTypeMapping().getJavaType();
+    }
+
+    protected abstract SQLExpression getExpression(SQLStatement stmt, SQLExpression argumentExpression);
+
+    @Override
+    public void render(FunctionRenderContext context) {
+        throw new UnsupportedOperationException("Rendering functions through this API is not possible!");
+    }
+}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/CustomSQLText.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/CustomSQLText.java
new file mode 100644
index 0000000000..5b388c8d33
--- /dev/null
+++ b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/CustomSQLText.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.datanucleus.function;
+
+import org.datanucleus.store.rdbms.sql.SQLText;
+import org.datanucleus.store.rdbms.sql.expression.SQLExpression;
+
+import java.util.List;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class CustomSQLText extends SQLText {
+
+    private final String sql;
+
+    public CustomSQLText(String sql, SQLExpression expr, List<SQLExpression> expressions) {
+        this.sql = sql;
+        
+        if (expr != null) {
+            append(expr);
+        }
+
+        for (SQLExpression expression : expressions) {
+            append(expression);
+        }
+    }
+
+    @Override
+    public String toSQL() {
+        // Call super to trigger parameter handling
+        super.toSQL();
+        return sql;
+    }
+    
+}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleus51EntityManagerFactoryIntegrator.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleus51EntityManagerFactoryIntegrator.java
new file mode 100644
index 0000000000..cde0d44db0
--- /dev/null
+++ b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleus51EntityManagerFactoryIntegrator.java
@@ -0,0 +1,332 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.datanucleus.function;
+
+import com.blazebit.apt.service.ServiceProvider;
+import com.blazebit.persistence.integration.datanucleus.DataNucleus51JpaProvider;
+import com.blazebit.persistence.integration.jpa.function.CountStarFunction;
+import com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
+import com.blazebit.persistence.spi.JpaProvider;
+import com.blazebit.persistence.spi.JpaProviderFactory;
+import com.blazebit.persistence.spi.JpqlFunction;
+import com.blazebit.persistence.spi.JpqlFunctionGroup;
+import org.datanucleus.NucleusContext;
+import org.datanucleus.store.StoreManager;
+import org.datanucleus.store.rdbms.RDBMSStoreManager;
+import org.datanucleus.store.rdbms.identifier.DatastoreIdentifier;
+import org.datanucleus.store.rdbms.query.QueryGenerator;
+import org.datanucleus.store.rdbms.sql.SQLStatement;
+import org.datanucleus.store.rdbms.sql.expression.SQLExpressionFactory;
+import org.datanucleus.store.rdbms.sql.method.SQLMethod;
+import org.datanucleus.store.rdbms.table.Table;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author Christian Beikov
+ * @author Moritz Becker
+ *
+ * @since 1.2.0
+ */
+@ServiceProvider(EntityManagerFactoryIntegrator.class)
+public class DataNucleus51EntityManagerFactoryIntegrator implements EntityManagerFactoryIntegrator {
+
+    public static final String VERSION;
+    public static final int MAJOR;
+    public static final int MINOR;
+    public static final int FIX;
+
+    private static final Logger LOG = Logger.getLogger(DataNucleus51EntityManagerFactoryIntegrator.class.getName());
+    private static final Map<String, String> VENDOR_TO_DBMS_MAPPING = new HashMap<String, String>();
+    private static final String[] BUILTIN_FUNCTIONS = {
+        "abs",
+        "acos",
+        "asin",
+        "atan",
+        "avg",
+        "ceil",
+        "cos",
+        "count",
+        "exp",
+        "floor",
+        "log",
+        "max",
+        "min",
+        "power",
+        "sin",
+        "sqrt",
+        "sum",
+        "tan",
+        "degrees",
+        "radians",
+        "ABS",
+        "ACOS",
+        "ASIN",
+        "ATAN",
+        "AVG",
+        "CEIL",
+        "COS",
+        "COUNT",
+        "COUNTSTAR",
+        "EXP",
+        "FLOOR",
+        "LOG",
+        "MAX",
+        "MIN",
+        "POWER",
+        "SIN",
+        "SQRT",
+        "SUM",
+        "TAN",
+        "RADIANS",
+        "DEGREES",
+        "COALESCE",
+        "NULLIF",
+        "INDEX",
+        "CURRENT_DATE",
+        "CURRENT_TIME",
+        "CURRENT_TIMESTAMP",
+        "SQL_boolean",
+        "SQL_numeric",
+        "SQL_function",
+        "YEAR",
+        "MONTH",
+        "MONTH_JAVA",
+        "DAY",
+        "HOUR",
+        "MINUTE",
+        "SECOND"
+    };
+    
+    static {
+        VENDOR_TO_DBMS_MAPPING.put("h2", "h2");
+        VENDOR_TO_DBMS_MAPPING.put("mysql", "mysql");
+        VENDOR_TO_DBMS_MAPPING.put("db2", "db2");
+        VENDOR_TO_DBMS_MAPPING.put("firebird", "firebird");
+        VENDOR_TO_DBMS_MAPPING.put("postgresql", "postgresql");
+        VENDOR_TO_DBMS_MAPPING.put("oracle", "oracle");
+        VENDOR_TO_DBMS_MAPPING.put("sqlite", "sqlite");
+        VENDOR_TO_DBMS_MAPPING.put("sqlserver", "microsoft");
+        VENDOR_TO_DBMS_MAPPING.put("sybase", "sybase");
+//        VENDOR_TO_DBMS_MAPPING.put("", "cubrid");
+        VENDOR_TO_DBMS_MAPPING.put("hsql", "hsql");
+        VENDOR_TO_DBMS_MAPPING.put("informix", "informix");
+//        VENDOR_TO_DBMS_MAPPING.put("", "ingres");
+//        VENDOR_TO_DBMS_MAPPING.put("", "interbase");
+
+        VERSION = readMavenPropertiesVersion("META-INF/maven/org.datanucleus/datanucleus-core/pom.properties");
+
+        String[] versionParts = VERSION.split("[\\.-]");
+        MAJOR = Integer.parseInt(versionParts[0]);
+        MINOR = Integer.parseInt(versionParts[1]);
+        FIX = Integer.parseInt(versionParts[2]);
+    }
+
+    @Override
+    public String getDbms(EntityManagerFactory entityManagerFactory) {
+        RDBMSStoreManager storeMgr = (RDBMSStoreManager) entityManagerFactory.unwrap(StoreManager.class);
+        return VENDOR_TO_DBMS_MAPPING.get(storeMgr.getDatastoreAdapter().getVendorID());
+    }
+
+    @Override
+    public JpaProviderFactory getJpaProviderFactory(EntityManagerFactory entityManagerFactory) {
+        return new JpaProviderFactory() {
+            @Override
+            public JpaProvider createJpaProvider(EntityManager em) {
+                return new DataNucleus51JpaProvider(MAJOR, MINOR, FIX);
+            }
+        };
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public EntityManagerFactory registerFunctions(EntityManagerFactory entityManagerFactory, Map<String, JpqlFunctionGroup> dbmsFunctions) {
+        RDBMSStoreManager storeMgr = (RDBMSStoreManager) entityManagerFactory.unwrap(StoreManager.class);
+        SQLExpressionFactory exprFactory = storeMgr.getSQLExpressionFactory();
+        String dbms = VENDOR_TO_DBMS_MAPPING.get(storeMgr.getDatastoreAdapter().getVendorID());
+
+        // Register compatibility functions
+        if (!exprFactory.isMethodRegistered(null, CountStarFunction.FUNCTION_NAME)) {
+            exprFactory.registerMethod(null, CountStarFunction.FUNCTION_NAME, new DataNucleusJpqlFunctionAdapter(new CountStarFunction(), true));
+        }
+
+        // construct map for checking existence of functions in a case-insensitive way
+        Map<String, JpqlFunction> registeredFunctions = getRegisteredFunctions(entityManagerFactory);
+        Map<String, String> caseInsensitiveRegisteredFunctions = new HashMap<>(registeredFunctions.size());
+        for (String registeredFunctionName : registeredFunctions.keySet()) {
+            caseInsensitiveRegisteredFunctions.put(registeredFunctionName.toLowerCase(), registeredFunctionName);
+        }
+
+        for (Map.Entry<String, JpqlFunctionGroup> functionEntry : dbmsFunctions.entrySet()) {
+            String functionName = functionEntry.getKey();
+            JpqlFunctionGroup dbmsFunctionGroup = functionEntry.getValue();
+            JpqlFunction function = dbmsFunctionGroup.get(dbms);
+            
+            if (function == null && !dbmsFunctionGroup.contains(dbms)) {
+                function = dbmsFunctionGroup.get(null);
+            }
+            if (function == null) {
+                LOG.warning("Could not register the function '" + functionName + "' because there is neither an implementation for the dbms '" + dbms + "' nor a default implementation!");
+            } else if (!caseInsensitiveRegisteredFunctions.containsKey(functionName.toLowerCase())) {
+                exprFactory.registerMethod(null, functionName, new DataNucleusJpqlFunctionAdapter(function, dbmsFunctionGroup.isAggregate()));
+            }
+        }
+        
+        return entityManagerFactory;
+    }
+
+    @Override
+    public Map<String, JpqlFunction> getRegisteredFunctions(EntityManagerFactory entityManagerFactory) {
+        NucleusContext context = entityManagerFactory.unwrap(NucleusContext.class);
+        RDBMSStoreManager storeMgr = (RDBMSStoreManager) entityManagerFactory.unwrap(StoreManager.class);
+        String storeName = storeMgr.getDatastoreAdapter().getVendorID();
+        SQLExpressionFactory exprFactory = storeMgr.getSQLExpressionFactory();
+        
+        Set<Object> methodKeys = fieldGet("pluginSqlMethodsKeysSupported", exprFactory);
+        Map<String, JpqlFunction> functions = new HashMap<>();
+
+        // We need to construct a statement object and how this is done changed between 4 and 5 so we have to do a little reflection hack
+        // We need this because the function methods retrieve the expression factory through it
+        Class<?>[] parameterTypes = {RDBMSStoreManager.class, Table.class, DatastoreIdentifier.class, String.class};
+        SQLStatement stmt;
+
+        try {
+            Constructor c = Class.forName("org.datanucleus.store.rdbms.sql.SelectStatement").getConstructor(parameterTypes);
+            stmt = (SQLStatement) c.newInstance(storeMgr, null, null, null);
+        } catch (Exception e) {
+            try {
+                Constructor c = Class.forName("org.datanucleus.store.rdbms.sql.SQLStatement").getConstructor(parameterTypes);
+                stmt = (SQLStatement) c.newInstance(storeMgr, null, null, null);
+            } catch (Exception e2) {
+                throw new RuntimeException("Could not access the required methods to dynamically retrieve registered functions. Please report this version of datanucleus(" + VERSION + ") so we can provide support for it!", e2);
+            }
+        }
+
+        // Well apparently expressions get their class loader resolver by asking the statement they are part of
+        // which in turn asks the query generator that is responsible for it
+        // So this is the most non-hackish way to get this to work...
+        QueryGenerator noopGenerator = (QueryGenerator) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{ QueryGenerator.class }, new QueryGeneratorInvocationHandler(context));
+        stmt.setQueryGenerator(noopGenerator);
+
+        try {
+            Method getMethod = SQLExpressionFactory.class.getDeclaredMethod("getMethod", String.class, String.class, List.class);
+            getMethod.setAccessible(true);
+
+            for (Object methodKey : methodKeys) {
+                String className = fieldGet("clsName", methodKey);
+                String datastoreName = fieldGet("datastoreName", methodKey);
+                String name = fieldGet("methodName", methodKey);
+                if (className.isEmpty()
+                        && name.indexOf('.') == -1
+                        && ("ALL".equals(datastoreName) || storeName.equals(datastoreName))) {
+                    // Only consider normal functions
+                    SQLMethod method = (SQLMethod) getMethod.invoke(exprFactory, null, name, Collections.emptyList());
+                    if (method instanceof DataNucleusJpqlFunctionAdapter) {
+                        functions.put(name, ((DataNucleusJpqlFunctionAdapter) method).unwrap());
+                    } else {
+                        functions.put(name, new JpqlFunctionSQLMethod(stmt, method));
+                    }
+                }
+            }
+
+            for (String name : BUILTIN_FUNCTIONS) {
+                SQLMethod method = (SQLMethod) getMethod.invoke(exprFactory, null, name, Collections.emptyList());
+                if (method instanceof DataNucleusJpqlFunctionAdapter) {
+                    functions.put(name, ((DataNucleusJpqlFunctionAdapter) method).unwrap());
+                } else {
+                    functions.put(name, new JpqlFunctionSQLMethod(stmt, method));
+                }
+            }
+
+            // The length function is the single exception to all functions that is based on a class
+            SQLMethod method = (SQLMethod) getMethod.invoke(exprFactory, "java.lang.String", "length", Collections.emptyList());
+            functions.put("length", new JpqlFunctionInstanceSQLMethod(stmt, method));
+        } catch (Exception ex) {
+            throw new RuntimeException("Could not access the required methods to dynamically retrieve registered functions. Please report this version of datanucleus(" + VERSION + ") so we can provide support for it!", ex);
+        }
+        
+        return functions;
+    }
+    
+    private static String readMavenPropertiesVersion(String name) {
+        InputStream is = null;
+        try {
+            is = NucleusContext.class.getClassLoader().getResourceAsStream(name);
+            Properties p = new Properties();
+            p.load(is);
+            return p.getProperty("version");
+        } catch (IOException e) {
+            throw new RuntimeException("Could not access the maven version properties of datanucleus!", e);
+        } finally {
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    // Ignore
+                }
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <T> T fieldGet(String fieldName, Object value) {
+        Exception ex;
+        Field field = null;
+        boolean madeAccessible = false;
+        
+        try {
+            field = value.getClass().getDeclaredField(fieldName);
+            madeAccessible = !field.isAccessible();
+            
+            if (madeAccessible) {
+                field.setAccessible(true);
+            }
+            
+            return (T) field.get(value);
+        } catch (NoSuchFieldException e) {
+            ex = e;
+        } catch (SecurityException e) {
+            ex = e;
+        } catch (IllegalArgumentException e) {
+            ex = e;
+        } catch (IllegalAccessException e) {
+            ex = e;
+        } finally {
+            if (madeAccessible) {
+                field.setAccessible(false);
+            }
+        }
+        
+        throw new RuntimeException("Could not access the required methods to dynamically retrieve registered functions. Please report this version of datanucleus(" + VERSION + ") so we can provide support for it!", ex);
+    }
+    
+}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusFunctionRenderContext.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusFunctionRenderContext.java
new file mode 100644
index 0000000000..e90ddc290a
--- /dev/null
+++ b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusFunctionRenderContext.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.datanucleus.function;
+
+import com.blazebit.persistence.spi.FunctionRenderContext;
+
+import java.util.List;
+
+/**
+ *
+ * @author Christian Beikov
+ * @since 1.0.0
+ */
+public class DataNucleusFunctionRenderContext implements FunctionRenderContext {
+    
+    private final StringBuilder sb = new StringBuilder();
+    private final List<?> arguments;
+
+    public DataNucleusFunctionRenderContext(List<?> arguments) {
+        this.arguments = arguments;
+    }
+
+    @Override
+    public int getArgumentsSize() {
+        return arguments.size();
+    }
+
+    @Override
+    public String getArgument(int index) {
+        return arguments.get(index).toString();
+    }
+
+    @Override
+    public void addArgument(int index) {
+        sb.append(arguments.get(index));
+    }
+
+    @Override
+    public void addChunk(String chunk) {
+        sb.append(chunk);
+    }
+    
+    public String renderToString() {
+        return sb.toString();
+    }
+
+    @Override
+    public String toString() {
+        return "HibernateFunctionRenderContext{" + "arguments=" + arguments + '}';
+    }
+    
+}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusJpqlFunctionAdapter.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusJpqlFunctionAdapter.java
new file mode 100644
index 0000000000..3d14901a93
--- /dev/null
+++ b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusJpqlFunctionAdapter.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.datanucleus.function;
+
+import com.blazebit.persistence.spi.JpqlFunction;
+import org.datanucleus.store.rdbms.mapping.java.JavaTypeMapping;
+import org.datanucleus.store.rdbms.mapping.java.TemporalMapping;
+import org.datanucleus.store.rdbms.sql.SQLStatement;
+import org.datanucleus.store.rdbms.sql.SQLText;
+import org.datanucleus.store.rdbms.sql.expression.AggregateNumericExpression;
+import org.datanucleus.store.rdbms.sql.expression.AggregateStringExpression;
+import org.datanucleus.store.rdbms.sql.expression.AggregateTemporalExpression;
+import org.datanucleus.store.rdbms.sql.expression.BooleanExpression;
+import org.datanucleus.store.rdbms.sql.expression.ByteExpression;
+import org.datanucleus.store.rdbms.sql.expression.CharacterExpression;
+import org.datanucleus.store.rdbms.sql.expression.NumericExpression;
+import org.datanucleus.store.rdbms.sql.expression.SQLExpression;
+import org.datanucleus.store.rdbms.sql.expression.StringExpression;
+import org.datanucleus.store.rdbms.sql.expression.TemporalExpression;
+import org.datanucleus.store.rdbms.sql.method.SQLMethod;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class DataNucleusJpqlFunctionAdapter implements SQLMethod {
+    
+    private static final Logger LOG = Logger.getLogger(DataNucleusJpqlFunctionAdapter.class.getName());
+    private final JpqlFunction function;
+    private final boolean aggregate;
+
+    public DataNucleusJpqlFunctionAdapter(JpqlFunction function, boolean aggregate) {
+        this.function = function;
+        this.aggregate = aggregate;
+    }
+
+    public JpqlFunction unwrap() {
+        return function;
+    }
+
+    @Override
+    public SQLExpression getExpression(SQLStatement stmt, SQLExpression expr, List<SQLExpression> args) {
+        // NOTE: expr will be the first argument for class methods like getMonth!
+        int argsSize = args.size();
+        List<String> newArgs = new ArrayList<String>(argsSize + (expr == null ? 0 : 1));
+        Class<?> firstArgumentType = null;
+        JavaTypeMapping firstArgumentTypeMapping = null;
+        
+        if (expr != null) {
+            firstArgumentTypeMapping = expr.getJavaTypeMapping();
+            firstArgumentType = firstArgumentTypeMapping.getJavaType();
+            newArgs.add(expr.toSQLText().toSQL());
+            for (int i = 0; i < argsSize; i++) {
+                newArgs.add(args.get(i).toSQLText().toSQL());
+            }
+        } else if (argsSize > 0) {
+            firstArgumentTypeMapping = args.get(0).getJavaTypeMapping();
+            firstArgumentType = firstArgumentTypeMapping.getJavaType();
+            newArgs.add(args.get(0).toSQLText().toSQL());
+            for (int i = 1; i < argsSize; i++) {
+                newArgs.add(args.get(i).toSQLText().toSQL());
+            }
+        }
+        
+        Class<?> returnType = function.getReturnType(firstArgumentType);
+        JavaTypeMapping returnTypeMapping;
+        
+        if (returnType == firstArgumentType) {
+            returnTypeMapping = firstArgumentTypeMapping;
+        } else {
+            returnTypeMapping = stmt.getSQLExpressionFactory().getMappingForType(returnType);
+        }
+        
+        if (returnTypeMapping == null) {
+            throw new IllegalArgumentException("Invalid return type null returned from function: " + function);
+        }
+        
+        final DataNucleusFunctionRenderContext context = new DataNucleusFunctionRenderContext(newArgs);
+        function.render(context);
+        
+        final SQLText sqlText = new CustomSQLText(context.renderToString(), expr, args);
+        
+        if (aggregate) {
+            if (returnTypeMapping instanceof TemporalMapping) {
+                return new AggregateTemporalExpression(stmt, returnTypeMapping, "", null) {
+                    @Override
+                    public SQLText toSQLText() {
+                        return sqlText;
+                    }
+                };
+            } else if (Number.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
+                return new AggregateNumericExpression(stmt, returnTypeMapping, "") {
+                    @Override
+                    public SQLText toSQLText() {
+                        return sqlText;
+                    }
+                };
+            } else if (String.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
+                return new AggregateStringExpression(stmt, returnTypeMapping, "", null) {
+                    @Override
+                    public SQLText toSQLText() {
+                        return sqlText;
+                    }
+                };
+            } else {
+                LOG.warning("Aggregate type [" + returnType + "] could not be represented as aggregate. Please report this so we can support the type! Falling back to normal expression.");
+            }
+        } else {
+            if (returnTypeMapping instanceof TemporalMapping) {
+                return new TemporalExpression(stmt, returnTypeMapping, "", null) {
+                    @Override
+                    public SQLText toSQLText() {
+                        return sqlText;
+                    }
+                };
+            } else if (Byte.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
+                return new ByteExpression(stmt, null, returnTypeMapping) {
+                    @Override
+                    public SQLText toSQLText() {
+                        return sqlText;
+                    }
+                };
+            } else if (Number.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
+                return new NumericExpression(stmt, returnTypeMapping, "") {
+                    @Override
+                    public SQLText toSQLText() {
+                        return sqlText;
+                    }
+                };
+            } else if (String.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
+                return new StringExpression(stmt, null, returnTypeMapping) {
+                    @Override
+                    public SQLText toSQLText() {
+                        return sqlText;
+                    }
+                };
+            } else if (Character.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
+                return new CharacterExpression(stmt, null, returnTypeMapping) {
+                    @Override
+                    public SQLText toSQLText() {
+                        return sqlText;
+                    }
+                };
+            } else if (Boolean.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
+                return new BooleanExpression(stmt, returnTypeMapping, "") {
+                    @Override
+                    public SQLText toSQLText() {
+                        return sqlText;
+                    }
+                };
+            } else {
+                LOG.warning("Type [" + returnType + "] could not be represented as aggregate. Please report this so we can support the type! Falling back to normal expression.");
+            }
+        }
+        
+        return new SQLExpression(stmt, null, returnTypeMapping) {
+            @Override
+            public SQLText toSQLText() {
+                return sqlText;
+            }
+        };
+    }
+
+}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionInstanceSQLMethod.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionInstanceSQLMethod.java
new file mode 100644
index 0000000000..876bf18738
--- /dev/null
+++ b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionInstanceSQLMethod.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.datanucleus.function;
+
+import com.blazebit.persistence.spi.JpqlFunction;
+import org.datanucleus.store.rdbms.sql.SQLStatement;
+import org.datanucleus.store.rdbms.sql.expression.SQLExpression;
+import org.datanucleus.store.rdbms.sql.method.SQLMethod;
+
+import java.util.Collections;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class JpqlFunctionInstanceSQLMethod extends AbstractJpqlFunctionSQLMethod implements JpqlFunction {
+
+    public JpqlFunctionInstanceSQLMethod(SQLStatement stmt, SQLMethod function) {
+        super(stmt, function);
+    }
+
+    @Override
+    protected SQLExpression getExpression(SQLStatement stmt, SQLExpression argumentExpression) {
+        return function.getExpression(stmt, argumentExpression, Collections.EMPTY_LIST);
+    }
+}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionSQLMethod.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionSQLMethod.java
new file mode 100644
index 0000000000..d16b90cc67
--- /dev/null
+++ b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionSQLMethod.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.datanucleus.function;
+
+import com.blazebit.persistence.spi.JpqlFunction;
+import org.datanucleus.store.rdbms.sql.SQLStatement;
+import org.datanucleus.store.rdbms.sql.expression.SQLExpression;
+import org.datanucleus.store.rdbms.sql.method.SQLMethod;
+
+import java.util.Arrays;
+
+/**
+ *
+ * @author Christian
+ * @since 1.2.0
+ */
+public class JpqlFunctionSQLMethod extends AbstractJpqlFunctionSQLMethod implements JpqlFunction {
+
+    public JpqlFunctionSQLMethod(SQLStatement stmt, SQLMethod function) {
+        super(stmt, function);
+    }
+
+    @Override
+    protected SQLExpression getExpression(SQLStatement stmt, SQLExpression argumentExpression) {
+        return function.getExpression(stmt, null, Arrays.asList(argumentExpression));
+    }
+}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/QueryGeneratorInvocationHandler.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/QueryGeneratorInvocationHandler.java
new file mode 100644
index 0000000000..aa55f0d318
--- /dev/null
+++ b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/QueryGeneratorInvocationHandler.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.datanucleus.function;
+
+import org.datanucleus.NucleusContext;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+
+/**
+ *
+ * @author Christian
+ * @since 1.2.0
+ */
+public class QueryGeneratorInvocationHandler implements InvocationHandler {
+
+    private final NucleusContext context;
+
+    public QueryGeneratorInvocationHandler(NucleusContext context) {
+        this.context = context;
+    }
+
+    @Override
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        if ("getClassLoaderResolver".equals(method.getName())) {
+            return context.getClassLoaderResolver(null);
+        }
+        return null;
+    }
+}
diff --git a/integration/datanucleus-5.1/src/main/resources/META-INF/MANIFEST.MF b/integration/datanucleus-5.1/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..4b3b8d80bb
--- /dev/null
+++ b/integration/datanucleus-5.1/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: blaze-persistence-integration-datanucleus
+Bundle-SymbolicName: com.blazebit.blaze-persistence-integration-datanucleus
+Bundle-Version: 1.0.0
+Bundle-Vendor: Blazebit
+Require-Bundle: org.datanucleus,org.datanucleus.api.jpa
diff --git a/integration/datanucleus-5.1/src/main/resources/plugin.xml b/integration/datanucleus-5.1/src/main/resources/plugin.xml
new file mode 100644
index 0000000000..c4b656b432
--- /dev/null
+++ b/integration/datanucleus-5.1/src/main/resources/plugin.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2014 - 2018 Blazebit.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<plugin id="com.blazebit.persistence" name="Blaze-Persistence DataNucleus plugin" provider-name="Blazebit">
+    <extension point="org.datanucleus.annotations">
+        <annotations annotation-class="com.blazebit.persistence.CTE" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
+        <annotations annotation-class="javax.persistence.Entity" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
+        <annotations annotation-class="javax.persistence.MappedSuperclass" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
+        <annotations annotation-class="javax.persistence.Embeddable" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
+        <annotations annotation-class="javax.persistence.NamedQuery" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
+        <annotations annotation-class="javax.persistence.NamedQueries" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
+        <annotations annotation-class="javax.persistence.NamedNativeQuery" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
+        <annotations annotation-class="javax.persistence.NamedNativeQueries" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
+        <annotations annotation-class="javax.persistence.NamedStoredProcedureQuery" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
+        <annotations annotation-class="javax.persistence.NamedStoredProcedureQueries" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
+        <annotations annotation-class="org.datanucleus.api.jpa.annotations.PersistenceAware" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
+        <annotations annotation-class="javax.persistence.Converter" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
+    </extension>
+</plugin>
\ No newline at end of file
diff --git a/integration/deltaspike-data/api/pom.xml b/integration/deltaspike-data/api/pom.xml
index 0843270016..27b562080c 100644
--- a/integration/deltaspike-data/api/pom.xml
+++ b/integration/deltaspike-data/api/pom.xml
@@ -16,6 +16,18 @@
         <module.name>com.blazebit.persistence.integration.deltaspike.data</module.name>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.deltaspike.distribution</groupId>
+                <artifactId>distributions-bom</artifactId>
+                <version>${version.deltaspike-1.7}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>javax</groupId>
diff --git a/integration/deltaspike-data/impl/pom.xml b/integration/deltaspike-data/impl-1.7/pom.xml
similarity index 89%
rename from integration/deltaspike-data/impl/pom.xml
rename to integration/deltaspike-data/impl-1.7/pom.xml
index 6e40b41b39..ca920be336 100644
--- a/integration/deltaspike-data/impl/pom.xml
+++ b/integration/deltaspike-data/impl-1.7/pom.xml
@@ -8,14 +8,26 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>blaze-persistence-integration-deltaspike-data-impl</artifactId>
+    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.7</artifactId>
 
-    <name>Blazebit Persistence Integration DeltaSpike Data Impl</name>
+    <name>Blazebit Persistence Integration DeltaSpike Data Impl 1.7</name>
 
     <properties>
         <module.name>com.blazebit.persistence.integration.deltaspike.data.impl</module.name>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.deltaspike.distribution</groupId>
+                <artifactId>distributions-bom</artifactId>
+                <version>${version.deltaspike-1.7}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/EntityViewRepositoryExtension.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/EntityViewRepositoryExtension.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/EntityViewRepositoryExtension.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/EntityViewRepositoryExtension.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilderContext.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilderContext.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilderContext.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilderContext.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewAndQueryPart.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewAndQueryPart.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewAndQueryPart.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewAndQueryPart.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewBasePropertyQueryPart.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewBasePropertyQueryPart.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewBasePropertyQueryPart.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewBasePropertyQueryPart.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewConnectingQueryPart.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewConnectingQueryPart.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewConnectingQueryPart.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewConnectingQueryPart.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrQueryPart.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrQueryPart.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrQueryPart.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrQueryPart.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrderByQueryPart.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrderByQueryPart.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrderByQueryPart.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrderByQueryPart.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewPropertyQueryPart.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewPropertyQueryPart.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewPropertyQueryPart.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewPropertyQueryPart.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryPart.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryPart.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryPart.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryPart.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/OrderByQueryAttribute.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/OrderByQueryAttribute.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/OrderByQueryAttribute.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/OrderByQueryAttribute.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/QueryOperator.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/QueryOperator.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/QueryOperator.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/QueryOperator.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/PaginationCriteriaBuilderPostProcessor.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/PaginationCriteriaBuilderPostProcessor.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/PaginationCriteriaBuilderPostProcessor.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/PaginationCriteriaBuilderPostProcessor.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewQueryProcessor.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewQueryProcessor.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewQueryProcessor.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewQueryProcessor.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/criteria/QueryCriteria.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/criteria/QueryCriteria.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/criteria/QueryCriteria.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/criteria/QueryCriteria.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaBuilderPostProcessor.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaBuilderPostProcessor.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaBuilderPostProcessor.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaBuilderPostProcessor.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityManagerRefLookup.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityManagerRefLookup.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityManagerRefLookup.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityManagerRefLookup.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewContext.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewContext.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewContext.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewContext.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewDelegateQueryHandler.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewDelegateQueryHandler.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewDelegateQueryHandler.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewDelegateQueryHandler.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewJpaQueryPostProcessor.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewJpaQueryPostProcessor.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewJpaQueryPostProcessor.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewJpaQueryPostProcessor.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRef.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRef.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRef.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRef.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponent.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponent.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponent.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponent.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponents.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponents.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponents.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponents.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponentsFactory.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponentsFactory.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponentsFactory.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponentsFactory.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryMethod.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryMethod.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryMethod.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryMethod.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/Parameters.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/Parameters.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/Parameters.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/Parameters.java
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java
rename to integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java
diff --git a/integration/deltaspike-data/impl/src/main/resources/META-INF/apache-deltaspike.properties b/integration/deltaspike-data/impl-1.7/src/main/resources/META-INF/apache-deltaspike.properties
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/resources/META-INF/apache-deltaspike.properties
rename to integration/deltaspike-data/impl-1.7/src/main/resources/META-INF/apache-deltaspike.properties
diff --git a/integration/deltaspike-data/impl/src/main/resources/META-INF/beans.xml b/integration/deltaspike-data/impl-1.7/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from integration/deltaspike-data/impl/src/main/resources/META-INF/beans.xml
rename to integration/deltaspike-data/impl-1.7/src/main/resources/META-INF/beans.xml
diff --git a/integration/deltaspike-data/impl-1.8/pom.xml b/integration/deltaspike-data/impl-1.8/pom.xml
new file mode 100644
index 0000000000..ec7d0b6295
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/pom.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>blaze-persistence-integration-deltaspike-data</artifactId>
+        <groupId>com.blazebit</groupId>
+        <version>1.2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.8</artifactId>
+
+    <name>Blazebit Persistence Integration DeltaSpike Data Impl 1.8</name>
+
+    <properties>
+        <module.name>com.blazebit.persistence.integration.deltaspike.data.impl</module.name>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.deltaspike.distribution</groupId>
+                <artifactId>distributions-bom</artifactId>
+                <version>${version.deltaspike-1.8}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-entity-view-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-integration-deltaspike-data-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+            <version>7.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.deltaspike.core</groupId>
+            <artifactId>deltaspike-core-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-data-module-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-data-module-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-jpa-module-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-partial-bean-module-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-apt-utils</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-resource</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>add-resource</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>target/generated/resources</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.bsc.maven</groupId>
+                <artifactId>maven-processor-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>process-resources</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <outputDirectory>target/generated/resources</outputDirectory>
+                            <processors>
+                                <!-- list of processors to use -->
+                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
+                            </processors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java
new file mode 100644
index 0000000000..82c4a1769d
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl;
+
+import com.blazebit.apt.service.ServiceProvider;
+import org.apache.deltaspike.data.api.Repository;
+import org.apache.deltaspike.data.impl.handler.QueryHandler;
+import org.apache.deltaspike.partialbean.impl.PartialBeanBindingExtension;
+import org.apache.deltaspike.partialbean.impl.PartialBeanDescriptor;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Modifier;
+import java.util.Map;
+
+/**
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+@ServiceProvider(Extension.class)
+public class CustomPartialBeanBindingExtension extends PartialBeanBindingExtension {
+
+    private boolean isActivated() {
+        try {
+            Field descriptorsField = PartialBeanBindingExtension.class.getDeclaredField("isActivated");
+            descriptorsField.setAccessible(true);
+            return (boolean) descriptorsField.get(this);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private Map<Class<? extends Annotation>, PartialBeanDescriptor> getDescriptors() {
+        try {
+            Field descriptorsField = PartialBeanBindingExtension.class.getDeclaredField("descriptors");
+            descriptorsField.setAccessible(true);
+            return (Map<Class<? extends Annotation>, PartialBeanDescriptor>) descriptorsField.get(this);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private IllegalStateException getDefinitionError() {
+        try {
+            Field descriptorsField = PartialBeanBindingExtension.class.getDeclaredField("definitionError");
+            descriptorsField.setAccessible(true);
+            return (IllegalStateException) descriptorsField.get(this);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void setDefinitionError(IllegalStateException definitionError) {
+        try {
+            Field descriptorsField = PartialBeanBindingExtension.class.getDeclaredField("definitionError");
+            descriptorsField.setAccessible(true);
+            descriptorsField.set(this, definitionError);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public <X> void findInvocationHandlerBindings(@Observes ProcessAnnotatedType<X> pat, BeanManager beanManager) {
+        if (isActivated() && getDefinitionError() == null) {
+            Map<Class<? extends Annotation>, PartialBeanDescriptor> descriptors = getDescriptors();
+            Class<? extends InvocationHandler> beanClass = (Class<? extends InvocationHandler>) pat.getAnnotatedType().getJavaClass();
+            Class<? extends Annotation> bindingClass = this.extractBindingClass(pat);
+            if (bindingClass != null) {
+                if (bindingClass.equals(Repository.class) && beanClass.equals(QueryHandler.class)) {
+                    return;
+                }
+                PartialBeanDescriptor descriptor;
+                if (!beanClass.isInterface() && !Modifier.isAbstract(beanClass.getModifiers())) {
+                    if (InvocationHandler.class.isAssignableFrom(beanClass)) {
+                        descriptor = descriptors.get(bindingClass);
+                        if (descriptor == null) {
+                            descriptor = new PartialBeanDescriptor(bindingClass, beanClass);
+                            descriptors.put(bindingClass, descriptor);
+                        } else if (descriptor.getHandler() == null) {
+                            descriptor.setHandler(beanClass);
+                        } else if (!descriptor.getHandler().equals(beanClass)) {
+                            setDefinitionError(new IllegalStateException("Multiple handlers found for " + bindingClass.getName() + " (" + descriptor.getHandler().getName() + " and " + beanClass.getName() + ")"));
+                        }
+                    } else {
+                        setDefinitionError(new IllegalStateException(beanClass.getName() + " is annotated with @" + bindingClass.getName() + " and therefore has to be " + "an abstract class, an interface or an implementation of " + InvocationHandler.class.getName()));
+                    }
+                } else {
+                    pat.veto();
+                    descriptor = descriptors.get(bindingClass);
+                    if (descriptor == null) {
+                        descriptor = new PartialBeanDescriptor(bindingClass, (Class)null, beanClass);
+                        descriptors.put(bindingClass, descriptor);
+                    } else if (!descriptor.getClasses().contains(beanClass)) {
+                        descriptor.getClasses().add(beanClass);
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java
new file mode 100644
index 0000000000..7ea864cf26
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl;
+
+import org.apache.deltaspike.core.spi.activation.ClassDeactivator;
+import org.apache.deltaspike.core.spi.activation.Deactivatable;
+import org.apache.deltaspike.partialbean.impl.PartialBeanBindingExtension;
+
+/**
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public class DeltaspikeExtensionDeactivator implements ClassDeactivator {
+    @Override
+    public Boolean isActivated(Class<? extends Deactivatable> aClass) {
+        // We only deactivate the partial bean binding extension so we can replace the it with our own version which replaces the repository handler
+        return !(aClass.equals(PartialBeanBindingExtension.class));
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java
new file mode 100644
index 0000000000..ff02ecdee3
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder;
+
+import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
+import org.apache.deltaspike.data.api.QueryResult;
+import org.apache.deltaspike.data.impl.builder.QueryBuilder;
+import org.apache.deltaspike.data.impl.meta.RepositoryMethodMetadata;
+import org.apache.deltaspike.data.impl.meta.RepositoryMethodType;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.QueryBuilderFactory} but was modified to
+ * work with entity views.
+ *
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+@ApplicationScoped
+public class EntityViewAwareQueryBuilderFactory {
+
+    @Inject
+    private EntityViewMethodQueryBuilder methodQueryBuilder;
+    @Inject
+    private EntityViewDelegateQueryBuilder delegateQueryBuilder;
+
+    protected EntityViewQueryBuilder getEntityViewQueryBuilder(RepositoryMethodType repositoryMethodType) {
+        switch (repositoryMethodType) {
+            case PARSE:
+                return methodQueryBuilder;
+            case DELEGATE:
+                return delegateQueryBuilder;
+            default:
+                throw new RuntimeException(
+                        "No " + QueryBuilder.class.getName() + " avialable for type: " + repositoryMethodType);
+        }
+    }
+
+    public EntityViewQueryBuilder build(RepositoryMethodMetadata methodMetadata, EntityViewCdiQueryInvocationContext context) {
+        EntityViewQueryBuilder builder = getEntityViewQueryBuilder(context.getRepositoryMethodMetadata().getMethodType());
+        if (QueryResult.class.equals(methodMetadata.getMethod().getReturnType())) {
+            return new WrappedEntityViewQueryBuilder(builder);
+        }
+        return builder;
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java
new file mode 100644
index 0000000000..d7c627ed57
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder;
+
+import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
+import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewDelegateQueryHandler;
+import org.apache.deltaspike.core.api.provider.BeanProvider;
+import org.apache.deltaspike.core.util.ClassUtils;
+import org.apache.deltaspike.core.util.OptionalUtil;
+import org.apache.deltaspike.core.util.StreamUtil;
+import org.apache.deltaspike.data.api.QueryInvocationException;
+import org.apache.deltaspike.data.impl.util.bean.BeanDestroyable;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.persistence.PersistenceException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.DelegateQueryBuilder} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+@ApplicationScoped
+public class EntityViewDelegateQueryBuilder extends EntityViewQueryBuilder {
+    @Inject
+    private BeanManager beanManager;
+
+    private final Map<Method, Bean<EntityViewDelegateQueryHandler>> lookupCache = new ConcurrentHashMap<>();
+
+    @Override
+    public Object execute(EntityViewCdiQueryInvocationContext context) {
+        try {
+            EntityViewDelegateQueryHandler delegate = lookup(context);
+            if (delegate != null) {
+                Object result = invoke(delegate, context);
+                if (result instanceof Collection && StreamUtil.isStreamReturned(context.getMethod())) {
+                    return StreamUtil.wrap(result);
+                } else if (OptionalUtil.isOptionalReturned(context.getMethod())) {
+                    return OptionalUtil.wrap(result);
+                } else {
+                    return result;
+                }
+            }
+        } catch (PersistenceException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new QueryInvocationException(e, context);
+        }
+        throw new QueryInvocationException("No DelegateQueryHandler found", context);
+    }
+
+    private EntityViewDelegateQueryHandler lookup(EntityViewCdiQueryInvocationContext context) {
+        Bean<EntityViewDelegateQueryHandler> selectedBean = lookupCache.get(context.getMethod());
+
+        if (selectedBean == null) {
+            Set<Bean<EntityViewDelegateQueryHandler>> beans = BeanProvider
+                    .getBeanDefinitions(EntityViewDelegateQueryHandler.class, true, true);
+            for (Bean<EntityViewDelegateQueryHandler> bean : beans) {
+                if (ClassUtils.containsPossiblyGenericMethod(bean.getBeanClass(), context.getMethod())) {
+                    selectedBean = bean;
+                }
+            }
+
+            if (selectedBean != null) {
+                lookupCache.put(context.getMethod(), selectedBean);
+            }
+        }
+
+
+        if (selectedBean != null) {
+            CreationalContext<EntityViewDelegateQueryHandler> cc = beanManager.createCreationalContext(selectedBean);
+            EntityViewDelegateQueryHandler instance = (EntityViewDelegateQueryHandler) beanManager.getReference(
+                    selectedBean, EntityViewDelegateQueryHandler.class, cc);
+
+            if (selectedBean.getScope().equals(Dependent.class)) {
+                context.addDestroyable(new BeanDestroyable<EntityViewDelegateQueryHandler>(selectedBean, instance, cc));
+            }
+
+            return instance;
+        }
+        return null;
+    }
+
+    private Object invoke(EntityViewDelegateQueryHandler delegate, EntityViewCdiQueryInvocationContext context) {
+        try {
+            Method extract = ClassUtils.extractPossiblyGenericMethod(delegate.getClass(), context.getMethod());
+            return extract.invoke(delegate, context.getMethodParameters());
+        } catch (InvocationTargetException e) {
+            if (e.getCause() != null && e.getCause() instanceof PersistenceException) {
+                throw (PersistenceException) e.getCause();
+            }
+            throw new QueryInvocationException(e, context);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java
new file mode 100644
index 0000000000..fa180e006c
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder;
+
+import com.blazebit.persistence.CriteriaBuilder;
+import com.blazebit.persistence.FullQueryBuilder;
+import com.blazebit.persistence.deltaspike.data.impl.builder.part.EntityViewQueryRoot;
+import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
+import com.blazebit.persistence.view.EntityViewSetting;
+import org.apache.deltaspike.data.impl.param.Parameters;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.persistence.Query;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.MethodQueryBuilder} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+@ApplicationScoped
+public class EntityViewMethodQueryBuilder extends EntityViewQueryBuilder {
+
+    @Override
+    public Object execute(EntityViewCdiQueryInvocationContext context) {
+        Query jpaQuery = createJpaQuery(context);
+        return context.executeQuery(jpaQuery);
+    }
+
+    private Query createJpaQuery(EntityViewCdiQueryInvocationContext context) {
+        Parameters params = context.getParams();
+        EntityViewQueryRoot root = context.getRepositoryMethodMetadata().getEntityViewQueryRoot();
+        CriteriaBuilder<?> cb = context.getCriteriaBuilderFactory().create(context.getEntityManager(), context.getEntityClass());
+        root.apply(cb);
+
+        cb = context.getEntityViewManager().applySetting(
+                EntityViewSetting.create(context.getEntityViewClass()),
+                cb
+        );
+        FullQueryBuilder<? ,?> fullCb;
+        if (params.hasFirstResult() || params.hasSizeRestriction()) {
+            int firstResult = params.hasFirstResult() ? params.getFirstResult() : 0;
+            int maxResults = params.hasSizeRestriction() ? params.getSizeRestriciton() : Integer.MAX_VALUE;
+            fullCb = cb.page(firstResult, maxResults);
+        } else {
+            fullCb = cb;
+        }
+
+        fullCb = context.applyCriteriaBuilderPostProcessors(fullCb);
+        Query q = params.applyTo(fullCb.getQuery());
+        return context.applyRestrictions(q);
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java
new file mode 100644
index 0000000000..21ee1fcb2f
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder;
+
+import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
+import org.apache.deltaspike.data.api.QueryResult;
+import org.apache.deltaspike.data.api.mapping.QueryInOutMapper;
+
+import javax.persistence.Query;
+import java.util.List;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.QueryBuilder} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public abstract class EntityViewQueryBuilder {
+
+    @SuppressWarnings("unchecked")
+    public Object executeQuery(EntityViewCdiQueryInvocationContext context) {
+        Object result = execute(context);
+        if (!isUnmappableResult(result) && context.hasQueryInOutMapper()) {
+            QueryInOutMapper<Object> mapper = (QueryInOutMapper<Object>)
+                    context.getQueryInOutMapper();
+            if (result instanceof List) {
+                return mapper.mapResultList((List<Object>) result);
+            }
+            return mapper.mapResult(result);
+        }
+        return result;
+    }
+
+    protected abstract Object execute(EntityViewCdiQueryInvocationContext ctx);
+
+    private boolean isUnmappableResult(Object result) {
+        return result instanceof QueryResult ||
+                result instanceof Query;
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilderContext.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilderContext.java
new file mode 100644
index 0000000000..ec633da8ed
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilderContext.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder;
+
+import com.blazebit.persistence.deltaspike.data.impl.builder.part.OrderByQueryAttribute;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.QueryBuilderContext} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public class EntityViewQueryBuilderContext {
+
+    private final StringBuilder whereExpressionBuilder = new StringBuilder();
+    private final List<OrderByQueryAttribute> orderByAttributes = new ArrayList<>();
+    private int counter = 1;
+
+    public int increment() {
+        return counter++;
+    }
+
+    public StringBuilder getWhereExpressionBuilder() {
+        return whereExpressionBuilder;
+    }
+
+    public List<OrderByQueryAttribute> getOrderByAttributes() {
+        return orderByAttributes;
+    }
+}
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java
new file mode 100644
index 0000000000..78df43110c
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder;
+
+import com.blazebit.persistence.deltaspike.data.impl.builder.result.EntityViewDefaultQueryResult;
+import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.WrappedQueryBuilder} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public class WrappedEntityViewQueryBuilder extends EntityViewQueryBuilder {
+
+    private final EntityViewQueryBuilder delegate;
+
+    public WrappedEntityViewQueryBuilder(EntityViewQueryBuilder delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    @SuppressWarnings("rawtypes")
+    public Object execute(EntityViewCdiQueryInvocationContext ctx) {
+        return new EntityViewDefaultQueryResult(delegate, ctx);
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewAndQueryPart.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewAndQueryPart.java
new file mode 100644
index 0000000000..5f6e14a39a
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewAndQueryPart.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder.part;
+
+import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilderContext;
+import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewAwareRepositoryMetadata;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.part.AndQueryPart} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+class EntityViewAndQueryPart extends EntityViewConnectingQueryPart {
+
+    public EntityViewAndQueryPart(boolean first) {
+        super(first);
+    }
+
+    @Override
+    protected EntityViewQueryPart build(String queryPart, String method, EntityViewAwareRepositoryMetadata repo) {
+        children.add(new EntityViewPropertyQueryPart().build(queryPart, method, repo));
+        return this;
+    }
+
+    @Override
+    protected EntityViewQueryPart buildQuery(EntityViewQueryBuilderContext ctx) {
+        if (!first) {
+            ctx.getWhereExpressionBuilder().append(" and ");
+        }
+        buildQueryForChildren(ctx);
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewBasePropertyQueryPart.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewBasePropertyQueryPart.java
new file mode 100644
index 0000000000..e97caadf62
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewBasePropertyQueryPart.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder.part;
+
+import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewAwareRepositoryMetadata;
+import org.apache.deltaspike.data.impl.builder.MethodExpressionException;
+import org.apache.deltaspike.data.impl.property.Property;
+import org.apache.deltaspike.data.impl.property.query.NamedPropertyCriteria;
+import org.apache.deltaspike.data.impl.property.query.PropertyQueries;
+import org.apache.deltaspike.data.impl.property.query.PropertyQuery;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.part.BasePropertyQueryPart} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+abstract class EntityViewBasePropertyQueryPart extends EntityViewQueryPart {
+    static final String SEPARATOR = "_";
+
+    void validate(String name, String method, EntityViewAwareRepositoryMetadata repo) {
+        Class<?> current = repo.getEntityMetadata().getEntityClass();
+        if (name == null) {
+            throw new MethodExpressionException(null, repo.getRepositoryClass(), method);
+        }
+        for (String property : name.split(SEPARATOR)) {
+            PropertyQuery<?> query = PropertyQueries.createQuery(current)
+                    .addCriteria(new NamedPropertyCriteria(property));
+            Property<?> result = query.getFirstResult();
+            if (result == null) {
+                throw new MethodExpressionException(property, repo.getRepositoryClass(), method);
+            }
+            current = result.getJavaClass();
+        }
+    }
+
+    static String rewriteSeparator(String name) {
+        if (name.contains("_")) {
+            return name.replaceAll(SEPARATOR, ".");
+        }
+        return name;
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/RepositoryEntityView.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewConnectingQueryPart.java
similarity index 51%
rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/RepositoryEntityView.java
rename to integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewConnectingQueryPart.java
index e35c34c7fe..428ed205cd 100644
--- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/RepositoryEntityView.java
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewConnectingQueryPart.java
@@ -14,35 +14,23 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.deltaspike.data.impl.meta;
+package com.blazebit.persistence.deltaspike.data.impl.builder.part;
 
 /**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.meta.RepositoryEntity} but was modified to
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.part.ConnectingQueryPart} but was modified to
  * work with entity views.
  *
  * @author Moritz Becker
  * @since 1.2.0
  */
-public class RepositoryEntityView {
-    private final Class<?> entityViewClass;
-    private final Class<?> entityClass;
-    private final String entityName;
+abstract class EntityViewConnectingQueryPart extends EntityViewQueryPart {
+    protected final boolean first;
 
-    public RepositoryEntityView(Class<?> entityViewClass, Class<?> entityClass) {
-        this.entityViewClass = entityViewClass;
-        this.entityClass = entityClass;
-        this.entityName = entityClass.getSimpleName();
+    public EntityViewConnectingQueryPart(boolean first) {
+        this.first = first;
     }
 
-    public Class<?> getEntityViewClass() {
-        return entityViewClass;
-    }
-
-    public Class<?> getEntityClass() {
-        return entityClass;
-    }
-
-    public String getEntityName() {
-        return entityName;
+    public boolean isFirst() {
+        return first;
     }
 }
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrQueryPart.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrQueryPart.java
new file mode 100644
index 0000000000..3f570d37d9
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrQueryPart.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder.part;
+
+import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilderContext;
+import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewAwareRepositoryMetadata;
+
+import static org.apache.deltaspike.data.impl.util.QueryUtils.splitByKeyword;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.part.OrQueryPart} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+class EntityViewOrQueryPart extends EntityViewConnectingQueryPart {
+
+    public EntityViewOrQueryPart(boolean first) {
+        super(first);
+    }
+
+    @Override
+    protected EntityViewQueryPart build(String queryPart, String method, EntityViewAwareRepositoryMetadata repo) {
+        String[] andParts = splitByKeyword(queryPart, "And");
+        boolean first = true;
+        for (String and : andParts) {
+            EntityViewAndQueryPart andPart = new EntityViewAndQueryPart(first);
+            first = false;
+            children.add(andPart.build(and, method, repo));
+        }
+        return this;
+    }
+
+    @Override
+    protected EntityViewQueryPart buildQuery(EntityViewQueryBuilderContext ctx) {
+        if (!first) {
+            ctx.getWhereExpressionBuilder().append(" or ");
+        }
+        buildQueryForChildren(ctx);
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrderByQueryPart.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrderByQueryPart.java
new file mode 100644
index 0000000000..9a54544ea4
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrderByQueryPart.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder.part;
+
+import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilderContext;
+import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewAwareRepositoryMetadata;
+
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import static org.apache.deltaspike.data.impl.util.QueryUtils.splitByKeyword;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.part.OrderByQueryPart} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+class EntityViewOrderByQueryPart extends EntityViewBasePropertyQueryPart {
+    private final List<OrderByQueryAttribute> attributes = new LinkedList<>();
+
+    @Override
+    protected EntityViewQueryPart build(String queryPart, String method, EntityViewAwareRepositoryMetadata repo) {
+        Set<String> collect = new LinkedHashSet<String>();
+        List<String> ascSplit = new LinkedList<String>();
+        split(queryPart, OrderByQueryAttribute.KEYWORD_ASC, ascSplit);
+        for (String ascPart : ascSplit) {
+            split(ascPart, OrderByQueryAttribute.KEYWORD_DESC, collect);
+        }
+        for (String part : collect) {
+            OrderByQueryAttribute.Direction direction = OrderByQueryAttribute.Direction.fromQueryPart(part);
+            String attribute = direction.attribute(part);
+            validate(attribute, method, repo);
+            attributes.add(new OrderByQueryAttribute(attribute, direction));
+        }
+        return this;
+    }
+
+    @Override
+    protected EntityViewOrderByQueryPart buildQuery(EntityViewQueryBuilderContext ctx) {
+        ctx.getOrderByAttributes().addAll(attributes);
+        return this;
+    }
+
+    private void split(String queryPart, String keyword, Collection<String> result) {
+        for (String part : splitByKeyword(queryPart, keyword)) {
+            String attribute = !part.endsWith(OrderByQueryAttribute.KEYWORD_DESC) && !part.endsWith(OrderByQueryAttribute.KEYWORD_ASC) ? part + keyword : part;
+            result.add(attribute);
+        }
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewPropertyQueryPart.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewPropertyQueryPart.java
new file mode 100644
index 0000000000..31f6c34e50
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewPropertyQueryPart.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder.part;
+
+import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilderContext;
+import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewAwareRepositoryMetadata;
+
+import java.text.MessageFormat;
+
+import static org.apache.deltaspike.data.impl.util.QueryUtils.uncapitalize;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.part.PropertyQueryPart} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+class EntityViewPropertyQueryPart extends EntityViewBasePropertyQueryPart {
+
+    private String name;
+    private QueryOperator comparator;
+
+    @Override
+    protected EntityViewQueryPart build(String queryPart, String method, EntityViewAwareRepositoryMetadata repo) {
+        comparator = QueryOperator.Equal;
+        name = uncapitalize(queryPart);
+        for (QueryOperator comp : QueryOperator.values()) {
+            if (queryPart.endsWith(comp.getExpression())) {
+                comparator = comp;
+                name = uncapitalize(queryPart.substring(0, queryPart.indexOf(comp.getExpression())));
+                break;
+            }
+        }
+        validate(name, method, repo);
+        name = EntityViewBasePropertyQueryPart.rewriteSeparator(name);
+        return this;
+    }
+
+    @Override
+    protected EntityViewQueryPart buildQuery(EntityViewQueryBuilderContext ctx) {
+        String[] args = new String[comparator.getParamNum() + 1];
+        args[0] = name;
+        for (int i = 1; i < args.length; i++) {
+            args[i] = getAndIncrementParamName(ctx);
+        }
+        ctx.getWhereExpressionBuilder().append(MessageFormat.format(comparator.getJpql(), (Object[]) args));
+        return this;
+    }
+
+    private String getAndIncrementParamName(EntityViewQueryBuilderContext ctx) {
+        return "?" + ctx.increment();
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryPart.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryPart.java
new file mode 100644
index 0000000000..bde665fc71
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryPart.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder.part;
+
+import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilderContext;
+import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewAwareRepositoryMetadata;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.part.QueryPart} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+abstract class EntityViewQueryPart {
+    protected List<EntityViewQueryPart> children = new LinkedList<>();
+
+    protected abstract EntityViewQueryPart build(String queryPart, String method, EntityViewAwareRepositoryMetadata repo);
+
+    protected abstract EntityViewQueryPart buildQuery(EntityViewQueryBuilderContext ctx);
+
+    protected void buildQueryForChildren(EntityViewQueryBuilderContext ctx) {
+        for (EntityViewQueryPart child : children) {
+            child.buildQuery(ctx);
+        }
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java
new file mode 100644
index 0000000000..ba0c1ff502
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder.part;
+
+import com.blazebit.persistence.CriteriaBuilder;
+import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilderContext;
+import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewAwareRepositoryMetadata;
+import org.apache.deltaspike.data.impl.builder.MethodExpressionException;
+import org.apache.deltaspike.data.impl.meta.RepositoryMethodPrefix;
+
+import java.util.List;
+
+import static org.apache.deltaspike.data.impl.util.QueryUtils.splitByKeyword;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.part.QueryRoot} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public class EntityViewQueryRoot extends EntityViewQueryPart {
+    private final Class<?> entityClass;
+    private final RepositoryMethodPrefix methodPrefix;
+    private final String whereExpression;
+    private final List<OrderByQueryAttribute> orderByAttributes;
+
+    protected EntityViewQueryRoot(String method, EntityViewAwareRepositoryMetadata repo, RepositoryMethodPrefix methodPrefix) {
+        this.entityClass = repo.getEntityMetadata().getEntityClass();
+        this.methodPrefix = methodPrefix;
+        build(method, method, repo);
+        EntityViewQueryBuilderContext ctx = new EntityViewQueryBuilderContext();
+        buildQuery(ctx);
+        StringBuilder whereExpressionBuilder = ctx.getWhereExpressionBuilder();
+        this.whereExpression = whereExpressionBuilder.length() > 0 ? whereExpressionBuilder.toString() : null;
+        this.orderByAttributes = ctx.getOrderByAttributes();
+    }
+
+    public static EntityViewQueryRoot create(String method, EntityViewAwareRepositoryMetadata repo, RepositoryMethodPrefix prefix) {
+        return new EntityViewQueryRoot(method, repo, prefix);
+    }
+
+    @Override
+    protected EntityViewQueryPart build(String queryPart, String method, EntityViewAwareRepositoryMetadata repo) {
+        String[] orderByParts = splitByKeyword(queryPart, "OrderBy");
+        if (hasQueryConditions(orderByParts)) {
+            String[] orParts = splitByKeyword(removePrefix(orderByParts[0]), "Or");
+            boolean first = true;
+            for (String or : orParts) {
+                EntityViewOrQueryPart orPart = new EntityViewOrQueryPart(first);
+                first = false;
+                children.add(orPart.build(or, method, repo));
+            }
+        }
+        if (orderByParts.length > 1) {
+            EntityViewOrderByQueryPart orderByPart = new EntityViewOrderByQueryPart();
+            children.add(orderByPart.build(orderByParts[1], method, repo));
+        }
+        if (children.isEmpty()) {
+            throw new MethodExpressionException(repo.getRepositoryClass(), method);
+        }
+        return this;
+    }
+
+    @Override
+    protected EntityViewQueryPart buildQuery(EntityViewQueryBuilderContext ctx) {
+        buildQueryForChildren(ctx);
+        return this;
+    }
+
+    public void apply(CriteriaBuilder<?> cb) {
+        if (methodPrefix.isDelete()) {
+            throw new UnsupportedOperationException("Delete queries not supported in entity view repositories");
+        } else {
+            cb.from(entityClass);
+        }
+        if (whereExpression != null) {
+            cb.setWhereExpression(whereExpression);
+        }
+        for (OrderByQueryAttribute orderByAttribute : orderByAttributes) {
+            orderByAttribute.buildQuery(cb);
+        }
+    }
+
+    private boolean hasQueryConditions(String[] orderByParts) {
+        String orderByPart = orderByParts[0];
+        String prefix = methodPrefix.getPrefix();
+        return !prefix.equals(orderByPart) && !orderByPart.matches(prefix);
+    }
+
+    private String removePrefix(String queryPart) {
+        return methodPrefix.removePrefix(queryPart);
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/OrderByQueryAttribute.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/OrderByQueryAttribute.java
new file mode 100644
index 0000000000..2807c35c36
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/OrderByQueryAttribute.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder.part;
+
+import com.blazebit.persistence.CriteriaBuilder;
+
+import static org.apache.deltaspike.core.util.StringUtils.isNotEmpty;
+import static org.apache.deltaspike.data.impl.util.QueryUtils.uncapitalize;
+
+/**
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public class OrderByQueryAttribute {
+    static final String KEYWORD_ASC = "Asc";
+    static final String KEYWORD_DESC = "Desc";
+
+    private final String attribute;
+    private final Direction direction;
+
+    OrderByQueryAttribute(String attribute, Direction direction) {
+        this.attribute = attribute;
+        this.direction = direction;
+    }
+
+    void buildQuery(CriteriaBuilder<?> cb) {
+        switch (direction) {
+            case DESC:
+                cb.orderByDesc(EntityViewBasePropertyQueryPart.rewriteSeparator(attribute));
+                break;
+            case DEFAULT:
+            case ASC:
+            default:
+                cb.orderByAsc(EntityViewBasePropertyQueryPart.rewriteSeparator(attribute));
+                break;
+        }
+    }
+
+    /**
+     * @author Christian Beikov
+     * @since 1.2.0
+     */
+    public enum Direction {
+        ASC(KEYWORD_ASC),
+        DESC(KEYWORD_DESC),
+        DEFAULT("");
+
+        private final String postfix;
+
+        Direction(String postfix) {
+            this.postfix = postfix;
+        }
+
+        public boolean endsWith(String queryPart) {
+            return isNotEmpty(postfix) ? queryPart.endsWith(postfix) : false;
+        }
+
+        public String attribute(String queryPart) {
+            String attribute = isNotEmpty(postfix) ?
+                    queryPart.substring(0, queryPart.indexOf(postfix)) :
+                    queryPart;
+            return uncapitalize(attribute);
+        }
+
+        public String queryDirection() {
+            return isNotEmpty(postfix) ? " " + postfix.toLowerCase() : "";
+        }
+
+        public static Direction fromQueryPart(String queryPart) {
+            for (Direction dir : values()) {
+                if (dir.endsWith(queryPart)) {
+                    return dir;
+                }
+            }
+            return DEFAULT;
+        }
+    }
+}
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/QueryOperator.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/QueryOperator.java
new file mode 100644
index 0000000000..fdb23a2999
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/QueryOperator.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder.part;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.QueryOperator} but altered
+ * LikeIgnoreCase to use upper on both sides.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public enum QueryOperator {
+
+    LessThan("LessThan", "{0} < {1}"),
+    LessThanEquals("LessThanEquals", "{0} <= {1}"),
+    GreaterThan("GreaterThan", "{0} > {1}"),
+    GreaterThanEquals("GreaterThanEquals", "{0} >= {1}"),
+    Like("Like", "{0} like {1}"),
+    LikeIgnoreCase("LikeIgnoreCase", "upper({0}) like upper({1})", true),
+    NotEqual("NotEqual", "{0} <> {1}"),
+    NotEqualIgnoreCase("NotEqualIgnoreCase", "upper({0}) <> upper({1})"),
+    Equal("Equal", "{0} = {1}"),
+    EqualIgnoreCase("EqualIgnoreCase", "upper({0}) = upper({1})"),
+    IgnoreCase("IgnoreCase", "upper({0}) = upper({1})"),
+    Between("Between", "{0} between {1} and {2}", 2),
+    IsNotNull("IsNotNull", "{0} IS NOT NULL", 0),
+    IsNull("IsNull", "{0} IS NULL", 0);
+
+    private final String expression;
+    private final String jpql;
+    private final int paramNum;
+    private final boolean caseInsensitive;
+
+    private QueryOperator(String expression, String jpql) {
+        this(expression, jpql, 1);
+    }
+
+    private QueryOperator(String expression, String jpql, boolean caseInsensitive) {
+        this(expression, jpql, 1, caseInsensitive);
+    }
+
+    private QueryOperator(String expression, String jpql, int paramNum) {
+        this(expression, jpql, paramNum, false);
+    }
+
+    private QueryOperator(String expression, String jpql, int paramNum, boolean caseInsensitive) {
+        this.expression = expression;
+        this.jpql = jpql;
+        this.paramNum = paramNum;
+        this.caseInsensitive = caseInsensitive;
+    }
+
+    public String getExpression() {
+        return expression;
+    }
+
+    public String getJpql() {
+        return jpql;
+    }
+
+    public int getParamNum() {
+        return paramNum;
+    }
+
+    public boolean isCaseInsensitive() {
+        return caseInsensitive;
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java
new file mode 100644
index 0000000000..1f41e1a018
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor;
+
+import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
+import org.apache.deltaspike.data.impl.handler.JpaQueryPostProcessor;
+
+import javax.persistence.FlushModeType;
+import javax.persistence.Query;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.postprocessor.FlushModePostProcessor} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public class FlushModePostProcessor implements JpaQueryPostProcessor {
+
+    private final FlushModeType flushMode;
+
+    public FlushModePostProcessor(FlushModeType flushMode) {
+        this.flushMode = flushMode;
+    }
+
+    @Override
+    public Query postProcess(CdiQueryInvocationContext context, Query query) {
+        query.setFlushMode(flushMode);
+        return query;
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java
new file mode 100644
index 0000000000..15119caf5b
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor;
+
+import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
+import org.apache.deltaspike.data.impl.handler.JpaQueryPostProcessor;
+
+import javax.persistence.Query;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.postprocessor.HintPostProcessor} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public class HintPostProcessor implements JpaQueryPostProcessor {
+
+    private final String hintName;
+    private final Object hintValue;
+
+    public HintPostProcessor(String hintName, Object hintValue) {
+        this.hintName = hintName;
+        this.hintValue = hintValue;
+    }
+
+    @Override
+    public Query postProcess(CdiQueryInvocationContext context, Query query) {
+        query.setHint(hintName, hintValue);
+        return query;
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java
new file mode 100644
index 0000000000..a9df232322
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor;
+
+import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
+import org.apache.deltaspike.data.impl.handler.JpaQueryPostProcessor;
+
+import javax.persistence.LockModeType;
+import javax.persistence.Query;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.postprocessor.LockModePostProcessor} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public class LockModePostProcessor implements JpaQueryPostProcessor {
+
+    private final LockModeType lockMode;
+
+    public LockModePostProcessor(LockModeType lockMode) {
+        this.lockMode = lockMode;
+    }
+
+    @Override
+    public Query postProcess(CdiQueryInvocationContext context, Query query) {
+        query.setLockMode(lockMode);
+        return query;
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java
new file mode 100644
index 0000000000..0fc4fe537a
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor;
+
+import com.blazebit.persistence.FullQueryBuilder;
+import com.blazebit.persistence.deltaspike.data.impl.handler.CriteriaBuilderPostProcessor;
+import org.apache.deltaspike.data.impl.builder.OrderDirection;
+
+import javax.persistence.metamodel.SingularAttribute;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.postprocessor.OrderByQueryStringPostProcessor}
+ * but was modified to work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public class OrderByCriteriaBuilderPostProcessor implements CriteriaBuilderPostProcessor {
+
+    private final String attribute;
+    private OrderDirection direction;
+
+    public OrderByCriteriaBuilderPostProcessor(SingularAttribute<?, ?> attribute, OrderDirection direction) {
+        this.attribute = attribute.getName();
+        this.direction = direction;
+    }
+
+    public OrderByCriteriaBuilderPostProcessor(String attribute, OrderDirection direction) {
+        this.attribute = attribute;
+        this.direction = direction;
+    }
+
+    @Override
+    public FullQueryBuilder<?, ?> postProcess(FullQueryBuilder<?, ?> criteriaBuilder) {
+        return criteriaBuilder.orderBy(attribute, direction == OrderDirection.ASC, false);
+    }
+
+    public boolean matches(SingularAttribute<?, ?> attribute) {
+        return matches(attribute.getName());
+    }
+
+    public boolean matches(String attribute) {
+        return this.attribute.equals(attribute);
+    }
+
+    public void changeDirection() {
+        direction = direction.change();
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/PaginationCriteriaBuilderPostProcessor.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/PaginationCriteriaBuilderPostProcessor.java
new file mode 100644
index 0000000000..a5b72357e8
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/PaginationCriteriaBuilderPostProcessor.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor;
+
+import com.blazebit.persistence.FullQueryBuilder;
+import com.blazebit.persistence.deltaspike.data.impl.handler.CriteriaBuilderPostProcessor;
+
+/**
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public class PaginationCriteriaBuilderPostProcessor implements CriteriaBuilderPostProcessor {
+
+    private final int firstResult;
+    private final int maxResults;
+
+    public PaginationCriteriaBuilderPostProcessor(int firstResult, int maxResults) {
+        this.firstResult = firstResult;
+        this.maxResults = maxResults;
+    }
+
+    @Override
+    public FullQueryBuilder<?, ?> postProcess(FullQueryBuilder<?, ?> queryBuilder) {
+        return queryBuilder.page(firstResult, maxResults);
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java
new file mode 100644
index 0000000000..5ba3182bc8
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java
@@ -0,0 +1,299 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.builder.result;
+
+import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilder;
+import com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor.FlushModePostProcessor;
+import com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor.HintPostProcessor;
+import com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor.LockModePostProcessor;
+import com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor.OrderByCriteriaBuilderPostProcessor;
+import com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor.PaginationCriteriaBuilderPostProcessor;
+import com.blazebit.persistence.deltaspike.data.impl.handler.CriteriaBuilderPostProcessor;
+import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
+import org.apache.deltaspike.data.api.QueryResult;
+import org.apache.deltaspike.data.impl.builder.OrderDirection;
+
+import javax.persistence.FlushModeType;
+import javax.persistence.LockModeType;
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
+import javax.persistence.metamodel.SingularAttribute;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.result.DefaultQueryResult} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public class EntityViewDefaultQueryResult<T> implements QueryResult<T> {
+
+    private final EntityViewQueryBuilder builder;
+    private final EntityViewCdiQueryInvocationContext context;
+
+    private int page = 0;
+    private int pageSize = 10;
+    private int firstResult = 0;
+    private int maxResults = -1;
+
+    public EntityViewDefaultQueryResult(EntityViewQueryBuilder builder, EntityViewCdiQueryInvocationContext context) {
+        this.builder = builder;
+        this.context = context;
+    }
+
+    @Override
+    public <X> QueryResult<T> orderAsc(SingularAttribute<T, X> attribute) {
+        return orderAsc(attribute, true);
+    }
+
+    @Override
+    public <X> QueryResult<T> orderAsc(SingularAttribute<T, X> attribute, boolean appendEntityName) {
+        context.addCriteriaBuilderPostProcessor(new OrderByCriteriaBuilderPostProcessor(attribute, OrderDirection.ASC));
+        return this;
+    }
+
+    @Override
+    public QueryResult<T> orderAsc(String attribute) {
+        return orderAsc(attribute, true);
+    }
+
+    @Override
+    public QueryResult<T> orderAsc(String attribute, boolean appendEntityName) {
+        context.addCriteriaBuilderPostProcessor(new OrderByCriteriaBuilderPostProcessor(attribute, OrderDirection.ASC));
+        return this;
+    }
+
+    @Override
+    public <X> QueryResult<T> orderDesc(SingularAttribute<T, X> attribute) {
+        return orderDesc(attribute, true);
+    }
+
+    @Override
+    public <X> QueryResult<T> orderDesc(SingularAttribute<T, X> attribute, boolean appendEntityName) {
+        context.addCriteriaBuilderPostProcessor(new OrderByCriteriaBuilderPostProcessor(attribute, OrderDirection.DESC));
+        return this;
+    }
+
+    @Override
+    public QueryResult<T> orderDesc(String attribute) {
+        return orderDesc(attribute, true);
+    }
+
+    @Override
+    public QueryResult<T> orderDesc(String attribute, boolean appendEntityName) {
+        context.addCriteriaBuilderPostProcessor(new OrderByCriteriaBuilderPostProcessor(attribute, OrderDirection.DESC));
+        return this;
+    }
+
+    @Override
+    public <X> QueryResult<T> changeOrder(final SingularAttribute<T, X> attribute) {
+        changeOrder(new EntityViewDefaultQueryResult.ChangeOrder() {
+            @Override
+            public boolean matches(OrderByCriteriaBuilderPostProcessor orderBy) {
+                return orderBy.matches(attribute);
+            }
+
+            @Override
+            public void addDefault() {
+                orderAsc(attribute);
+            }
+        });
+        return this;
+    }
+
+    @Override
+    public QueryResult<T> changeOrder(final String attribute) {
+        changeOrder(new EntityViewDefaultQueryResult.ChangeOrder() {
+            @Override
+            public boolean matches(OrderByCriteriaBuilderPostProcessor orderBy) {
+                return orderBy.matches(attribute);
+            }
+
+            @Override
+            public void addDefault() {
+                orderAsc(attribute);
+            }
+        });
+        return this;
+    }
+
+    @Override
+    public QueryResult<T> clearOrder() {
+        for (Iterator<CriteriaBuilderPostProcessor> it = context.getCriteriaBuilderPostProcessors().iterator(); it.hasNext(); ) {
+            if (it.next() instanceof OrderByCriteriaBuilderPostProcessor) {
+                it.remove();
+            }
+        }
+        return this;
+    }
+
+    @Override
+    public QueryResult<T> maxResults(int max) {
+        maxResults = max;
+        pageSize = max;
+        return this;
+    }
+
+    @Override
+    public QueryResult<T> firstResult(int first) {
+        firstResult = first;
+        return this;
+    }
+
+    private void updatePaginationPostProcessor() {
+        clearPagination();
+        if (isFirstResultSet() || isMaxResultsSet()) {
+            context.addCriteriaBuilderPostProcessor(new PaginationCriteriaBuilderPostProcessor(firstResult, maxResults < 0 ? Integer.MAX_VALUE : maxResults));
+        }
+    }
+
+    private void clearPagination() {
+        Iterator<CriteriaBuilderPostProcessor> iterator = context.getCriteriaBuilderPostProcessors().iterator();
+        while (iterator.hasNext()) {
+            if (iterator.next() instanceof PaginationCriteriaBuilderPostProcessor) {
+                iterator.remove();
+            }
+        }
+    }
+
+    private boolean isFirstResultSet() {
+        return firstResult > 0;
+    }
+
+    private boolean isMaxResultsSet() {
+        return maxResults >= 0;
+    }
+
+    @Override
+    public QueryResult<T> lockMode(LockModeType lockMode) {
+        context.addJpaQueryPostProcessor(new LockModePostProcessor(lockMode));
+        return this;
+    }
+
+    @Override
+    public QueryResult<T> flushMode(FlushModeType flushMode) {
+        context.addJpaQueryPostProcessor(new FlushModePostProcessor(flushMode));
+        return this;
+    }
+
+    @Override
+    public QueryResult<T> hint(String hint, Object value) {
+        context.addJpaQueryPostProcessor(new HintPostProcessor(hint, value));
+        return this;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<T> getResultList() {
+        updatePaginationPostProcessor();
+        return ((Query) builder.executeQuery(context)).getResultList();
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public T getSingleResult() {
+        updatePaginationPostProcessor();
+        return (T) ((Query) builder.executeQuery(context)).getSingleResult();
+    }
+
+    @Override
+    public T getOptionalResult() {
+        try {
+            return getSingleResult();
+        } catch (NoResultException e) {
+            return null;
+        }
+    }
+
+    @Override
+    public T getAnyResult() {
+        List<T> queryResult = getResultList();
+        return !queryResult.isEmpty() ? queryResult.get(0) : null;
+    }
+
+    @Override
+    public long count() {
+        throw new UnsupportedOperationException("Count rewrite not supported for entity view repositories");
+    }
+
+    @Override
+    public QueryResult<T> withPageSize(int pageSize) {
+        return maxResults(pageSize);
+    }
+
+    @Override
+    public QueryResult<T> toPage(int page) {
+        this.page = page;
+        return firstResult(pageSize * page);
+    }
+
+    @Override
+    public QueryResult<T> nextPage() {
+        page = page + 1;
+        return firstResult(pageSize * page);
+    }
+
+    @Override
+    public QueryResult<T> previousPage() {
+        page = page > 0 ? page - 1 : page;
+        return firstResult(pageSize * page);
+    }
+
+    @Override
+    public int countPages() {
+        return (int) Math.ceil((double) count() / pageSize);
+    }
+
+    @Override
+    public int currentPage() {
+        return page;
+    }
+
+    @Override
+    public int pageSize() {
+        return pageSize;
+    }
+
+    private <X> QueryResult<T> changeOrder(EntityViewDefaultQueryResult.ChangeOrder changeOrder) {
+        for (CriteriaBuilderPostProcessor processor : context.getCriteriaBuilderPostProcessors()) {
+            if (processor instanceof OrderByCriteriaBuilderPostProcessor) {
+                OrderByCriteriaBuilderPostProcessor orderBy = (OrderByCriteriaBuilderPostProcessor) processor;
+                if (changeOrder.matches(orderBy)) {
+                    orderBy.changeDirection();
+                    return this;
+                }
+            }
+        }
+        changeOrder.addDefault();
+        return this;
+    }
+
+    /**
+     * @author Moritz Becker
+     * @since 1.2.0
+     */
+    private abstract static class ChangeOrder {
+
+        public abstract boolean matches(OrderByCriteriaBuilderPostProcessor orderBy);
+
+        public abstract void addDefault();
+
+    }
+
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/criteria/QueryCriteria.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/criteria/QueryCriteria.java
new file mode 100644
index 0000000000..3567e3da49
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/criteria/QueryCriteria.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.criteria;
+
+import com.blazebit.persistence.CriteriaBuilderFactory;
+import com.blazebit.persistence.criteria.BlazeCriteriaBuilder;
+import com.blazebit.persistence.criteria.BlazeCriteriaQuery;
+import com.blazebit.persistence.criteria.impl.BlazeCriteria;
+import com.blazebit.persistence.view.EntityViewManager;
+import com.blazebit.persistence.view.EntityViewSetting;
+import org.apache.deltaspike.data.api.criteria.Criteria;
+import org.apache.deltaspike.data.api.criteria.QuerySelection;
+import org.apache.deltaspike.data.impl.criteria.predicate.PredicateBuilder;
+import org.apache.deltaspike.data.impl.criteria.processor.QueryProcessor;
+
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.criteria.QueryCriteria} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public class QueryCriteria<C, R> extends org.apache.deltaspike.data.impl.criteria.QueryCriteria<C, R> {
+
+    private static final Logger LOG = Logger.getLogger(QueryCriteria.class.getName());
+
+    private boolean entityViewCriteria;
+    private final Class<C> entityClass;
+    private final EntityManager entityManager;
+    private final Class<R> resultClass;
+    private final CriteriaBuilderFactory criteriaBuilderFactory;
+    private final EntityViewManager entityViewManager;
+
+    public QueryCriteria(Class<C> entityClass, Class<R> resultClass, EntityManager entityManager, CriteriaBuilderFactory criteriaBuilderFactory, EntityViewManager entityViewManager) {
+        this(entityClass, resultClass, entityManager, null, criteriaBuilderFactory, entityViewManager);
+    }
+
+    public QueryCriteria(Class<C> entityClass, Class<R> resultClass, EntityManager entityManager, JoinType joinType, CriteriaBuilderFactory criteriaBuilderFactory, EntityViewManager entityViewManager) {
+        super(entityClass, resultClass, entityManager, joinType);
+        this.entityClass = entityClass;
+        this.resultClass = resultClass;
+        this.entityManager = entityManager;
+        this.criteriaBuilderFactory = criteriaBuilderFactory;
+        this.entityViewManager = entityViewManager;
+        this.entityViewCriteria = entityViewManager.getMetamodel().managedView(resultClass) != null;
+    }
+
+    @Override
+    public TypedQuery<R> createQuery() {
+        if (entityViewCriteria) {
+            try {
+                BlazeCriteriaBuilder builder = BlazeCriteria.get(entityManager, criteriaBuilderFactory);
+                BlazeCriteriaQuery<C> query = builder.createQuery(entityClass);
+                From<C, C> root = query.from(entityClass);
+                List<Predicate> predicates = predicates(builder, root);
+                query.distinct(isDistinct());
+                if (!predicates.isEmpty()) {
+                    query.where(predicates.toArray(new Predicate[predicates.size()]));
+                }
+                applyProcessors(query, builder, root);
+                return entityViewManager.applySetting(EntityViewSetting.create(resultClass), query.createCriteriaBuilder()).getQuery();
+            } catch (RuntimeException e) {
+                LOG.log(Level.SEVERE, "Exception while creating JPA query", e);
+                throw e;
+            }
+        } else {
+            return super.createQuery();
+        }
+    }
+
+    private void applyProcessors(CriteriaQuery<?> query, CriteriaBuilder builder, From<C, C> from) {
+        try {
+            Method applyProcessorsMethod = org.apache.deltaspike.data.impl.criteria.QueryCriteria.class.getDeclaredMethod("applyProcessors", CriteriaQuery.class, CriteriaBuilder.class, From.class);
+            applyProcessorsMethod.setAccessible(true);
+            applyProcessorsMethod.invoke(this, query, builder, from);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private boolean isDistinct() {
+        try {
+            Field distinctField = org.apache.deltaspike.data.impl.criteria.QueryCriteria.class.getDeclaredField("distinct");
+            distinctField.setAccessible(true);
+            return distinctField.getBoolean(this);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void setDistinct(boolean distinct) {
+        try {
+            Field distinctField = org.apache.deltaspike.data.impl.criteria.QueryCriteria.class.getDeclaredField("distinct");
+            distinctField.setAccessible(true);
+            distinctField.set(this, distinct);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private List<PredicateBuilder<C>> getBuilders() {
+        try {
+            Field distinctField = org.apache.deltaspike.data.impl.criteria.QueryCriteria.class.getDeclaredField("builders");
+            distinctField.setAccessible(true);
+            return (List<PredicateBuilder<C>>) distinctField.get(this);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void addBuilders(List<PredicateBuilder<C>> builders) {
+        getBuilders().addAll(builders);
+    }
+
+    private List<QueryProcessor<C>> getProcessors() {
+        try {
+            Field distinctField = org.apache.deltaspike.data.impl.criteria.QueryCriteria.class.getDeclaredField("processors");
+            distinctField.setAccessible(true);
+            return (List<QueryProcessor<C>>) distinctField.get(this);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void addProcessors(List<QueryProcessor<C>> processors) {
+        getProcessors().addAll(processors);
+    }
+
+    @Override
+    public <N> Criteria<C, N> select(Class<N> resultClass, QuerySelection<? super C, ?>... selection) {
+        if (entityViewManager.getMetamodel().managedView(resultClass) == null) {
+            return super.select(resultClass, selection);
+        } else {
+            if (selection.length == 0) {
+                QueryCriteria<C, N> result = new QueryCriteria<>(entityClass, resultClass, entityManager, criteriaBuilderFactory, entityViewManager);
+                result.addBuilders(getBuilders());
+                result.setDistinct(isDistinct());
+                result.addProcessors(getProcessors());
+                return result;
+            } else {
+                throw selectionNotSupported();
+            }
+        }
+    }
+
+    @Override
+    public Criteria<C, Object[]> select(QuerySelection<? super C, ?>... selection) {
+        if (entityViewCriteria) {
+            throw selectionNotSupported();
+        } else {
+            return super.select(selection);
+        }
+    }
+
+    private RuntimeException selectionNotSupported() {
+        return new UnsupportedOperationException("Selection not supported for entity view repositories");
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaBuilderPostProcessor.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaBuilderPostProcessor.java
new file mode 100644
index 0000000000..e49bbf7b1b
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaBuilderPostProcessor.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.handler;
+
+import com.blazebit.persistence.FullQueryBuilder;
+
+/**
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public interface CriteriaBuilderPostProcessor {
+
+    FullQueryBuilder<?, ?> postProcess(FullQueryBuilder<?, ?> queryString);
+}
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java
new file mode 100644
index 0000000000..f050706875
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.handler;
+
+import com.blazebit.persistence.CriteriaBuilderFactory;
+import com.blazebit.persistence.deltaspike.data.impl.criteria.QueryCriteria;
+import org.apache.deltaspike.data.api.criteria.Criteria;
+import org.apache.deltaspike.data.api.criteria.CriteriaSupport;
+import org.apache.deltaspike.data.api.criteria.QuerySelection;
+import org.apache.deltaspike.data.impl.criteria.selection.AttributeQuerySelection;
+import org.apache.deltaspike.data.impl.criteria.selection.numeric.Abs;
+import org.apache.deltaspike.data.impl.criteria.selection.numeric.Avg;
+import org.apache.deltaspike.data.impl.criteria.selection.numeric.Count;
+import org.apache.deltaspike.data.impl.criteria.selection.numeric.CountDistinct;
+import org.apache.deltaspike.data.impl.criteria.selection.numeric.Max;
+import org.apache.deltaspike.data.impl.criteria.selection.numeric.Min;
+import org.apache.deltaspike.data.impl.criteria.selection.numeric.Modulo;
+import org.apache.deltaspike.data.impl.criteria.selection.numeric.Neg;
+import org.apache.deltaspike.data.impl.criteria.selection.numeric.Sum;
+import org.apache.deltaspike.data.impl.criteria.selection.strings.Lower;
+import org.apache.deltaspike.data.impl.criteria.selection.strings.SubstringFrom;
+import org.apache.deltaspike.data.impl.criteria.selection.strings.SubstringFromTo;
+import org.apache.deltaspike.data.impl.criteria.selection.strings.Trim;
+import org.apache.deltaspike.data.impl.criteria.selection.strings.Upper;
+import org.apache.deltaspike.data.impl.criteria.selection.temporal.CurrentDate;
+import org.apache.deltaspike.data.impl.criteria.selection.temporal.CurrentTime;
+import org.apache.deltaspike.data.impl.criteria.selection.temporal.CurrentTimestamp;
+
+import javax.enterprise.context.Dependent;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.metamodel.SingularAttribute;
+import java.sql.Date;
+import java.sql.Time;
+import java.sql.Timestamp;
+
+/**
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+@Dependent
+public class CriteriaSupportHandler<E> implements CriteriaSupport<E>, EntityViewDelegateQueryHandler {
+
+    @Inject
+    @EntityViewContext
+    private EntityViewCdiQueryInvocationContext context;
+    @Inject
+    private CriteriaBuilderFactory criteriaBuilderFactory;
+
+    @SuppressWarnings("unchecked")
+    private Class<E> getEntityClass() {
+        return (Class<E>) context.getEntityClass();
+    }
+
+    private EntityManager getEntityManager() {
+        return context.getEntityManager();
+    }
+
+    @Override
+    public Criteria<E, E> criteria() {
+        return new QueryCriteria<E, E>(getEntityClass(), getEntityClass(), getEntityManager(), criteriaBuilderFactory, context.getEntityViewManager());
+    }
+
+    @Override
+    public <T> Criteria<T, T> where(Class<T> clazz) {
+        return new QueryCriteria<T, T>(clazz, clazz, getEntityManager(), criteriaBuilderFactory, context.getEntityViewManager());
+    }
+
+    @Override
+    public <T> Criteria<T, T> where(Class<T> clazz, JoinType joinType) {
+        return new QueryCriteria<T, T>(clazz, clazz, getEntityManager(), joinType, criteriaBuilderFactory, context.getEntityViewManager());
+    }
+
+    // The rest of this class is copied from org.apache.deltaspike.data.impl.handler.CriteriaSupportHandler
+
+    @Override
+    public <X> QuerySelection<E, X> attribute(SingularAttribute<? super E, X> attribute) {
+        return new AttributeQuerySelection<E, X>(attribute);
+    }
+
+    // ----------------------------------------------------------------------------
+    // NUMERIC QUERY SELECTION
+    // ----------------------------------------------------------------------------
+
+    @Override
+    public <N extends Number> QuerySelection<E, N> abs(SingularAttribute<? super E, N> attribute) {
+        return new Abs<E, N>(attribute);
+    }
+
+    @Override
+    public <N extends Number> QuerySelection<E, N> avg(SingularAttribute<? super E, N> attribute) {
+        return new Avg<E, N>(attribute);
+    }
+
+    @Override
+    public QuerySelection<E, Long> count(SingularAttribute<? super E, ?> attribute) {
+        return new Count<E>(attribute);
+    }
+
+    @Override
+    public QuerySelection<E, Long> countDistinct(SingularAttribute<? super E, ?> attribute) {
+        return new CountDistinct<E>(attribute);
+    }
+
+    @Override
+    public <N extends Number> QuerySelection<E, N> max(SingularAttribute<? super E, N> attribute) {
+        return new Max<E, N>(attribute);
+    }
+
+    @Override
+    public <N extends Number> QuerySelection<E, N> min(SingularAttribute<? super E, N> attribute) {
+        return new Min<E, N>(attribute);
+    }
+
+    @Override
+    public <N extends Number> QuerySelection<E, N> neg(SingularAttribute<? super E, N> attribute) {
+        return new Neg<E, N>(attribute);
+    }
+
+    @Override
+    public <N extends Number> QuerySelection<E, N> sum(SingularAttribute<? super E, N> attribute) {
+        return new Sum<E, N>(attribute);
+    }
+
+    @Override
+    public QuerySelection<E, Integer> modulo(SingularAttribute<? super E, Integer> attribute, Integer modulo) {
+        return new Modulo<E>(attribute, modulo);
+    }
+
+    // ----------------------------------------------------------------------------
+    // STRING QUERY SELECTION
+    // ----------------------------------------------------------------------------
+
+    @Override
+    public QuerySelection<E, String> upper(SingularAttribute<? super E, String> attribute) {
+        return new Upper<E>(attribute);
+    }
+
+    @Override
+    public QuerySelection<E, String> lower(SingularAttribute<? super E, String> attribute) {
+        return new Lower<E>(attribute);
+    }
+
+    @Override
+    public QuerySelection<E, String> substring(SingularAttribute<? super E, String> attribute, int from) {
+        return new SubstringFrom<E>(attribute, from);
+    }
+
+    @Override
+    public QuerySelection<E, String> substring(SingularAttribute<? super E, String> attribute, int from, int length) {
+        return new SubstringFromTo<E>(attribute, from, length);
+    }
+
+    @Override
+    public QuerySelection<E, String> trim(SingularAttribute<? super E, String> attribute) {
+        return new Trim<E>(attribute);
+    }
+
+    @Override
+    public QuerySelection<E, String> trim(CriteriaBuilder.Trimspec trimspec,
+                                          SingularAttribute<? super E, String> attribute) {
+        return new Trim<E>(trimspec, attribute);
+    }
+
+    // ----------------------------------------------------------------------------
+    // TEMPORAL QUERY SELECTION
+    // ----------------------------------------------------------------------------
+
+    @Override
+    public QuerySelection<E, Date> currDate() {
+        return new CurrentDate<E>();
+    }
+
+    @Override
+    public QuerySelection<E, Time> currTime() {
+        return new CurrentTime<E>();
+    }
+
+    @Override
+    public QuerySelection<E, Timestamp> currTStamp() {
+        return new CurrentTimestamp<E>();
+    }
+}
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java
new file mode 100644
index 0000000000..a71f5f6d10
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.handler;
+
+import com.blazebit.persistence.CriteriaBuilderFactory;
+import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewAwareQueryBuilderFactory;
+import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilder;
+import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewAwareRepositoryMetadata;
+import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewAwareRepositoryMethodMetadata;
+import org.apache.deltaspike.data.api.QueryInvocationException;
+import org.apache.deltaspike.data.api.Repository;
+import org.apache.deltaspike.data.impl.builder.QueryBuilder;
+import org.apache.deltaspike.data.impl.builder.QueryBuilderFactory;
+import org.apache.deltaspike.data.impl.handler.CdiQueryContextHolder;
+import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
+import org.apache.deltaspike.data.impl.handler.QueryHandler;
+import org.apache.deltaspike.data.impl.handler.QueryRunner;
+import org.apache.deltaspike.data.impl.meta.RepositoryMetadata;
+import org.apache.deltaspike.data.impl.meta.RepositoryMethodMetadata;
+import org.apache.deltaspike.jpa.impl.entitymanager.EntityManagerRef;
+import org.apache.deltaspike.jpa.impl.entitymanager.EntityManagerRefLookup;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Specializes;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceException;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Implementation is similar to {@link QueryHandler} but was modified to
+ * work with entity views.
+ *
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+@Repository
+@Specializes
+@ApplicationScoped
+public class EntityViewAwareQueryHandler extends QueryHandler {
+    private static final Logger LOG = Logger.getLogger(QueryHandler.class.getName());
+
+    @Inject
+    private QueryBuilderFactory queryBuilderFactory;
+    @Inject
+    private EntityViewAwareQueryBuilderFactory entityViewAwareQueryBuilderFactory;
+    @Inject
+    private EntityManagerRefLookup entityManagerRefLookup;
+    @Inject
+    private EntityViewQueryRunner entityViewQueryRunner;
+    @Inject
+    private QueryRunner runner;
+    @Inject
+    private EntityViewCdiQueryInvocationContextHolder entityViewCdiQueryInvocationContextHolder;
+    @Inject
+    private CdiQueryContextHolder context;
+    @Inject
+    private CriteriaBuilderFactory criteriaBuilderFactory;
+    @Inject
+    private EntityViewManagerRefLookup entityViewManagerRefLookup;
+
+    @Override
+    protected Object process(Object proxy, Method method, Object[] args, RepositoryMetadata repositoryMetadata, RepositoryMethodMetadata repositoryMethodMetadata) throws Throwable {
+        CdiQueryInvocationContext queryContext = null;
+        EntityManagerRef entityManagerRef = null;
+        EntityViewManagerRef entityViewManagerRef = null;
+        try {
+            entityManagerRef = entityManagerRefLookup.lookupReference(repositoryMetadata);
+            EntityManager entityManager = entityManagerRef.getEntityManager();
+            if (entityManager == null) {
+                throw new IllegalStateException("Unable to look up EntityManager");
+            }
+            if (repositoryMethodMetadata instanceof EntityViewAwareRepositoryMethodMetadata) {
+                EntityViewAwareRepositoryMetadata entityViewAwareRepositoryMetadata = (EntityViewAwareRepositoryMetadata) repositoryMetadata;
+                EntityViewAwareRepositoryMethodMetadata entityViewAwareRepositoryMethodMetadata = (EntityViewAwareRepositoryMethodMetadata) repositoryMethodMetadata;
+                entityViewManagerRef = entityViewManagerRefLookup.lookupReference(entityViewAwareRepositoryMetadata);
+                queryContext = new EntityViewCdiQueryInvocationContext(proxy, method, args,
+                        entityViewAwareRepositoryMetadata, entityViewAwareRepositoryMethodMetadata, entityManager,
+                        entityViewManagerRef.getEntityViewManager(), criteriaBuilderFactory);
+
+                entityViewCdiQueryInvocationContextHolder.set((EntityViewCdiQueryInvocationContext) queryContext);
+                queryContext.init();
+                EntityViewQueryBuilder builder = entityViewAwareQueryBuilderFactory.build(entityViewAwareRepositoryMethodMetadata, (EntityViewCdiQueryInvocationContext) queryContext);
+                return entityViewQueryRunner.executeQuery(builder, (EntityViewCdiQueryInvocationContext) queryContext);
+            } else {
+                queryContext = new CdiQueryInvocationContext(proxy, method, args,
+                        repositoryMetadata, repositoryMethodMetadata, entityManager);
+                context.set(queryContext);
+                queryContext.init();
+
+                QueryBuilder builder = queryBuilderFactory.build(repositoryMethodMetadata, queryContext);
+                return runner.executeQuery(builder, queryContext);
+            }
+        } catch (PersistenceException e) {
+            throw e;
+        } catch (Exception e) {
+            LOG.log(Level.FINEST, "Query execution error", e);
+            if (queryContext != null) {
+                throw new QueryInvocationException(e, queryContext);
+            }
+            throw new QueryInvocationException(e, proxy.getClass(), method);
+        } finally {
+            if (entityManagerRef != null) {
+                entityManagerRef.release();
+            }
+            if (entityViewManagerRef != null) {
+                entityViewManagerRef.release();
+            }
+            entityViewCdiQueryInvocationContextHolder.dispose();
+            context.dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java
new file mode 100644
index 0000000000..e8351f6988
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.handler;
+
+import com.blazebit.persistence.CriteriaBuilderFactory;
+import com.blazebit.persistence.FullQueryBuilder;
+import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewAwareRepositoryMetadata;
+import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewAwareRepositoryMethodMetadata;
+import com.blazebit.persistence.view.EntityViewManager;
+import org.apache.deltaspike.data.api.EntityGraph;
+import org.apache.deltaspike.data.impl.graph.EntityGraphHelper;
+import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
+
+import javax.persistence.EntityManager;
+import javax.persistence.LockModeType;
+import javax.persistence.Query;
+import javax.persistence.QueryHint;
+import java.lang.reflect.Method;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public class EntityViewCdiQueryInvocationContext extends CdiQueryInvocationContext {
+
+    private final EntityViewManager entityViewManager;
+    private final CriteriaBuilderFactory criteriaBuilderFactory;
+    private final Class<?> entityViewClass;
+    private final List<CriteriaBuilderPostProcessor> criteriaBuilderPostProcessors;
+
+    public EntityViewCdiQueryInvocationContext(Object proxy, Method method, Object[] args,
+                                               EntityViewAwareRepositoryMetadata repositoryMetadata, EntityViewAwareRepositoryMethodMetadata repositoryMethodMetadata,
+                                               EntityManager entityManager, EntityViewManager entityViewManager, CriteriaBuilderFactory criteriaBuilderFactory) {
+        super(proxy, method, args, repositoryMetadata, repositoryMethodMetadata, entityManager);
+        this.entityViewManager = entityViewManager;
+        this.criteriaBuilderFactory = criteriaBuilderFactory;
+        this.entityViewClass = repositoryMethodMetadata.getEntityViewClass();
+        this.criteriaBuilderPostProcessors = new LinkedList<>();
+    }
+
+    public EntityViewManager getEntityViewManager() {
+        return entityViewManager;
+    }
+
+    public CriteriaBuilderFactory getCriteriaBuilderFactory() {
+        return criteriaBuilderFactory;
+    }
+
+    public Class<?> getEntityViewClass() {
+        return entityViewClass;
+    }
+
+    public void addCriteriaBuilderPostProcessor(CriteriaBuilderPostProcessor postProcessor) {
+        criteriaBuilderPostProcessors.add(postProcessor);
+    }
+
+    public List<CriteriaBuilderPostProcessor> getCriteriaBuilderPostProcessors() {
+        return criteriaBuilderPostProcessors;
+    }
+
+    public boolean hasCriteriaBuilderPostProcessors() {
+        return !criteriaBuilderPostProcessors.isEmpty();
+    }
+
+    public FullQueryBuilder<?, ?> applyCriteriaBuilderPostProcessors(FullQueryBuilder<?, ?> criteriaBuilder) {
+        FullQueryBuilder<?, ?> fullCb = criteriaBuilder;
+        for (CriteriaBuilderPostProcessor processor : criteriaBuilderPostProcessors) {
+            fullCb = processor.postProcess(fullCb);
+        }
+        return fullCb;
+    }
+
+    @Override
+    public EntityViewAwareRepositoryMetadata getRepositoryMetadata() {
+        return (EntityViewAwareRepositoryMetadata) super.getRepositoryMetadata();
+    }
+
+    @Override
+    public EntityViewAwareRepositoryMethodMetadata getRepositoryMethodMetadata() {
+        return (EntityViewAwareRepositoryMethodMetadata) super.getRepositoryMethodMetadata();
+    }
+
+    @Override
+    public Query applyRestrictions(Query query) {
+        // Note that we skip setting the firstResult and maxResults here since we use the PaginatedCriteriaBuilder API
+        Method method = getMethod();
+
+        LockModeType lockMode = extractLockMode();
+        if (lockMode != null) {
+            query.setLockMode(lockMode);
+        }
+
+        QueryHint[] hints = extractQueryHints();
+        if (hints != null) {
+            for (QueryHint hint : hints) {
+                query.setHint(hint.name(), hint.value());
+            }
+        }
+
+        applyEntityGraph(query, method);
+        query = applyJpaQueryPostProcessors(query);
+        return query;
+    }
+
+    private LockModeType extractLockMode() {
+        org.apache.deltaspike.data.api.Query query = getRepositoryMethodMetadata().getQuery();
+        if (query != null && query.lock() != LockModeType.NONE) {
+            return query.lock();
+        }
+
+        return null;
+    }
+
+    private QueryHint[] extractQueryHints() {
+        org.apache.deltaspike.data.api.Query query = getRepositoryMethodMetadata().getQuery();
+        if (query != null && query.hints().length > 0) {
+            return query.hints();
+        }
+
+        return null;
+    }
+
+    private void applyEntityGraph(Query query, Method method) {
+        EntityGraph entityGraphAnn = method.getAnnotation(EntityGraph.class);
+        if (entityGraphAnn == null) {
+            return;
+        }
+
+        Object graph = EntityGraphHelper.getEntityGraph(getEntityManager(), getRepositoryMetadata().getEntityMetadata().getEntityClass(), entityGraphAnn);
+        query.setHint(entityGraphAnn.type().getHintName(), graph);
+    }
+
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java
new file mode 100644
index 0000000000..5cba4b12fe
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.handler;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+import java.util.Stack;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.handler.CdiQueryContextHolder} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+@ApplicationScoped
+public class EntityViewCdiQueryInvocationContextHolder {
+
+    private final ThreadLocal<Stack<EntityViewCdiQueryInvocationContext>> contextStack = new ThreadLocal<>();
+
+    public void set(EntityViewCdiQueryInvocationContext context) {
+        if (contextStack.get() == null) {
+            contextStack.set(new Stack<EntityViewCdiQueryInvocationContext>());
+        }
+        contextStack.get().push(context);
+    }
+
+    @Produces
+    @EntityViewContext
+    public EntityViewCdiQueryInvocationContext get() {
+        if (contextStack.get() != null && !contextStack.get().isEmpty()) {
+            return contextStack.get().peek();
+        }
+        return null;
+    }
+
+    public void dispose() {
+        if (contextStack.get() != null && !contextStack.get().isEmpty()) {
+            EntityViewCdiQueryInvocationContext ctx = contextStack.get().pop();
+            ctx.cleanup();
+        }
+        if (contextStack.get() != null && contextStack.get().isEmpty()) {
+            contextStack.remove();
+        }
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewContext.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewContext.java
new file mode 100644
index 0000000000..b93093733e
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewContext.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.handler;
+
+import javax.inject.Qualifier;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER})
+public @interface EntityViewContext {
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewDelegateQueryHandler.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewDelegateQueryHandler.java
new file mode 100644
index 0000000000..bacc39cea7
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewDelegateQueryHandler.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.handler;
+
+/**
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public interface EntityViewDelegateQueryHandler {
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRef.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRef.java
new file mode 100644
index 0000000000..45c01b90aa
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRef.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.handler;
+
+import com.blazebit.persistence.deltaspike.data.EntityViewManagerResolver;
+import com.blazebit.persistence.view.EntityViewManager;
+import org.apache.deltaspike.core.api.provider.DependentProvider;
+
+/**
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public class EntityViewManagerRef {
+    private EntityViewManager entityViewManager;
+    private DependentProvider<? extends EntityViewManager> entityViewManagerDependentProvider;
+
+    private Class<? extends EntityViewManagerResolver> entityViewManagerResolverClass;
+    private EntityViewManagerResolver entityViewManagerResolver;
+    private DependentProvider<? extends EntityViewManagerResolver> entityViewManagerResolverDependentProvider;
+
+    public void release() {
+        if (entityViewManagerDependentProvider != null) {
+            entityViewManagerDependentProvider.destroy();
+        }
+
+        if (entityViewManagerResolverDependentProvider != null) {
+            entityViewManagerResolverDependentProvider.destroy();
+        }
+    }
+
+    public Class<? extends EntityViewManagerResolver> getEntityViewManagerResolverClass() {
+        return entityViewManagerResolverClass;
+    }
+
+    public void setEntityViewManagerResolverClass(Class<? extends EntityViewManagerResolver> entityViewManagerResolverClass) {
+        this.entityViewManagerResolverClass = entityViewManagerResolverClass;
+    }
+
+    public DependentProvider<? extends EntityViewManagerResolver> getEntityViewManagerResolverDependentProvider() {
+        return entityViewManagerResolverDependentProvider;
+    }
+
+    public void setEntityViewManagerResolverDependentProvider(
+            DependentProvider<? extends EntityViewManagerResolver> entityViewManagerResolverDependentProvider) {
+        this.entityViewManagerResolverDependentProvider = entityViewManagerResolverDependentProvider;
+    }
+
+    public EntityViewManager getEntityViewManager() {
+        return entityViewManager;
+    }
+
+    public void setEntityViewManager(EntityViewManager entityViewManager) {
+        this.entityViewManager = entityViewManager;
+    }
+
+    public EntityViewManagerResolver getEntityViewManagerResolver() {
+        return entityViewManagerResolver;
+    }
+
+    public void setEntityViewManagerResolver(EntityViewManagerResolver entityViewManagerResolver) {
+        this.entityViewManagerResolver = entityViewManagerResolver;
+    }
+
+    public DependentProvider<? extends EntityViewManager> getEntityViewManagerDependentProvider() {
+        return entityViewManagerDependentProvider;
+    }
+
+    public void setEntityViewManagerDependentProvider(
+            DependentProvider<? extends EntityViewManager> entityViewManagerDependentProvider) {
+        this.entityViewManagerDependentProvider = entityViewManagerDependentProvider;
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java
new file mode 100644
index 0000000000..5e655ac184
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.handler;
+
+import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewAwareRepositoryMetadata;
+import com.blazebit.persistence.view.EntityViewManager;
+import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
+import org.apache.deltaspike.core.api.provider.BeanProvider;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import java.util.Set;
+
+/**
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+@ApplicationScoped
+public class EntityViewManagerRefLookup {
+    private volatile Boolean globalEntityViewManagerInitialized;
+    private boolean globalEntityViewManagerIsNormalScope;
+    private EntityViewManager globalEntityViewManager;
+
+    private void lazyInitGlobalEntityManager() {
+        if (this.globalEntityViewManagerInitialized == null) {
+            initGlobalEntityViewManager();
+        }
+    }
+
+    private synchronized void initGlobalEntityViewManager() {
+        // switch into paranoia mode
+        if (this.globalEntityViewManagerInitialized == null) {
+            this.globalEntityViewManagerInitialized = true;
+
+            BeanManager beanManager = BeanManagerProvider.getInstance().getBeanManager();
+            Set<Bean<?>> beans = beanManager.getBeans(EntityViewManager.class);
+            Bean<?> bean = beanManager.resolve(beans);
+
+            if (bean == null) {
+                throw new IllegalStateException("Could not find EntityViewManager with default qualifier.");
+            }
+
+            globalEntityViewManagerIsNormalScope = beanManager.isNormalScope(bean.getScope());
+            if (globalEntityViewManagerIsNormalScope) {
+                globalEntityViewManager = (EntityViewManager) beanManager.getReference(bean,
+                        EntityViewManager.class,
+                        beanManager.createCreationalContext(bean));
+            }
+        }
+    }
+
+    public EntityViewManagerRef lookupReference(final EntityViewAwareRepositoryMetadata repository) {
+        EntityViewManagerRef ref = new EntityViewManagerRef();
+
+        if (repository.hasEntityViewManagerResolver()) {
+            ref.setEntityViewManagerResolverClass(
+                    repository.getEntityViewManagerResolverClass());
+
+            if (repository.isEntityManagerResolverIsNormalScope()) {
+                ref.setEntityViewManagerResolver(
+                        BeanProvider.getContextualReference(ref.getEntityViewManagerResolverClass()));
+            } else {
+                ref.setEntityViewManagerResolverDependentProvider(
+                        BeanProvider.getDependent(ref.getEntityViewManagerResolverClass()));
+
+                ref.setEntityViewManagerResolver(
+                        ref.getEntityViewManagerResolverDependentProvider().get());
+            }
+
+            ref.setEntityViewManager(
+                    ref.getEntityViewManagerResolver().resolveEntityViewManager());
+        } else {
+            lazyInitGlobalEntityManager();
+            if (globalEntityViewManagerIsNormalScope) {
+                ref.setEntityViewManager(globalEntityViewManager);
+            } else {
+                ref.setEntityViewManagerDependentProvider(
+                        BeanProvider.getDependent(EntityViewManager.class));
+                ref.setEntityViewManager(
+                        ref.getEntityViewManagerDependentProvider().get());
+            }
+        }
+
+        return ref;
+    }
+}
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java
new file mode 100644
index 0000000000..1cfa375609
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.handler;
+
+import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilder;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.handler.QueryRunner} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public interface EntityViewQueryRunner {
+
+    Object executeQuery(EntityViewQueryBuilder builder, EntityViewCdiQueryInvocationContext context) throws Throwable;
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java
new file mode 100644
index 0000000000..2720af22da
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.handler;
+
+import com.blazebit.persistence.CriteriaBuilder;
+import com.blazebit.persistence.CriteriaBuilderFactory;
+import com.blazebit.persistence.PaginatedCriteriaBuilder;
+import com.blazebit.persistence.deltaspike.data.EntityViewRepository;
+import com.blazebit.persistence.parser.util.JpaMetamodelUtils;
+import com.blazebit.persistence.view.EntityViewSetting;
+import org.apache.deltaspike.data.impl.property.Property;
+import org.apache.deltaspike.data.impl.property.query.NamedPropertyCriteria;
+import org.apache.deltaspike.data.impl.property.query.PropertyQueries;
+
+import javax.inject.Inject;
+import javax.persistence.metamodel.EntityType;
+import javax.persistence.metamodel.SingularAttribute;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import static org.apache.deltaspike.core.util.ArraysUtils.isEmpty;
+
+/**
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public class EntityViewRepositoryHandler<E, V, PK extends Serializable>
+        implements EntityViewRepository<E, V, PK>, EntityViewDelegateQueryHandler {
+
+    @Inject
+    @EntityViewContext
+    private EntityViewCdiQueryInvocationContext context;
+
+    @Inject
+    private CriteriaBuilderFactory cbf;
+
+    @Override
+    public V findBy(PK pk) {
+        CriteriaBuilder<E> cb = createCriteriaBuilder().where(idAttribute()).eq(pk);
+
+        List<V> result;
+
+        if (context.getRepositoryMethodMetadata().getEntityViewClass() == null) {
+            result = (List<V>) cb.getResultList();
+        } else {
+            result = context.getEntityViewManager().applySetting(
+                    createSetting(),
+                    cb
+            ).getResultList();
+        }
+
+        return result.isEmpty() ? null : result.get(0);
+    }
+
+    @Override
+    public List<V> findAll() {
+        if (context.getRepositoryMethodMetadata().getEntityViewClass() == null) {
+            return (List<V>) createCriteriaBuilder().getResultList();
+        } else {
+            return context.getEntityViewManager().applySetting(
+                    createSetting(),
+                    createCriteriaBuilder()
+            ).getResultList();
+        }
+    }
+
+    @Override
+    public List<V> findAll(int start, int max) {
+        if (context.getRepositoryMethodMetadata().getEntityViewClass() == null) {
+            return (List<V>) createCriteriaBuilder()
+                    .page(start, max)
+                    .orderByAsc(idAttribute())
+                    .getResultList();
+        } else {
+            EntityViewSetting<V, PaginatedCriteriaBuilder<V>> setting = EntityViewSetting.create(viewClass(), start, max);
+            return context.getEntityViewManager().applySetting(setting, createCriteriaBuilder())
+                    .orderByAsc(idAttribute())
+                    .getResultList();
+        }
+    }
+
+    @Override
+    public List<V> findBy(E e, SingularAttribute<E, ?>... singularAttributes) {
+        return executeExampleQuery(e, 0, 0, false, singularAttributes);
+    }
+
+    @Override
+    public List<V> findBy(E e, int start, int max, SingularAttribute<E, ?>... singularAttributes) {
+        return executeExampleQuery(e, start, max, false, singularAttributes);
+    }
+
+    @Override
+    public List<V> findByLike(E e, SingularAttribute<E, ?>... singularAttributes) {
+        return executeExampleQuery(e, 0, 0, true, singularAttributes);
+    }
+
+    @Override
+    public List<V> findByLike(E e, int start, int max, SingularAttribute<E, ?>... singularAttributes) {
+        return executeExampleQuery(e, start, max, true, singularAttributes);
+    }
+
+    private CriteriaBuilder<E> createCriteriaBuilder() {
+        return cbf.create(context.getEntityManager(), entityClass());
+    }
+
+    private Class<V> viewClass() {
+        return (Class<V>) context.getEntityViewClass();
+    }
+
+    private Class<E> entityClass() {
+        return (Class<E>) context.getEntityClass();
+    }
+
+    private EntityViewSetting<V, CriteriaBuilder<V>> createSetting() {
+        return EntityViewSetting.create((Class<V>) context.getRepositoryMethodMetadata().getEntityViewClass());
+    }
+
+    private List<String> extractPropertyNames(SingularAttribute<E, ?>... attributes) {
+        List<String> result = new ArrayList<String>(attributes.length);
+        for (SingularAttribute<E, ?> attribute : attributes) {
+            result.add(attribute.getName());
+        }
+        return result;
+    }
+
+    private List<Property<Object>> extractProperties(SingularAttribute<E, ?>... attributes) {
+        List<String> names = extractPropertyNames(attributes);
+        List<Property<Object>> properties = PropertyQueries.createQuery(context.getEntityClass())
+                .addCriteria(new NamedPropertyCriteria(names.toArray(new String[]{}))).getResultList();
+        return properties;
+    }
+
+    private void prepareWhere(CriteriaBuilder<?> cb, E example, List<Property<Object>> properties, boolean useLikeOperator) {
+        Iterator<Property<Object>> iterator = properties.iterator();
+        while (iterator.hasNext()) {
+            Property<Object> property = iterator.next();
+            String name = property.getName();
+            if (useLikeOperator && property.getJavaClass().getName().equals(String.class.getName())) {
+                cb.where(name).like(false).value(property.getValue(example)).noEscape();
+            } else {
+                cb.where(name).eq(property.getValue(example));
+            }
+        }
+    }
+
+    private List<V> executeExampleQuery(E example, int start, int max, boolean useLikeOperator,
+                                        SingularAttribute<E, ?>... attributes) {
+        if (isEmpty(attributes)) {
+            return findAll();
+        }
+
+        CriteriaBuilder<?> cb = createCriteriaBuilder();
+        List<Property<Object>> properties = extractProperties(attributes);
+        prepareWhere(cb, example, properties, useLikeOperator);
+
+        if (context.getRepositoryMethodMetadata().getEntityViewClass() == null) {
+            return (List<V>) cb.getResultList();
+        } else {
+            EntityViewSetting<V, ?> setting;
+            if (start > 0 || max > 0) {
+                setting = EntityViewSetting.create(viewClass(), start, max);
+            } else {
+                setting = EntityViewSetting.create(viewClass());
+            }
+
+            return context.getEntityViewManager().applySetting(setting, cb)
+                    .orderByAsc(idAttribute())
+                    .getResultList();
+        }
+    }
+
+    private String idAttribute() {
+        Class<?> entityClass = context.getEntityViewManager().getMetamodel().view(viewClass()).getEntityClass();
+        EntityType<?> entityType = context.getEntityManager().getMetamodel().entity(entityClass);
+        return JpaMetamodelUtils.getIdAttribute(entityType).getName();
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java
new file mode 100644
index 0000000000..9a41ee5fac
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.handler;
+
+import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilder;
+import com.blazebit.persistence.deltaspike.data.impl.tx.EntityViewInvocationContextWrapper;
+import org.apache.deltaspike.jpa.spi.entitymanager.ActiveEntityManagerHolder;
+import org.apache.deltaspike.jpa.spi.transaction.TransactionStrategy;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.tx.TransactionalQueryRunner} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+@ApplicationScoped
+public class TransactionalEntityViewQueryRunner implements EntityViewQueryRunner {
+
+    @Inject
+    private TransactionStrategy strategy;
+
+    @Inject
+    private ActiveEntityManagerHolder activeEntityManagerHolder;
+
+    @Override
+    public Object executeQuery(final EntityViewQueryBuilder builder, final EntityViewCdiQueryInvocationContext context)
+            throws Throwable {
+        if (context.getRepositoryMethodMetadata().isRequiresTransaction()) {
+            try {
+                activeEntityManagerHolder.set(context.getEntityManager());
+                return executeTransactional(builder, context);
+            } finally {
+                activeEntityManagerHolder.dispose();
+            }
+        }
+        return executeNonTransactional(builder, context);
+    }
+
+    protected Object executeNonTransactional(final EntityViewQueryBuilder builder, final EntityViewCdiQueryInvocationContext context) {
+        return builder.executeQuery(context);
+    }
+
+    protected Object executeTransactional(final EntityViewQueryBuilder builder, final EntityViewCdiQueryInvocationContext context)
+            throws Exception {
+        return strategy.execute(new EntityViewInvocationContextWrapper(context) {
+            @Override
+            public Object proceed() throws Exception {
+                return builder.executeQuery(context);
+            }
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadata.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadata.java
new file mode 100644
index 0000000000..dcbbf6999d
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadata.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.meta;
+
+import com.blazebit.persistence.deltaspike.data.EntityViewManagerResolver;
+import org.apache.deltaspike.data.impl.meta.EntityMetadata;
+import org.apache.deltaspike.data.impl.meta.RepositoryMetadata;
+
+/**
+ * Implementation is similar to {@link RepositoryMetadata} but was modified to
+ * work with entity views.
+ *
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class EntityViewAwareRepositoryMetadata extends RepositoryMetadata {
+
+    private Class<? extends EntityViewManagerResolver> entityViewManagerResolver;
+
+    public EntityViewAwareRepositoryMetadata(Class<?> repositoryClass) {
+        super(repositoryClass);
+    }
+
+    public EntityViewAwareRepositoryMetadata(Class<?> repositoryClass, EntityMetadata entityMetadata) {
+        super(repositoryClass, entityMetadata);
+    }
+
+    public boolean hasEntityViewManagerResolver() {
+        return getEntityViewManagerResolverClass() != null;
+    }
+
+    public Class<? extends EntityViewManagerResolver> getEntityViewManagerResolverClass() {
+        return entityViewManagerResolver;
+    }
+
+    public void setEntityViewManagerResolver(Class<? extends EntityViewManagerResolver> entityViewManagerResolver) {
+        this.entityViewManagerResolver = entityViewManagerResolver;
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadataInitializer.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadataInitializer.java
new file mode 100644
index 0000000000..bb99127c90
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadataInitializer.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.meta;
+
+import com.blazebit.persistence.deltaspike.data.EntityViewManagerConfig;
+import com.blazebit.persistence.deltaspike.data.EntityViewManagerResolver;
+import org.apache.deltaspike.data.api.EntityManagerConfig;
+import org.apache.deltaspike.data.impl.meta.EntityMetadataInitializer;
+import org.apache.deltaspike.data.impl.meta.RepositoryMetadata;
+import org.apache.deltaspike.data.impl.meta.RepositoryMetadataInitializer;
+import org.apache.deltaspike.data.impl.meta.RepositoryMethodMetadata;
+import org.apache.deltaspike.data.impl.meta.RepositoryMethodMetadataInitializer;
+import org.apache.deltaspike.jpa.api.entitymanager.EntityManagerResolver;
+import org.apache.deltaspike.jpa.spi.entitymanager.QualifierBackedEntityManagerResolver;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Specializes;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.persistence.FlushModeType;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Implementation is similar to {@link RepositoryMetadataInitializer} but was modified to
+ * work with entity views.
+ *
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+@Specializes
+@ApplicationScoped
+public class EntityViewAwareRepositoryMetadataInitializer extends RepositoryMetadataInitializer {
+
+    private static final Logger LOG = Logger.getLogger(RepositoryMetadataInitializer.class.getName());
+
+    @Inject
+    private RepositoryMethodMetadataInitializer methodMetadataInitializer;
+
+    @Inject
+    private EntityMetadataInitializer entityMetadataInitializer;
+
+    public RepositoryMetadata init(Class<?> repositoryClass, BeanManager beanManager) {
+        EntityViewAwareRepositoryMetadata repositoryMetadata = new EntityViewAwareRepositoryMetadata(repositoryClass);
+        repositoryMetadata.setEntityViewManagerResolver(extractEntityViewManagerResolver(repositoryClass));
+        // read from looks for JPA Transactional and EntityManagerConfig to determine attributes
+        // if those are set, don't process old annotations
+        if (!repositoryMetadata.readFrom(repositoryClass, beanManager)) {
+            repositoryMetadata.setEntityManagerResolverClass(extractEntityManagerResolver(repositoryClass));
+            repositoryMetadata.setEntityManagerFlushMode(extractEntityManagerFlushMode(repositoryClass));
+
+            if (repositoryMetadata.getEntityManagerResolverClass() != null) {
+                Set<Bean<?>> beans = beanManager.getBeans(repositoryMetadata.getEntityManagerResolverClass());
+                Class<? extends Annotation> scope = beanManager.resolve(beans).getScope();
+                repositoryMetadata.setEntityManagerResolverIsNormalScope(beanManager.isNormalScope(scope));
+            } else {
+                EntityManagerResolver resolver;
+                if (repositoryMetadata.getQualifiers() != null) {
+                    resolver = new QualifierBackedEntityManagerResolver(beanManager,
+                            repositoryMetadata.getQualifiers());
+                } else {
+                    resolver = new QualifierBackedEntityManagerResolver(beanManager, Default.class);
+                }
+                repositoryMetadata.setUnmanagedResolver(resolver);
+                repositoryMetadata.setEntityManagerResolverIsNormalScope(false);
+            }
+        }
+        repositoryMetadata.setEntityMetadata(entityMetadataInitializer.init(repositoryMetadata));
+        initializeMethodsMetadata(repositoryMetadata, beanManager);
+
+        return repositoryMetadata;
+    }
+
+    private void initializeMethodsMetadata(RepositoryMetadata repositoryMetadata, BeanManager beanManager) {
+        repositoryMetadata.setMethodsMetadata(new HashMap<Method, RepositoryMethodMetadata>());
+
+        Set<Class<?>> allImplemented = new HashSet<Class<?>>();
+        collectClasses(repositoryMetadata.getRepositoryClass(), allImplemented);
+        LOG.log(Level.FINER, "collectClasses(): Found {0} for {1}",
+                new Object[]{allImplemented, repositoryMetadata.getRepositoryClass()});
+
+        for (Class<?> implemented : allImplemented) {
+            Method[] repositoryMethods = implemented.getDeclaredMethods();
+            for (Method repositoryMethod : repositoryMethods) {
+                RepositoryMethodMetadata methodMetadata =
+                        methodMetadataInitializer.init(repositoryMetadata, repositoryMethod, beanManager);
+                repositoryMetadata.getMethodsMetadata().put(repositoryMethod, methodMetadata);
+            }
+        }
+    }
+
+    private void collectClasses(Class<?> cls, Set<Class<?>> result) {
+        if (cls == null || cls == Object.class) {
+            return;
+        }
+
+        result.add(cls);
+
+        for (Class<?> child : cls.getInterfaces()) {
+            collectClasses(child, result);
+        }
+
+        collectClasses(cls.getSuperclass(), result);
+    }
+
+    private Class<? extends EntityManagerResolver> extractEntityManagerResolver(Class<?> clazz) {
+        EntityManagerConfig config = extractEntityManagerConfig(clazz);
+        if (config != null && !EntityManagerResolver.class.equals(config.entityManagerResolver())) {
+            return config.entityManagerResolver();
+        }
+        return null;
+    }
+
+    private FlushModeType extractEntityManagerFlushMode(Class<?> clazz) {
+        EntityManagerConfig config = extractEntityManagerConfig(clazz);
+        if (config != null) {
+            return config.flushMode();
+        }
+        return null;
+    }
+
+    private EntityManagerConfig extractEntityManagerConfig(Class<?> clazz) {
+        if (clazz.isAnnotationPresent(EntityManagerConfig.class)) {
+            return clazz.getAnnotation(EntityManagerConfig.class);
+        }
+        return null;
+    }
+
+    private Class<? extends EntityViewManagerResolver> extractEntityViewManagerResolver(Class<?> clazz) {
+        EntityViewManagerConfig config = extractEntityViewManagerConfig(clazz);
+        if (config != null && !EntityViewManagerResolver.class.equals(config.entityViewManagerResolver())) {
+            return config.entityViewManagerResolver();
+        }
+        return null;
+    }
+
+    private EntityViewManagerConfig extractEntityViewManagerConfig(Class<?> clazz) {
+        if (clazz.isAnnotationPresent(EntityViewManagerConfig.class)) {
+            return clazz.getAnnotation(EntityViewManagerConfig.class);
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadata.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadata.java
new file mode 100644
index 0000000000..d609d79565
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadata.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.meta;
+
+import com.blazebit.persistence.deltaspike.data.impl.builder.part.EntityViewQueryRoot;
+import org.apache.deltaspike.data.impl.meta.RepositoryMethodMetadata;
+
+import java.lang.reflect.Method;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.meta.RepositoryMethodMetadata} but was modified to
+ * work with entity views.
+ *
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class EntityViewAwareRepositoryMethodMetadata extends RepositoryMethodMetadata {
+    private EntityViewQueryRoot entityViewQueryRoot;
+    private Class<?> entityViewClass;
+
+    public EntityViewAwareRepositoryMethodMetadata() {
+    }
+
+    public EntityViewAwareRepositoryMethodMetadata(Method method) {
+        super(method);
+    }
+
+    public EntityViewQueryRoot getEntityViewQueryRoot() {
+        return entityViewQueryRoot;
+    }
+
+    public void setEntityViewQueryRoot(EntityViewQueryRoot entityViewQueryRoot) {
+        this.entityViewQueryRoot = entityViewQueryRoot;
+    }
+
+    public Class<?> getEntityViewClass() {
+        return entityViewClass;
+    }
+
+    public void setEntityViewClass(Class<?> entityViewClass) {
+        this.entityViewClass = entityViewClass;
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadataInitializer.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadataInitializer.java
new file mode 100644
index 0000000000..8c337083c5
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadataInitializer.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.meta;
+
+import com.blazebit.persistence.deltaspike.data.EntityViewManagerResolver;
+import com.blazebit.persistence.deltaspike.data.impl.builder.part.EntityViewQueryRoot;
+import com.blazebit.persistence.view.EntityViewManager;
+import com.blazebit.persistence.view.metamodel.ManagedViewType;
+import com.blazebit.reflection.ReflectionUtils;
+import org.apache.deltaspike.core.util.AnnotationUtils;
+import org.apache.deltaspike.core.util.ClassUtils;
+import org.apache.deltaspike.core.util.OptionalUtil;
+import org.apache.deltaspike.core.util.StreamUtil;
+import org.apache.deltaspike.data.api.Modifying;
+import org.apache.deltaspike.data.api.Query;
+import org.apache.deltaspike.data.api.Repository;
+import org.apache.deltaspike.data.api.SingleResultType;
+import org.apache.deltaspike.data.api.mapping.MappingConfig;
+import org.apache.deltaspike.data.api.mapping.QueryInOutMapper;
+import org.apache.deltaspike.data.impl.builder.MethodExpressionException;
+import org.apache.deltaspike.data.impl.builder.part.QueryRoot;
+import org.apache.deltaspike.data.impl.builder.result.QueryProcessorFactory;
+import org.apache.deltaspike.data.impl.handler.EntityRepositoryHandler;
+import org.apache.deltaspike.data.impl.meta.RepositoryMetadata;
+import org.apache.deltaspike.data.impl.meta.RepositoryMethodMetadata;
+import org.apache.deltaspike.data.impl.meta.RepositoryMethodMetadataInitializer;
+import org.apache.deltaspike.data.impl.meta.RepositoryMethodPrefix;
+import org.apache.deltaspike.data.impl.meta.RepositoryMethodType;
+import org.apache.deltaspike.data.impl.meta.RequiresTransaction;
+import org.apache.deltaspike.jpa.api.transaction.Transactional;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Specializes;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.persistence.LockModeType;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Set;
+
+import static org.apache.deltaspike.core.util.StringUtils.isNotEmpty;
+
+/**
+ * Implementation is similar to {@link RepositoryMethodMetadataInitializer} but was modified to
+ * work with entity views.
+ *
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+@Specializes
+@ApplicationScoped
+public class EntityViewAwareRepositoryMethodMetadataInitializer extends RepositoryMethodMetadataInitializer {
+
+    @Inject
+    private QueryProcessorFactory queryProcessorFactory;
+
+    @Override
+    public EntityViewAwareRepositoryMethodMetadata init(RepositoryMetadata repositoryMetadata, Method method, BeanManager beanManager) {
+        EntityViewAwareRepositoryMetadata entityViewAwareRepositoryMetadata = (EntityViewAwareRepositoryMetadata) repositoryMetadata;
+        EntityViewManager evm;
+        if (entityViewAwareRepositoryMetadata.getEntityViewManagerResolverClass() != null) {
+            Bean<?> entityViewManagerResolverBean = beanManager.resolve(beanManager.getBeans(entityViewAwareRepositoryMetadata.getEntityViewManagerResolverClass()));
+            EntityViewManagerResolver resolver = (EntityViewManagerResolver) beanManager.getReference(entityViewManagerResolverBean, EntityViewManagerResolver.class, beanManager.createCreationalContext(entityViewManagerResolverBean));
+            evm = resolver.resolveEntityViewManager();
+        } else {
+            Bean<?> entityViewManagerBean = beanManager.resolve(beanManager.getBeans(EntityViewManager.class));
+            evm = (EntityViewManager) beanManager.getReference(entityViewManagerBean, EntityViewManager.class, beanManager.createCreationalContext(entityViewManagerBean));
+        }
+
+        EntityViewAwareRepositoryMethodMetadata repositoryMethodMetadata = new EntityViewAwareRepositoryMethodMetadata();
+
+        repositoryMethodMetadata.setMethod(method);
+
+        repositoryMethodMetadata.setReturnsOptional(OptionalUtil.isOptionalReturned(method));
+        repositoryMethodMetadata.setReturnsStream(StreamUtil.isStreamReturned(method));
+
+        repositoryMethodMetadata.setQuery(method.isAnnotationPresent(Query.class) ? method.getAnnotation(Query.class) : null);
+        repositoryMethodMetadata.setModifying(method.isAnnotationPresent(Modifying.class) ? method.getAnnotation(Modifying.class) : null);
+
+        repositoryMethodMetadata.setTransactional(AnnotationUtils.extractAnnotationFromMethodOrClass(beanManager, method, repositoryMetadata.getRepositoryClass(), Transactional.class));
+
+        repositoryMethodMetadata.setMethodPrefix(new RepositoryMethodPrefix(repositoryMetadata.getRepositoryClass().getAnnotation(Repository.class).methodPrefix(), method.getName()));
+        repositoryMethodMetadata.setMethodType(extractMethodType(repositoryMetadata, repositoryMethodMetadata));
+
+        repositoryMethodMetadata.setEntityViewClass(extractEntityViewClass((EntityViewAwareRepositoryMetadata) repositoryMetadata, method, evm));
+        repositoryMethodMetadata.setEntityViewQueryRoot(initEntityViewQueryRoot(entityViewAwareRepositoryMetadata, repositoryMethodMetadata));
+
+        repositoryMethodMetadata.setQueryProcessor(queryProcessorFactory.build(repositoryMethodMetadata));
+
+        repositoryMethodMetadata.setQueryInOutMapperClass(extractMapper(method, repositoryMetadata));
+
+        initQueryRoot(repositoryMetadata, repositoryMethodMetadata);
+        initQueryInOutMapperIsNormalScope(repositoryMetadata, repositoryMethodMetadata, beanManager);
+
+        initSingleResultType(repositoryMethodMetadata);
+        initRequiresTransaction(repositoryMethodMetadata);
+
+
+        return repositoryMethodMetadata;
+    }
+
+    private RepositoryMethodType extractMethodType(RepositoryMetadata repositoryMetadata, RepositoryMethodMetadata repositoryMethodMetadata) {
+        if (isAnnotated(repositoryMethodMetadata)) {
+            return RepositoryMethodType.ANNOTATED;
+        }
+
+        if (isMethodExpression(repositoryMetadata, repositoryMethodMetadata)) {
+            return RepositoryMethodType.PARSE;
+        }
+
+        return RepositoryMethodType.DELEGATE;
+    }
+
+    private void initQueryRoot(RepositoryMetadata repositoryMetadata, RepositoryMethodMetadata methodMetadata) {
+        if (methodMetadata.getMethodType() == RepositoryMethodType.PARSE) {
+            methodMetadata.setQueryRoot(QueryRoot.create(methodMetadata.getMethod().getName(), repositoryMetadata, methodMetadata.getMethodPrefix()));
+        } else {
+            methodMetadata.setQueryRoot(QueryRoot.UNKNOWN_ROOT);
+        }
+    }
+
+    public static Class<?> extractEntityViewClass(EntityViewAwareRepositoryMetadata repo, Method method, EntityViewManager evm) {
+        Class<?> returnType = ReflectionUtils.getResolvedMethodReturnType(repo.getRepositoryClass(), method);
+        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnType);
+
+        if (managedViewType != null) {
+            return managedViewType.getJavaType();
+        } else if (returnType.getTypeParameters().length > 0) {
+            Class<?> firstReturnTypeArgument = ReflectionUtils.getResolvedMethodReturnTypeArguments(repo.getRepositoryClass(), method)[0];
+            managedViewType = evm.getMetamodel().managedView(firstReturnTypeArgument);
+            if (managedViewType != null) {
+                return managedViewType.getJavaType();
+            }
+        }
+        return null;
+    }
+
+    private EntityViewQueryRoot initEntityViewQueryRoot(EntityViewAwareRepositoryMetadata repositoryMetadata, EntityViewAwareRepositoryMethodMetadata methodMetadata) {
+        if (methodMetadata.getMethodType() == RepositoryMethodType.PARSE) {
+            return EntityViewQueryRoot.create(methodMetadata.getMethod().getName(), repositoryMetadata, methodMetadata.getMethodPrefix());
+        }
+        return null;
+    }
+
+    private void initQueryInOutMapperIsNormalScope(RepositoryMetadata repositoryMetadata, RepositoryMethodMetadata repositoryMethodMetadata, BeanManager beanManager) {
+        if (repositoryMethodMetadata.getQueryInOutMapperClass() != null) {
+            Set<Bean<?>> beans = beanManager.getBeans(repositoryMethodMetadata.getQueryInOutMapperClass());
+            Class<? extends Annotation> scope = beanManager.resolve(beans).getScope();
+            repositoryMethodMetadata.setQueryInOutMapperIsNormalScope(beanManager.isNormalScope(scope));
+        }
+    }
+
+    private boolean isAnnotated(RepositoryMethodMetadata repositoryMethodMetadata) {
+        if (repositoryMethodMetadata.getQuery() != null) {
+            return isValid(repositoryMethodMetadata.getQuery());
+        }
+        return false;
+    }
+
+    private boolean isValid(Query query) {
+        return isNotEmpty(query.value()) || isNotEmpty(query.named());
+    }
+
+    private boolean isMethodExpression(RepositoryMetadata repositoryMetadata,
+                                       RepositoryMethodMetadata repositoryMethodMetadata) {
+        if (!Modifier.isAbstract(repositoryMethodMetadata.getMethod().getModifiers())) {
+            return false;
+        }
+
+        try {
+            QueryRoot.create(repositoryMethodMetadata.getMethod().getName(), repositoryMetadata, repositoryMethodMetadata.getMethodPrefix());
+            return true;
+        } catch (MethodExpressionException e) {
+            return false;
+        }
+    }
+
+    private Class<? extends QueryInOutMapper<?>> extractMapper(Method queryMethod, RepositoryMetadata repositoryMetadata) {
+        if (queryMethod.isAnnotationPresent(MappingConfig.class)) {
+            return queryMethod.getAnnotation(MappingConfig.class).value();
+        }
+
+        if (repositoryMetadata.getRepositoryClass().isAnnotationPresent(MappingConfig.class)) {
+            return repositoryMetadata.getRepositoryClass().getAnnotation(MappingConfig.class).value();
+        }
+
+        return null;
+    }
+
+    private void initSingleResultType(RepositoryMethodMetadata repositoryMethodMetadata) {
+        SingleResultType singleResultType = repositoryMethodMetadata.getQuery() != null
+                ? repositoryMethodMetadata.getQuery().singleResult()
+                : repositoryMethodMetadata.getMethodPrefix().getSingleResultStyle();
+
+        if (repositoryMethodMetadata.isReturnsOptional() && singleResultType == SingleResultType.JPA) {
+            repositoryMethodMetadata.setSingleResultType(SingleResultType.OPTIONAL);
+        } else {
+            repositoryMethodMetadata.setSingleResultType(singleResultType);
+        }
+    }
+
+    private void initRequiresTransaction(RepositoryMethodMetadata repositoryMethodMetadata) {
+        boolean requiresTransaction = false;
+
+        if (ClassUtils.containsMethod(EntityRepositoryHandler.class, repositoryMethodMetadata.getMethod())) {
+            Method originalMethod = ClassUtils.extractMethod(EntityRepositoryHandler.class, repositoryMethodMetadata.getMethod());
+            if (originalMethod.isAnnotationPresent(RequiresTransaction.class)) {
+                requiresTransaction = true;
+            }
+        }
+
+        Query query = repositoryMethodMetadata.getQuery();
+        Modifying modifying = repositoryMethodMetadata.getModifying();
+
+        if ((query != null && !query.lock().equals(LockModeType.NONE)) || modifying != null) {
+            requiresTransaction = true;
+        }
+
+        repositoryMethodMetadata.setRequiresTransaction(requiresTransaction);
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java
new file mode 100644
index 0000000000..72d1dfec63
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.deltaspike.data.impl.tx;
+
+import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
+import org.apache.deltaspike.core.util.interceptor.AbstractInvocationContext;
+
+/**
+ * Implementation is similar to {@link org.apache.deltaspike.data.impl.tx.InvocationContextWrapper} but was modified to
+ * work with entity views.
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public abstract class EntityViewInvocationContextWrapper extends AbstractInvocationContext<Object> {
+    public EntityViewInvocationContextWrapper(EntityViewCdiQueryInvocationContext context) {
+        super(context.getProxy(), context.getMethod(), context.getMethodParameters(), null);
+    }
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/resources/META-INF/apache-deltaspike.properties b/integration/deltaspike-data/impl-1.8/src/main/resources/META-INF/apache-deltaspike.properties
new file mode 100644
index 0000000000..c69d8b89ff
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/resources/META-INF/apache-deltaspike.properties
@@ -0,0 +1 @@
+org.apache.deltaspike.core.spi.activation.ClassDeactivator=com.blazebit.persistence.deltaspike.data.impl.DeltaspikeExtensionDeactivator
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/resources/META-INF/beans.xml b/integration/deltaspike-data/impl-1.8/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000000..4f7100b090
--- /dev/null
+++ b/integration/deltaspike-data/impl-1.8/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2014 - 2018 Blazebit.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<beans
+        xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+                      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+        bean-discovery-mode="all"
+        version="1.1">
+</beans>
\ No newline at end of file
diff --git a/integration/deltaspike-data/pom.xml b/integration/deltaspike-data/pom.xml
index 413c00f473..b1481a9a90 100644
--- a/integration/deltaspike-data/pom.xml
+++ b/integration/deltaspike-data/pom.xml
@@ -13,7 +13,8 @@
     <name>Blazebit Persistence Integration DeltaSpike Data</name>
     <modules>
         <module>api</module>
-        <module>impl</module>
+        <module>impl-1.7</module>
+        <module>impl-1.8</module>
         <module>testsuite</module>
     </modules>
 </project>
\ No newline at end of file
diff --git a/integration/deltaspike-data/testsuite/log4j.properties b/integration/deltaspike-data/testsuite/log4j.properties
new file mode 100644
index 0000000000..5445b470a8
--- /dev/null
+++ b/integration/deltaspike-data/testsuite/log4j.properties
@@ -0,0 +1,22 @@
+#
+# Copyright 2014 - 2018 Blazebit.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Define the destination and format of our logging
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
+
+#log4j.category.DataNucleus.Enhancer=DEBUG, A1
\ No newline at end of file
diff --git a/integration/deltaspike-data/testsuite/pom.xml b/integration/deltaspike-data/testsuite/pom.xml
index 5f818e26be..fb9ccf14a5 100644
--- a/integration/deltaspike-data/testsuite/pom.xml
+++ b/integration/deltaspike-data/testsuite/pom.xml
@@ -16,17 +16,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>${version.hibernate-5.2}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-deltaspike-data-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-core-impl</artifactId>
@@ -37,16 +26,6 @@
             <artifactId>blaze-persistence-entity-view-impl</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.deltaspike.core</groupId>
             <artifactId>deltaspike-core-impl</artifactId>
@@ -82,74 +61,1817 @@
             <artifactId>weld-se-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
 
-        <!-- IntelliJ apparently needs the annotation processor here -->
+        <!-- Preparation for Java 9+, include a dependency on the JAXB APIs -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-jpamodelgen</artifactId>
-            <version>${version.hibernate-5.2}</version>
-            <scope>provided</scope>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${version.annotation}</version>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
+    <profiles>
+        <!-- RDBMS profiles -->
+        <profile>
+            <id>h2</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoH2,${jpa.excludedGroups}</excludedGroups>
+                            <systemPropertyVariables>
+                                <jdbc.url>jdbc:h2:mem:test</jdbc.url>
+                                <jdbc.user>admin</jdbc.user>
+                                <jdbc.password>admin</jdbc.password>
+                                <jdbc.driver>org.h2.Driver</jdbc.driver>
+                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
+                            </systemPropertyVariables>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-junit47</artifactId>
+                                <version>${version.surefire.plugin}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>com.h2database</groupId>
+                    <artifactId>h2</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>mysql</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,${jpa.excludedGroups}</excludedGroups>
+                            <systemPropertyVariables>
+                                <jdbc.url>jdbc:mysql://localhost:3306/test?useUnicode=true&amp;characterEncoding=utf8</jdbc.url>
+                                <jdbc.user>root</jdbc.user>
+                                <jdbc.password />
+                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
+                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
+                            </systemPropertyVariables>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-junit47</artifactId>
+                                <version>${version.surefire.plugin}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>mysql</groupId>
+                    <artifactId>mysql-connector-java</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>postgresql</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL,${jpa.excludedGroups}</excludedGroups>
+                            <systemPropertyVariables>
+                                <jdbc.url>jdbc:postgresql://localhost:5432/test</jdbc.url>
+                                <jdbc.user>postgres</jdbc.user>
+                                <jdbc.password>postgres</jdbc.password>
+                                <jdbc.driver>org.postgresql.Driver</jdbc.driver>
+                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
+                            </systemPropertyVariables>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-junit47</artifactId>
+                                <version>${version.surefire.plugin}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>org.postgresql</groupId>
+                    <artifactId>postgresql</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>sqlite</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite,${jpa.excludedGroups}</excludedGroups>
+                            <systemPropertyVariables>
+                                <jdbc.url>jdbc:sqlite:test.db</jdbc.url>
+                                <jdbc.user />
+                                <jdbc.password />
+                                <jdbc.driver>org.sqlite.JDBC</jdbc.driver>
+                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
+                            </systemPropertyVariables>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-junit47</artifactId>
+                                <version>${version.surefire.plugin}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>org.xerial</groupId>
+                    <artifactId>sqlite-jdbc</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>db2</id>
+            <!-- In order to use this profile, you have to install the db2 driver
+                jars via: mvn -q install:install-file -Dfile=/PATH/TO/db2jcc4.jar -DgroupId=com.ibm.db2
+                -DartifactId=db2jcc4 -Dversion=9.7 -Dpackaging=jar -DgeneratePom=true mvn
+                -q install:install-file -Dfile=/PATH/TO/db2jcc_license_cu.jar -DgroupId=com.ibm.db2
+                -DartifactId=db2jcc_license_cu -Dversion=9.7 -Dpackaging=jar -DgeneratePom=true -->
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDB2,${jpa.excludedGroups}</excludedGroups>
+                            <systemPropertyVariables>
+                                <jdbc.url>jdbc:db2://localhost:50000/test</jdbc.url>
+                                <jdbc.user>db2inst1</jdbc.user>
+                                <jdbc.password>db2inst1-pwd</jdbc.password>
+                                <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
+                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
+                            </systemPropertyVariables>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-junit47</artifactId>
+                                <version>${version.surefire.plugin}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>com.ibm.db2</groupId>
+                    <artifactId>db2jcc4</artifactId>
+                    <version>9.7</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>com.ibm.db2</groupId>
+                    <artifactId>db2jcc_license_cu</artifactId>
+                    <version>9.7</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>firebird</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird,${jpa.excludedGroups}</excludedGroups>
+                            <systemPropertyVariables>
+                                <jdbc.url>jdbc:firebirdsql:localhost:/tmp/test.fdb</jdbc.url>
+                                <jdbc.user>SYSDBA</jdbc.user>
+                                <jdbc.password>masterkey</jdbc.password>
+                                <jdbc.driver>org.firebirdsql.jdbc.FBDriver</jdbc.driver>
+                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
+                            </systemPropertyVariables>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-junit47</artifactId>
+                                <version>${version.surefire.plugin}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>org.firebirdsql.jdbc</groupId>
+                    <artifactId>jaybird-jdk16</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>oracle</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
+                            <systemPropertyVariables>
+                                <jdbc.url>jdbc:oracle:thin:@localhost:1521/xe</jdbc.url>
+                                <jdbc.user>SYSTEM</jdbc.user>
+                                <jdbc.password>oracle</jdbc.password>
+                                <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
+                            </systemPropertyVariables>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-junit47</artifactId>
+                                <version>${version.surefire.plugin}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>com.oracle</groupId>
+                    <artifactId>ojdbc14</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>mssql</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL,${jpa.excludedGroups}</excludedGroups>
+                            <systemPropertyVariables>
+                                <jdbc.url>jdbc:sqlserver://localhost:1433</jdbc.url>
+                                <jdbc.user>sa</jdbc.user>
+                                <jdbc.password>Blaze-Persistence</jdbc.password>
+                                <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
+                            </systemPropertyVariables>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-junit47</artifactId>
+                                <version>${version.surefire.plugin}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>com.microsoft.sqlserver</groupId>
+                    <artifactId>mssql-jdbc</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <!-- JPA provider profiles -->
+        <profile>
+            <id>hibernate</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42</jpa.excludedGroups>
+                <spring.activeProfiles>hibernate</spring.activeProfiles>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-entitymanager</artifactId>
+                    <version>${version.hibernate-4.2}</version>
+                </dependency>
+                <!-- Need a newer Jandex version to so that Weld can work properly -->
+                <dependency>
+                    <groupId>org.jboss</groupId>
+                    <artifactId>jandex</artifactId>
+                    <version>1.2.2.Final</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <!-- IntelliJ apparently needs the annotation processor here -->
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-jpamodelgen</artifactId>
+                    <version>1.3.0.Final</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <!-- Metamodel -->
+                            <dependency>
+                                <groupId>org.hibernate</groupId>
+                                <artifactId>hibernate-jpamodelgen</artifactId>
+                                <version>1.3.0.Final</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>hibernate-4.3</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43</jpa.excludedGroups>
+                <spring.activeProfiles>hibernate</spring.activeProfiles>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-entitymanager</artifactId>
+                    <version>${version.hibernate-4.3}</version>
+                </dependency>
+                <!-- Need a newer Jandex version to so that Weld can work properly -->
+                <dependency>
+                    <groupId>org.jboss</groupId>
+                    <artifactId>jandex</artifactId>
+                    <version>1.2.2.Final</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <!-- IntelliJ apparently needs the annotation processor here -->
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-jpamodelgen</artifactId>
+                    <version>${version.hibernate-4.3}</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <!-- Metamodel -->
+                            <dependency>
+                                <groupId>org.hibernate</groupId>
+                                <artifactId>hibernate-jpamodelgen</artifactId>
+                                <version>${version.hibernate-4.3}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>hibernate-5.0</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50</jpa.excludedGroups>
+                <spring.activeProfiles>hibernate</spring.activeProfiles>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-entitymanager</artifactId>
+                    <version>${version.hibernate-5}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <!-- IntelliJ apparently needs the annotation processor here -->
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-jpamodelgen</artifactId>
+                    <version>${version.hibernate-5}</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <!-- Metamodel -->
+                            <dependency>
+                                <groupId>org.hibernate</groupId>
+                                <artifactId>hibernate-jpamodelgen</artifactId>
+                                <version>${version.hibernate-5}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>hibernate-5.1</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51</jpa.excludedGroups>
+                <spring.activeProfiles>hibernate</spring.activeProfiles>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-entitymanager</artifactId>
+                    <version>${version.hibernate-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <!-- IntelliJ apparently needs the annotation processor here -->
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-jpamodelgen</artifactId>
+                    <version>${version.hibernate-5.1}</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <!-- Metamodel -->
+                            <dependency>
+                                <groupId>org.hibernate</groupId>
+                                <artifactId>hibernate-jpamodelgen</artifactId>
+                                <version>${version.hibernate-5.1}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>hibernate-5.2</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
+                <spring.activeProfiles>hibernate</spring.activeProfiles>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-entitymanager</artifactId>
+                    <version>${version.hibernate-5.2}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <!-- IntelliJ apparently needs the annotation processor here -->
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-jpamodelgen</artifactId>
+                    <version>${version.hibernate-5.2}</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <!-- Metamodel -->
+                            <dependency>
+                                <groupId>org.hibernate</groupId>
+                                <artifactId>hibernate-jpamodelgen</artifactId>
+                                <version>${version.hibernate-5.2}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>hibernate-5.3</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
+                <spring.activeProfiles>hibernate</spring.activeProfiles>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-entitymanager</artifactId>
+                    <version>${version.hibernate-5.3}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <!-- IntelliJ apparently needs the annotation processor here -->
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-jpamodelgen</artifactId>
+                    <version>${version.hibernate-5.3}</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <!-- Metamodel -->
+                            <dependency>
+                                <groupId>org.hibernate</groupId>
+                                <artifactId>hibernate-jpamodelgen</artifactId>
+                                <version>${version.hibernate-5.3}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>hibernate-6.0</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
+                <spring.activeProfiles>hibernate</spring.activeProfiles>
+            </properties>
+            <repositories>
+                <repository>
+                    <id>JBoss Snapshots</id>
+                    <name>JBoss Snapshots</name>
+                    <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+                </repository>
+            </repositories>
+            <dependencies>
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-entitymanager</artifactId>
+                    <version>${version.hibernate-6.0}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.0</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <!-- IntelliJ apparently needs the annotation processor here -->
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-jpamodelgen</artifactId>
+                    <version>${version.hibernate-6.0}</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <!-- Metamodel -->
+                            <dependency>
+                                <groupId>org.hibernate</groupId>
+                                <artifactId>hibernate-jpamodelgen</artifactId>
+                                <version>${version.hibernate-6.0}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>eclipselink</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink</jpa.excludedGroups>
+                <spring.activeProfiles>eclipselink</spring.activeProfiles>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.eclipse.persistence</groupId>
+                    <artifactId>eclipselink</artifactId>
+                    <version>${version.eclipselink}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <!-- IntelliJ apparently needs the annotation processor here -->
+                <dependency>
+                    <groupId>org.eclipse.persistence</groupId>
+                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
+                    <version>${version.eclipselink}</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>javax.transaction</groupId>
+                    <artifactId>javax.transaction-api</artifactId>
+                    <version>${version.jta}</version>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
+                                    </processors>
+                                    <optionMap>
+                                        <eclipselink.persistencexml>${basedir}/src/main/resources/META-INF/persistence.xml</eclipselink.persistencexml>
+                                    </optionMap>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <!-- Metamodel -->
+                            <dependency>
+                                <groupId>org.eclipse.persistence</groupId>
+                                <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
+                                <version>${version.eclipselink}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>datanucleus-4</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus,com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4</jpa.excludedGroups>
+                <spring.activeProfiles>datanucleus</spring.activeProfiles>
+            </properties>
+            <repositories>
+                <repository>
+                    <id>DataNucleus Nightly</id>
+                    <name>DataNucleus Repository Nightly</name>
+                    <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
+                </repository>
+            </repositories>
+            <dependencies>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>javax.persistence</artifactId>
+                    <version>2.1.2</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-core</artifactId>
+                    <version>${version.datanucleus.base-4}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-api-jpa</artifactId>
+                    <version>${version.datanucleus.api-jpa-4}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-jpa-query</artifactId>
+                    <version>${version.datanucleus.jpa-4}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-rdbms</artifactId>
+                    <version>${version.datanucleus.rdbms-4}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>javax.transaction</groupId>
+                    <artifactId>javax.transaction-api</artifactId>
+                    <version>${version.jta}</version>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.datanucleus</groupId>
+                        <artifactId>datanucleus-maven-plugin</artifactId>
+                        <version>4.0.0-release</version>
+                        <configuration>
+                            <api>JPA</api>
+                            <persistenceUnitName>TEST-PU</persistenceUnitName>
+                            <verbose>false</verbose>
+                            <fork>true</fork>
+                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
+                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
+                            <useFileListFile>true</useFileListFile>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>process-classes</phase>
+                                <goals>
+                                    <goal>enhance</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
+                                <version>${project.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <!-- The old version has a bug when generating the static metamodel for PolymorphicPropertyMapBase -->
+                            <dependency>
+                                <groupId>org.datanucleus</groupId>
+                                <artifactId>datanucleus-jpa-query</artifactId>
+                                <version>${version.datanucleus.jpa-5}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>datanucleus-5</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
+                <spring.activeProfiles>datanucleus</spring.activeProfiles>
+            </properties>
+            <repositories>
+                <repository>
+                    <id>DataNucleus Nightly</id>
+                    <name>DataNucleus Repository Nightly</name>
+                    <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
+                </repository>
+            </repositories>
+            <dependencies>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>javax.persistence</artifactId>
+                    <version>2.1.2</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-core</artifactId>
+                    <version>${version.datanucleus.base-5}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-api-jpa</artifactId>
+                    <version>${version.datanucleus.api-jpa-5}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-jpa-query</artifactId>
+                    <version>${version.datanucleus.jpa-5}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-rdbms</artifactId>
+                    <version>${version.datanucleus.rdbms-5}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>javax.transaction</groupId>
+                    <artifactId>javax.transaction-api</artifactId>
+                    <version>${version.jta}</version>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.datanucleus</groupId>
+                        <artifactId>datanucleus-maven-plugin</artifactId>
+                        <version>4.0.0-release</version>
                         <configuration>
-                            <!-- source output directory -->
-                            <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                            <processors>
-                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                            </processors>
+                            <api>JPA</api>
+                            <persistenceUnitName>TEST-PU</persistenceUnitName>
+                            <verbose>false</verbose>
+                            <fork>true</fork>
+                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
+                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
+                            <useFileListFile>true</useFileListFile>
                         </configuration>
-                    </execution>
-                </executions>
+                        <executions>
+                            <execution>
+                                <phase>process-classes</phase>
+                                <goals>
+                                    <goal>enhance</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
+                                <version>${project.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>datanucleus-5.1</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
+                <spring.activeProfiles>datanucleus</spring.activeProfiles>
+            </properties>
+            <repositories>
+                <repository>
+                    <id>DataNucleus Nightly</id>
+                    <name>DataNucleus Repository Nightly</name>
+                    <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
+                </repository>
+            </repositories>
+            <dependencies>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>javax.persistence</artifactId>
+                    <version>2.2.0-release</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-core</artifactId>
+                    <version>${version.datanucleus.base-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-api-jpa</artifactId>
+                    <version>${version.datanucleus.api-jpa-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-jpa-query</artifactId>
+                    <version>${version.datanucleus.jpa-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-rdbms</artifactId>
+                    <version>${version.datanucleus.rdbms-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>javax.transaction</groupId>
+                    <artifactId>javax.transaction-api</artifactId>
+                    <version>${version.jta}</version>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.datanucleus</groupId>
+                        <artifactId>datanucleus-maven-plugin</artifactId>
+                        <version>4.0.0-release</version>
+                        <configuration>
+                            <api>JPA</api>
+                            <persistenceUnitName>TEST-PU</persistenceUnitName>
+                            <verbose>false</verbose>
+                            <fork>true</fork>
+                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
+                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
+                            <useFileListFile>true</useFileListFile>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>process-classes</phase>
+                                <goals>
+                                    <goal>enhance</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
+                                <version>${project.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-test-source-metamodel</id>
+                                <phase>generate-test-sources</phase>
+                                <goals>
+                                    <goal>add-test-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/test-metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>openjpa</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA</jpa.excludedGroups>
+                <spring.activeProfiles>openjpa</spring.activeProfiles>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.openjpa</groupId>
+                    <artifactId>openjpa-all</artifactId>
+                    <version>${version.openjpa}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-openjpa</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.apache.openjpa.persistence.meta.AnnotationProcessor6</processor>
+                                    </processors>
+                                    <optionMap>
+                                        <openjpa.metamodel>true</openjpa.metamodel>
+                                    </optionMap>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.openjpa</groupId>
+                                <artifactId>openjpa-all</artifactId>
+                                <version>${version.openjpa}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>deltaspike-1.7</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencyManagement>
                 <dependencies>
-                    <!-- Metamodel -->
                     <dependency>
-                        <groupId>org.hibernate</groupId>
-                        <artifactId>hibernate-jpamodelgen</artifactId>
-                        <version>${version.hibernate-5.2}</version>
+                        <groupId>org.apache.deltaspike.distribution</groupId>
+                        <artifactId>distributions-bom</artifactId>
+                        <version>${version.deltaspike-1.7}</version>
+                        <type>pom</type>
+                        <scope>import</scope>
                     </dependency>
                 </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-source-metamodel</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.build.directory}/test-metamodel</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+            </dependencyManagement>
+            <dependencies>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.7</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>deltaspike-1.8</id>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.deltaspike.distribution</groupId>
+                        <artifactId>distributions-bom</artifactId>
+                        <version>${version.deltaspike-1.8}</version>
+                        <type>pom</type>
+                        <scope>import</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <dependencies>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.8</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>
\ No newline at end of file
diff --git a/integration/deltaspike-data/testsuite/src/main/resources/META-INF/persistence.xml b/integration/deltaspike-data/testsuite/src/main/resources/META-INF/persistence.xml
index 62dc9b2aef..3f23959fc5 100644
--- a/integration/deltaspike-data/testsuite/src/main/resources/META-INF/persistence.xml
+++ b/integration/deltaspike-data/testsuite/src/main/resources/META-INF/persistence.xml
@@ -17,19 +17,10 @@
 <persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
              version="2.1">
-    <persistence-unit name="TestsuiteBase" transaction-type="RESOURCE_LOCAL">
+    <persistence-unit name="TEST-PU" transaction-type="RESOURCE_LOCAL">
         <class>com.blazebit.persistence.deltaspike.data.testsuite.entity.Person</class>
         <class>com.blazebit.persistence.deltaspike.data.testsuite.entity.Address</class>
 
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
-
-        <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;DB_CLOSE_DELAY=-1" />
-            <property name="javax.persistence.jdbc.user" value="user" />
-            <property name="javax.persistence.jdbc.password" value="password" />
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
-
-            <property name="javax.persistence.schema-generation.database.action" value="none"/>
-        </properties>
     </persistence-unit>
 </persistence>
\ No newline at end of file
diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/AbstractEntityViewRepositoryTest.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/AbstractEntityViewRepositoryTest.java
index 94afaa18bc..3b5633453b 100644
--- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/AbstractEntityViewRepositoryTest.java
+++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/AbstractEntityViewRepositoryTest.java
@@ -19,6 +19,7 @@
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.deltaspike.data.testsuite.entity.Address;
 import com.blazebit.persistence.deltaspike.data.testsuite.entity.Person;
+import com.blazebit.persistence.deltaspike.data.testsuite.producer.EntityManagerProducer;
 import com.blazebit.persistence.testsuite.base.AbstractPersistenceTest;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
@@ -26,16 +27,11 @@
 import org.apache.deltaspike.cdise.api.CdiContainer;
 import org.apache.deltaspike.cdise.api.CdiContainerLoader;
 import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.hibernate.engine.spi.SessionImplementor;
 import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.BeforeClass;
 
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
-import java.sql.Connection;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -60,18 +56,6 @@ protected Class<?>[] getEntityClasses() {
         };
     }
 
-    @BeforeClass
-    public static void bootContainer() {
-        CdiContainer container = CdiContainerLoader.getCdiContainer();
-        container.boot();
-    }
-
-    @AfterClass
-    public static void shutdownContainer() {
-        CdiContainer container = CdiContainerLoader.getCdiContainer();
-        container.shutdown();
-    }
-
     @Before
     public void startContexts() {
         CdiContainer container = CdiContainerLoader.getCdiContainer();
@@ -83,11 +67,7 @@ public void startContexts() {
     public void stopContexts() {
         CdiContainer container = CdiContainerLoader.getCdiContainer();
         container.getContextControl().stopContexts();
-    }
-
-    @Override
-    protected Connection getConnection(EntityManager em) {
-        return em.unwrap(SessionImplementor.class).connection();
+        container.shutdown();
     }
 
     @Override
@@ -98,13 +78,23 @@ protected boolean runTestInTransaction() {
     @Override
     public void init() {
         super.init();
-        persons = cbf.create(em, Person.class)
-                .orderByAsc("id")
-                .getResultList().toArray(new Person[0]);
+        EntityManagerProducer.setEmf(emf);
+        // Boot the container after publishing the entity manager factory
+        CdiContainer container = CdiContainerLoader.getCdiContainer();
+        container.boot();
+        transactional(new Runnable() {
+            @Override
+            public void run() {
+                persons = cbf.create(em, Person.class)
+                        .orderByAsc("id")
+                        .getResultList().toArray(new Person[0]);
+            }
+        });
     }
 
     @Override
     protected void setUpOnce() {
+        cleanDatabase();
         transactional(new Runnable() {
             @Override
             public void run() {
@@ -116,7 +106,9 @@ public void run() {
     protected void transactional(Runnable r) {
         EntityTransaction tx = em.getTransaction();
         try {
-            tx.begin();
+            if (!tx.isActive()) {
+                tx.begin();
+            }
             r.run();
             tx.commit();
         } catch (Exception e) {
@@ -129,13 +121,13 @@ protected void transactional(Runnable r) {
 
     private void createTestData() {
         Person[] persons = new Person[] {
-                new Person(0L, "Mother", 0),
-                new Person(1L, "John Doe", 2),
-                new Person(2L, "James Harley", 4),
-                new Person(3L, "Berry Cooper", 5),
-                new Person(4L, "John Smith", 4, "King Street"),
-                new Person(5L, "Harry Norman", 1, "Rich Street"),
-                new Person(6L, "Harry Norman", 3, "King Street")
+                new Person(1L, "Mother", 0),
+                new Person(2L, "John Doe", 2),
+                new Person(3L, "James Harley", 4),
+                new Person(4L, "Berry Cooper", 5),
+                new Person(5L, "John Smith", 4, "King Street"),
+                new Person(6L, "Harry Norman", 1, "Rich Street"),
+                new Person(7L, "Harry Norman", 3, "King Street")
         };
 
         persons[1].setParent(persons[0]);
diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/ExtendedEntityViewRepositoryTest.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/ExtendedEntityViewRepositoryTest.java
index f77db4b2a7..31112b29f2 100644
--- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/ExtendedEntityViewRepositoryTest.java
+++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/ExtendedEntityViewRepositoryTest.java
@@ -72,7 +72,7 @@ public void testFindByNameOrPosition() {
                 fetch(PersonView.class, persons[6].getId())
         );
         List<PersonView> result = personViewRepository.findByNameOrPosition("Harry Norman", 2);
-        assertEquals(expected, result);
+        assertUnorderedEquals(expected, result);
     }
 
     @Test
@@ -82,7 +82,7 @@ public void testFindByPositionBetween() {
                 fetch(PersonView.class, persons[6].getId())
         );
         List<PersonView> result = personViewRepository.findByPositionBetween(2, 3);
-        assertEquals(expected, result);
+        assertUnorderedEquals(expected, result);
     }
 
     @Test
@@ -169,7 +169,9 @@ public void testFindByPosition() {
         assertEquals(expectedReversed, result.changeOrder("id").getResultList());
         result.clearOrder();
 
-        assertEquals(persons[4].getId(), result.orderAsc("id").firstResult(1).getSingleResult().getId());
+        // Always use max results as Hibernate has to do "rownumber < first + max" for databases like DB2 which don't support a limit clause.
+        // Without the max results, we will run into an integer overflow which results in a negative number...
+        assertEquals(persons[4].getId(), result.orderAsc("id").firstResult(1).maxResults(100).getSingleResult().getId());
         assertEquals(persons[2].getId(), result.firstResult(0).maxResults(1).getSingleResult().getId());
 
         assertEquals(persons[2].getId(), result.withPageSize(1).toPage(0).getSingleResult().getId());
diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/EntityManagerProducer.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/EntityManagerProducer.java
index 72f987e94d..b621ca110b 100644
--- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/EntityManagerProducer.java
+++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/EntityManagerProducer.java
@@ -16,12 +16,12 @@
 
 package com.blazebit.persistence.deltaspike.data.testsuite.producer;
 
+import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
 import javax.inject.Singleton;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
 
 /**
  * @author Moritz Becker
@@ -29,20 +29,30 @@
  */
 public class EntityManagerProducer {
 
+    private static EntityManagerFactory emf;
+
     @Produces
-    public EntityManager createEm(EntityManagerFactory emf) {
+    @RequestScoped
+    public EntityManager createEm() {
         return emf.createEntityManager();
     }
 
+    public void destroyEm(@Disposes EntityManager em) {
+        if (em != null && em.isOpen()) {
+            if (em.getTransaction().isActive()) {
+                em.getTransaction().rollback();
+            }
+            em.close();
+        }
+    }
+
     @Produces
     @Singleton
     public EntityManagerFactory getEntityManagerFactory() {
-        return Persistence.createEntityManagerFactory("TestsuiteBase", null);
+        return emf;
     }
 
-    public void onShutdown(@Disposes EntityManagerFactory emf) {
-        if (emf.isOpen()) {
-            emf.close();
-        }
+    public static void setEmf( EntityManagerFactory emf) {
+        EntityManagerProducer.emf = emf;
     }
 }
\ No newline at end of file
diff --git a/integration/deltaspike-data/testsuite/src/test/resources/logging.properties b/integration/deltaspike-data/testsuite/src/test/resources/logging.properties
index 32f9913f4a..497c77b711 100644
--- a/integration/deltaspike-data/testsuite/src/test/resources/logging.properties
+++ b/integration/deltaspike-data/testsuite/src/test/resources/logging.properties
@@ -27,6 +27,16 @@ org.hibernate.tool.hbm2ddl.level = OFF
 #org.hibernate.cache.level = ALL
 #org.hibernate.hql.internal.ast.AST.level = ALL
 
+#DataNucleus.Datastore.Native.level = ALL
+
+org.eclipse.persistence.level = SEVERE
+#org.eclipse.persistence.session.default.sql.level = SEVERE
+#org.eclipse.persistence.session.default.sql.level = ALL
+
+com.blazebit.persistence.spi.EntityManagerFactoryIntegrator.level = OFF
+com.blazebit.persistence.impl.datanucleus.function.DataNucleusEntityManagerFactoryIntegrator.level = OFF
+
+# Enable connection pool error logging
 org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl.level = SEVERE
 
 java.util.logging.ConsoleHandler.level = ALL
diff --git a/integration/entity-view-cdi/pom.xml b/integration/entity-view-cdi/pom.xml
index 7afcff29a8..8c5b9e84d4 100644
--- a/integration/entity-view-cdi/pom.xml
+++ b/integration/entity-view-cdi/pom.xml
@@ -30,8 +30,26 @@
     <properties>
         <module.name>com.blazebit.persistence.integration.view.cdi</module.name>
     </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.deltaspike.distribution</groupId>
+                <artifactId>distributions-bom</artifactId>
+                <version>${version.deltaspike-1.7}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     
     <dependencies>
+        <dependency>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.0-api</artifactId>
+            <version>1.0.1.Final</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-core-api</artifactId>
@@ -47,12 +65,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Needed for CDI and JPA -->
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-core-impl</artifactId>
@@ -80,19 +92,55 @@
         </dependency>
         <dependency>
             <groupId>org.apache.deltaspike.cdictrl</groupId>
-            <artifactId>deltaspike-cdictrl-openejb</artifactId>
+            <artifactId>deltaspike-cdictrl-weld</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>weld-api</artifactId>
+                    <groupId>org.jboss.weld</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jboss-logging</artifactId>
+                    <groupId>org.jboss.logging</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-core</artifactId>
-            <scope>test</scope>
+            <groupId>org.jboss.weld.se</groupId>
+            <artifactId>weld-se-core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Preparation for Java 9+, include a dependency on the JAXB APIs -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${version.jaxb}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>${version.jaxb}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${version.jaxb}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.transaction</groupId>
+            <artifactId>javax.transaction-api</artifactId>
+            <version>1.2</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -137,20 +185,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-test</id>
-                        <configuration>
-                            <!-- Travis build workaround + JDK 9 support -->
-                            <argLine>${surefire.jvm.params} ${surefire.openejb.jvm.params}</argLine>
-                            <skipTests>${skipTests}</skipTests>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4Access.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4Access.java
index 0be2a8e478..728e549c09 100644
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4Access.java
+++ b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4Access.java
@@ -37,9 +37,11 @@
 import org.hibernate.engine.spi.TypedValue;
 import org.hibernate.engine.transaction.spi.TransactionCoordinator;
 import org.hibernate.event.spi.EventSource;
+import org.hibernate.hql.internal.ast.ParameterTranslationsImpl;
 import org.hibernate.hql.internal.ast.exec.BasicExecutor;
 import org.hibernate.hql.internal.ast.exec.StatementExecutor;
 import org.hibernate.hql.internal.classic.ParserHelper;
+import org.hibernate.hql.spi.ParameterTranslations;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.loader.hql.QueryLoader;
 import org.hibernate.param.ParameterSpecification;
@@ -307,4 +309,9 @@ public QueryParameters createQueryParameters(
                 null
         );
     }
+
+    @Override
+    public ParameterTranslations createParameterTranslations(List<ParameterSpecification> queryParameterSpecifications) {
+        return new ParameterTranslationsImpl(queryParameterSpecifications);
+    }
 }
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43Access.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43Access.java
index 016c0f76f3..6215924dc3 100644
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43Access.java
+++ b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43Access.java
@@ -37,9 +37,11 @@
 import org.hibernate.engine.spi.TypedValue;
 import org.hibernate.engine.transaction.spi.TransactionCoordinator;
 import org.hibernate.event.spi.EventSource;
+import org.hibernate.hql.internal.ast.ParameterTranslationsImpl;
 import org.hibernate.hql.internal.ast.exec.BasicExecutor;
 import org.hibernate.hql.internal.ast.exec.StatementExecutor;
 import org.hibernate.hql.internal.classic.ParserHelper;
+import org.hibernate.hql.spi.ParameterTranslations;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.loader.hql.QueryLoader;
 import org.hibernate.param.ParameterSpecification;
@@ -308,4 +310,9 @@ public QueryParameters createQueryParameters(
                 null
         );
     }
+
+    @Override
+    public ParameterTranslations createParameterTranslations(List<ParameterSpecification> queryParameterSpecifications) {
+        return new ParameterTranslationsImpl(queryParameterSpecifications);
+    }
 }
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52Access.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52Access.java
index bf2d62e146..80ddca7aea 100644
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52Access.java
+++ b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52Access.java
@@ -34,8 +34,10 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.engine.spi.TypedValue;
 import org.hibernate.event.spi.EventSource;
+import org.hibernate.hql.internal.ast.ParameterTranslationsImpl;
 import org.hibernate.hql.internal.ast.exec.BasicExecutor;
 import org.hibernate.hql.internal.ast.exec.StatementExecutor;
+import org.hibernate.hql.spi.ParameterTranslations;
 import org.hibernate.loader.hql.QueryLoader;
 import org.hibernate.param.ParameterSpecification;
 import org.hibernate.query.internal.AbstractProducedQuery;
@@ -207,4 +209,9 @@ public QueryParameters createQueryParameters(
         );
     }
 
+    @Override
+    public ParameterTranslations createParameterTranslations(List<ParameterSpecification> queryParameterSpecifications) {
+        return new ParameterTranslationsImpl(queryParameterSpecifications);
+    }
+
 }
diff --git a/integration/hibernate-5.3/pom.xml b/integration/hibernate-5.3/pom.xml
new file mode 100644
index 0000000000..1999e4d914
--- /dev/null
+++ b/integration/hibernate-5.3/pom.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2014 - 2018 Blazebit.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.blazebit</groupId>
+        <artifactId>blaze-persistence-integration</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Blazebit Persistence Integration Hibernate 5.3</name>
+
+    <properties>
+        <module.name>com.blazebit.persistence.integration.hibernate</module.name>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-core-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-integration-hibernate-base</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-apt-utils</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>5.3.0.CR1</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-resource</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>add-resource</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>target/generated/resources</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.bsc.maven</groupId>
+                <artifactId>maven-processor-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>process-resources</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <outputDirectory>target/generated/resources</outputDirectory>
+                            <processors>
+                                <!-- list of processors to use -->
+                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
+                            </processors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java
new file mode 100644
index 0000000000..f0d0c77fdd
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import com.blazebit.persistence.integration.hibernate.base.CustomCollectionPersister;
+import com.blazebit.persistence.integration.hibernate.base.CustomSubselectCollectionLoader;
+import org.hibernate.MappingException;
+import org.hibernate.cache.CacheException;
+import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.engine.spi.SubselectFetch;
+import org.hibernate.loader.collection.CollectionInitializer;
+import org.hibernate.mapping.Collection;
+import org.hibernate.persister.collection.BasicCollectionPersister;
+import org.hibernate.persister.spi.PersisterCreationContext;
+
+/**
+ * @author Jan-Willem Gmelig Meyling
+ * @since 1.2.0
+ */
+public class CustomBasicCollectionPersister extends BasicCollectionPersister implements CustomCollectionPersister {
+
+    public CustomBasicCollectionPersister(Collection collectionBinding, CollectionRegionAccessStrategy cacheAccessStrategy, PersisterCreationContext creationContext) throws MappingException, CacheException {
+        super(collectionBinding, cacheAccessStrategy, creationContext);
+    }
+
+    @Override
+    protected CollectionInitializer createSubselectInitializer(SubselectFetch subselect, SharedSessionContractImplementor session) {
+        return new CustomSubselectCollectionLoader(
+            this,
+            subselect.toSubselectString( getCollectionType().getLHSPropertyName() ),
+            subselect.getResult(),
+            subselect.getQueryParameters(),
+            subselect.getNamedParameterLocMap(),
+            session.getFactory(),
+            session.getLoadQueryInfluencers()
+        );
+    }
+
+}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java
new file mode 100644
index 0000000000..623e076320
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import com.blazebit.persistence.integration.hibernate.base.CustomCollectionPersister;
+import com.blazebit.persistence.integration.hibernate.base.CustomSubselectOneToManyLoader;
+import org.hibernate.MappingException;
+import org.hibernate.cache.CacheException;
+import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.engine.spi.SubselectFetch;
+import org.hibernate.loader.collection.CollectionInitializer;
+import org.hibernate.mapping.Collection;
+import org.hibernate.persister.collection.OneToManyPersister;
+import org.hibernate.persister.spi.PersisterCreationContext;
+
+/**
+ *
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class CustomOneToManyPersister extends OneToManyPersister implements CustomCollectionPersister {
+
+    public CustomOneToManyPersister(Collection collectionBinding, CollectionRegionAccessStrategy cacheAccessStrategy, PersisterCreationContext creationContext) throws MappingException, CacheException {
+        super(collectionBinding, cacheAccessStrategy, creationContext);
+    }
+
+    @Override
+    protected CollectionInitializer createSubselectInitializer(SubselectFetch subselect, SharedSessionContractImplementor session) {
+        return new CustomSubselectOneToManyLoader(
+                this,
+                subselect.toSubselectString( getCollectionType().getLHSPropertyName() ),
+                subselect.getResult(),
+                subselect.getQueryParameters(),
+                subselect.getNamedParameterLocMap(),
+                session.getFactory(),
+                session.getLoadQueryInfluencers()
+        );
+    }
+}
\ No newline at end of file
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
new file mode 100644
index 0000000000..e8147c2813
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import com.blazebit.apt.service.ServiceProvider;
+import org.hibernate.mapping.Collection;
+import org.hibernate.persister.collection.CollectionPersister;
+import org.hibernate.persister.internal.StandardPersisterClassResolver;
+import org.hibernate.persister.spi.PersisterClassResolver;
+
+/**
+ * @author Jan-Willem Gmelig Meyling
+ * @since 1.2.0
+ */
+@ServiceProvider(PersisterClassResolver.class)
+public class CustomPersisterClassResolver extends StandardPersisterClassResolver implements PersisterClassResolver {
+
+    @Override
+    public Class<? extends CollectionPersister> getCollectionPersisterClass(Collection metadata) {
+        return metadata.isOneToMany() ? CustomOneToManyPersister.class : CustomBasicCollectionPersister.class;
+    }
+
+}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53Access.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53Access.java
new file mode 100644
index 0000000000..19c1025c36
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53Access.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import com.blazebit.apt.service.ServiceProvider;
+import com.blazebit.persistence.integration.hibernate.base.HibernateAccess;
+import com.blazebit.persistence.integration.hibernate.base.HibernateExtendedQuerySupport;
+import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
+import com.blazebit.persistence.spi.DbmsDialect;
+import org.hibernate.HibernateException;
+import org.hibernate.LockOptions;
+import org.hibernate.Query;
+import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
+import org.hibernate.engine.query.spi.HQLQueryPlan;
+import org.hibernate.engine.spi.ExceptionConverter;
+import org.hibernate.engine.spi.QueryParameters;
+import org.hibernate.engine.spi.RowSelection;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.engine.spi.TypedValue;
+import org.hibernate.event.spi.EventSource;
+import org.hibernate.hql.internal.ast.ParameterTranslationsImpl;
+import org.hibernate.hql.internal.ast.exec.BasicExecutor;
+import org.hibernate.hql.internal.ast.exec.StatementExecutor;
+import org.hibernate.hql.spi.ParameterTranslations;
+import org.hibernate.loader.hql.QueryLoader;
+import org.hibernate.param.ParameterSpecification;
+import org.hibernate.query.internal.AbstractProducedQuery;
+import org.hibernate.query.internal.QueryParameterBindingsImpl;
+import org.hibernate.query.spi.QueryImplementor;
+import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl;
+import org.hibernate.resource.transaction.spi.TransactionCoordinator;
+import org.hibernate.type.Type;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceException;
+import java.io.Serializable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+@ServiceProvider(HibernateAccess.class)
+public class Hibernate53Access implements HibernateAccess {
+
+    private static final Logger LOG = Logger.getLogger(HibernateExtendedQuerySupport.class.getName());
+    private static final Method DO_EXECUTE_METHOD;
+    private static final Constructor<ParameterTranslationsImpl> PARAMETER_TRANSLATIONS_CONSTRUCTOR;
+
+    static {
+        try {
+            Method m = BasicExecutor.class.getDeclaredMethod("doExecute", QueryParameters.class, SharedSessionContractImplementor.class, String.class, List.class);
+            m.setAccessible(true);
+            DO_EXECUTE_METHOD = m;
+            Constructor<ParameterTranslationsImpl> c = ParameterTranslationsImpl.class.getDeclaredConstructor(List.class);
+            c.setAccessible(true);
+            PARAMETER_TRANSLATIONS_CONSTRUCTOR = c;
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+    
+    @Override
+    public SessionImplementor wrapSession(SessionImplementor session, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult) {
+        JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
+        
+        Object jdbcCoordinatorProxy = Proxy.newProxyInstance(jdbcCoordinator.getClass().getClassLoader(), new Class[]{ JdbcCoordinator.class }, new JdbcCoordinatorInvocationHandler(jdbcCoordinator, session.getFactory(), dbmsDialect, columns, returningSqlTypes, returningResult));
+        Object sessionProxy = Proxy.newProxyInstance(session.getClass().getClassLoader(), new Class[]{ SessionImplementor.class, EventSource.class }, new Hibernate53SessionInvocationHandler(session, jdbcCoordinatorProxy));
+        return (SessionImplementor) sessionProxy;
+    }
+
+    @Override
+    public SessionFactoryImplementor wrapSessionFactory(SessionFactoryImplementor sessionFactory, DbmsDialect dbmsDialect) {
+        Object dialectProxy = new Hibernate53LimitHandlingDialect(sessionFactory.getDialect(), dbmsDialect);
+        Object sessionFactoryProxy = Proxy.newProxyInstance(sessionFactory.getClass().getClassLoader(), new Class[]{ SessionFactoryImplementor.class }, new Hibernate53SessionFactoryInvocationHandler(sessionFactory, dialectProxy));
+        return (SessionFactoryImplementor) sessionFactoryProxy;
+    }
+
+    @Override
+    public void checkTransactionSynchStatus(SessionImplementor session) {
+        TransactionCoordinator coordinator = session.getTransactionCoordinator();
+        coordinator.pulse();
+        if (coordinator instanceof JtaTransactionCoordinatorImpl) {
+            ((JtaTransactionCoordinatorImpl) coordinator).getSynchronizationCallbackCoordinator().processAnyDelayedAfterCompletion();
+        }
+    }
+
+    @Override
+    public void afterTransaction(SessionImplementor session, boolean success) {
+        TransactionCoordinator coordinator = session.getTransactionCoordinator();
+        if (!session.isTransactionInProgress() ) {
+            session.getJdbcCoordinator().afterTransaction();
+        }
+        if (coordinator instanceof JtaTransactionCoordinatorImpl) {
+            ((JtaTransactionCoordinatorImpl) coordinator).getSynchronizationCallbackCoordinator().processAnyDelayedAfterCompletion();
+        }
+    }
+
+    @Override
+    @SuppressWarnings({ "unchecked" })
+    public List<Object[]> list(QueryLoader queryLoader, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
+        return queryLoader.list(sessionImplementor, queryParameters);
+    }
+
+    @Override
+    public List<Object> performList(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
+        return queryPlan.performList(queryParameters, sessionImplementor);
+    }
+
+    @Override
+    public int performExecuteUpdate(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
+        return queryPlan.performExecuteUpdate(queryParameters, sessionImplementor);
+    }
+
+    @Override
+    public void doExecute(StatementExecutor executor, String delete, QueryParameters parameters, SessionImplementor session, List<ParameterSpecification> parameterSpecifications) {
+        try {
+            DO_EXECUTE_METHOD.invoke(executor, parameters, session, delete, parameterSpecifications);
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    @Override
+    public QueryParameters getQueryParameters(Query hibernateQuery, Map<String, TypedValue> namedParams) {
+        return ((AbstractProducedQuery) hibernateQuery).getQueryParameters();
+    }
+
+    @Override
+    public Map<String, TypedValue> getNamedParams(Query hibernateQuery) {
+        QueryParameterBindingsImpl queryParameterBindings = hibernateQuery.unwrap(QueryParameterBindingsImpl.class);
+        return queryParameterBindings.collectNamedParameterBindings();
+    }
+
+    @Override
+    public String expandParameterLists(SessionImplementor session, org.hibernate.Query hibernateQuery, Map<String, TypedValue> namedParamsCopy) {
+        QueryParameterBindingsImpl queryParameterBindings = hibernateQuery.unwrap(QueryParameterBindingsImpl.class);
+        SharedSessionContractImplementor producer = (SharedSessionContractImplementor) ((QueryImplementor<?>) hibernateQuery).getProducer();
+        String query = hibernateQuery.getQueryString();
+
+        // NOTE: In Hibernate 5.3.0.CR1 this is call causes a side effect which is why this is essentially unusable for us
+        query = queryParameterBindings.expandListValuedParameters(query, producer);
+        return query;
+    }
+
+    private ExceptionConverter getExceptionConverter(EntityManager em) {
+        return em.unwrap(SharedSessionContractImplementor.class).getExceptionConverter();
+    }
+
+    @Override
+    public RuntimeException convert(EntityManager em, HibernateException e) {
+        return getExceptionConverter(em).convert(e);
+    }
+
+    @Override
+    public void handlePersistenceException(EntityManager em, PersistenceException e) {
+        getExceptionConverter(em).convert(e);
+    }
+
+    @Override
+    public void throwPersistenceException(EntityManager em, HibernateException e) {
+        getExceptionConverter(em).convert(e);
+    }
+
+    @Override
+    public QueryParameters createQueryParameters(
+            final Type[] positionalParameterTypes,
+            final Object[] positionalParameterValues,
+            final Map<String,TypedValue> namedParameters,
+            final LockOptions lockOptions,
+            final RowSelection rowSelection,
+            final boolean isReadOnlyInitialized,
+            final boolean readOnly,
+            final boolean cacheable,
+            final String cacheRegion,
+            //final boolean forceCacheRefresh,
+            final String comment,
+            final List<String> queryHints,
+            final Serializable[] collectionKeys) {
+        return new QueryParameters(
+                positionalParameterTypes,
+                positionalParameterValues,
+                namedParameters,
+                lockOptions,
+                rowSelection,
+                isReadOnlyInitialized,
+                readOnly,
+                cacheable,
+                cacheRegion,
+                comment,
+                queryHints,
+                collectionKeys,
+                null
+        );
+    }
+
+    @Override
+    public ParameterTranslations createParameterTranslations(List<ParameterSpecification> queryParameterSpecifications) {
+        try {
+            return PARAMETER_TRANSLATIONS_CONSTRUCTOR.newInstance(queryParameterSpecifications);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53DelegatingDialect.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53DelegatingDialect.java
new file mode 100644
index 0000000000..d48249b1a4
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53DelegatingDialect.java
@@ -0,0 +1,909 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import org.hibernate.HibernateException;
+import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
+import org.hibernate.MappingException;
+import org.hibernate.NullPrecedence;
+import org.hibernate.ScrollMode;
+import org.hibernate.boot.model.TypeContributions;
+import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
+import org.hibernate.boot.model.relational.Sequence;
+import org.hibernate.dialect.ColumnAliasExtractor;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.LobMergeStrategy;
+import org.hibernate.dialect.identity.IdentityColumnSupport;
+import org.hibernate.dialect.lock.LockingStrategy;
+import org.hibernate.dialect.pagination.LimitHandler;
+import org.hibernate.dialect.unique.UniqueDelegate;
+import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
+import org.hibernate.engine.jdbc.env.spi.IdentifierHelperBuilder;
+import org.hibernate.engine.jdbc.env.spi.NameQualifierSupport;
+import org.hibernate.engine.jdbc.env.spi.SchemaNameResolver;
+import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
+import org.hibernate.exception.spi.SQLExceptionConverter;
+import org.hibernate.exception.spi.ViolatedConstraintNameExtracter;
+import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
+import org.hibernate.loader.BatchLoadSizingStrategy;
+import org.hibernate.mapping.Constraint;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.Index;
+import org.hibernate.mapping.Table;
+import org.hibernate.persister.entity.Lockable;
+import org.hibernate.procedure.spi.CallableStatementSupport;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.sql.CaseFragment;
+import org.hibernate.sql.JoinFragment;
+import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
+import org.hibernate.tool.schema.spi.Exporter;
+import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
+
+import java.sql.CallableStatement;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class Hibernate53DelegatingDialect extends Dialect {
+
+    private final Dialect delegate;
+
+    public Hibernate53DelegatingDialect(Dialect delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
+        delegate.contributeTypes(typeContributions, serviceRegistry);
+    }
+
+    @Override
+    public String getTypeName(int code) throws HibernateException {
+        return delegate.getTypeName(code);
+    }
+
+    @Override
+    public String getTypeName(int code, long length, int precision, int scale) throws HibernateException {
+        return delegate.getTypeName(code, length, precision, scale);
+    }
+
+    @Override
+    public String getCastTypeName(int code) {
+        return delegate.getCastTypeName(code);
+    }
+
+    @Override
+    public String cast(String value, int jdbcTypeCode, int length, int precision, int scale) {
+        return delegate.cast(value, jdbcTypeCode, length, precision, scale);
+    }
+
+    @Override
+    public String cast(String value, int jdbcTypeCode, int length) {
+        return delegate.cast(value, jdbcTypeCode, length);
+    }
+
+    @Override
+    public String cast(String value, int jdbcTypeCode, int precision, int scale) {
+        return delegate.cast(value, jdbcTypeCode, precision, scale);
+    }
+
+    @Override
+    public SqlTypeDescriptor remapSqlTypeDescriptor(SqlTypeDescriptor sqlTypeDescriptor) {
+        return delegate.remapSqlTypeDescriptor(sqlTypeDescriptor);
+    }
+
+    @Override
+    public LobMergeStrategy getLobMergeStrategy() {
+        return delegate.getLobMergeStrategy();
+    }
+
+    @Override
+    public String getHibernateTypeName(int code) throws HibernateException {
+        return delegate.getHibernateTypeName(code);
+    }
+
+    @Override
+    public boolean isTypeNameRegistered(String typeName) {
+        return delegate.isTypeNameRegistered(typeName);
+    }
+
+    @Override
+    public String getHibernateTypeName(int code, int length, int precision, int scale) throws HibernateException {
+        return delegate.getHibernateTypeName(code, length, precision, scale);
+    }
+
+    @Override
+    public Class getNativeIdentifierGeneratorClass() {
+        return delegate.getNativeIdentifierGeneratorClass();
+    }
+
+    @Override
+    public IdentityColumnSupport getIdentityColumnSupport() {
+        return delegate.getIdentityColumnSupport();
+    }
+
+    @Override
+    public boolean supportsSequences() {
+        return delegate.supportsSequences();
+    }
+
+    @Override
+    public boolean supportsPooledSequences() {
+        return delegate.supportsPooledSequences();
+    }
+
+    @Override
+    public String getSequenceNextValString(String sequenceName) throws MappingException {
+        return delegate.getSequenceNextValString(sequenceName);
+    }
+
+    @Override
+    public String getSelectSequenceNextValString(String sequenceName) throws MappingException {
+        return delegate.getSelectSequenceNextValString(sequenceName);
+    }
+
+    @Override
+    @Deprecated
+    public String[] getCreateSequenceStrings(String sequenceName) throws MappingException {
+        return delegate.getCreateSequenceStrings(sequenceName);
+    }
+
+    @Override
+    public String[] getCreateSequenceStrings(String sequenceName, int initialValue, int incrementSize) throws MappingException {
+        return delegate.getCreateSequenceStrings(sequenceName, initialValue, incrementSize);
+    }
+
+    @Override
+    public String[] getDropSequenceStrings(String sequenceName) throws MappingException {
+        return delegate.getDropSequenceStrings(sequenceName);
+    }
+
+    @Override
+    public String getQuerySequencesString() {
+        return delegate.getQuerySequencesString();
+    }
+
+    @Override
+    public SequenceInformationExtractor getSequenceInformationExtractor() {
+        return delegate.getSequenceInformationExtractor();
+    }
+
+    @Override
+    public String getSelectGUIDString() {
+        return delegate.getSelectGUIDString();
+    }
+
+    @Override
+    public LimitHandler getLimitHandler() {
+        return delegate.getLimitHandler();
+    }
+
+    @Override
+    @Deprecated
+    public boolean supportsLimit() {
+        return delegate.supportsLimit();
+    }
+
+    @Override
+    @Deprecated
+    public boolean supportsLimitOffset() {
+        return delegate.supportsLimitOffset();
+    }
+
+    @Override
+    @Deprecated
+    public boolean supportsVariableLimit() {
+        return delegate.supportsVariableLimit();
+    }
+
+    @Override
+    @Deprecated
+    public boolean bindLimitParametersInReverseOrder() {
+        return delegate.bindLimitParametersInReverseOrder();
+    }
+
+    @Override
+    @Deprecated
+    public boolean bindLimitParametersFirst() {
+        return delegate.bindLimitParametersFirst();
+    }
+
+    @Override
+    @Deprecated
+    public boolean useMaxForLimit() {
+        return delegate.useMaxForLimit();
+    }
+
+    @Override
+    @Deprecated
+    public boolean forceLimitUsage() {
+        return delegate.forceLimitUsage();
+    }
+
+    @Override
+    @Deprecated
+    public String getLimitString(String query, int offset, int limit) {
+        return delegate.getLimitString(query, offset, limit);
+    }
+
+    @Override
+    @Deprecated
+    public int convertToFirstRowValue(int zeroBasedFirstResult) {
+        return delegate.convertToFirstRowValue(zeroBasedFirstResult);
+    }
+
+    @Override
+    public boolean supportsLockTimeouts() {
+        return delegate.supportsLockTimeouts();
+    }
+
+    @Override
+    public boolean isLockTimeoutParameterized() {
+        return delegate.isLockTimeoutParameterized();
+    }
+
+    @Override
+    public LockingStrategy getLockingStrategy(Lockable lockable, LockMode lockMode) {
+        return delegate.getLockingStrategy(lockable, lockMode);
+    }
+
+    @Override
+    public String getForUpdateString(LockOptions lockOptions) {
+        return delegate.getForUpdateString(lockOptions);
+    }
+
+    @Override
+    public String getForUpdateString(LockMode lockMode) {
+        return delegate.getForUpdateString(lockMode);
+    }
+
+    @Override
+    public String getForUpdateString() {
+        return delegate.getForUpdateString();
+    }
+
+    @Override
+    public String getWriteLockString(int timeout) {
+        return delegate.getWriteLockString(timeout);
+    }
+
+    @Override
+    public String getReadLockString(int timeout) {
+        return delegate.getReadLockString(timeout);
+    }
+
+    @Override
+    public boolean forUpdateOfColumns() {
+        return delegate.forUpdateOfColumns();
+    }
+
+    @Override
+    public boolean supportsOuterJoinForUpdate() {
+        return delegate.supportsOuterJoinForUpdate();
+    }
+
+    @Override
+    public String getForUpdateString(String aliases) {
+        return delegate.getForUpdateString(aliases);
+    }
+
+    @Override
+    public String getForUpdateString(String aliases, LockOptions lockOptions) {
+        return delegate.getForUpdateString(aliases, lockOptions);
+    }
+
+    @Override
+    public String getForUpdateNowaitString() {
+        return delegate.getForUpdateNowaitString();
+    }
+
+    @Override
+    public String getForUpdateSkipLockedString() {
+        return delegate.getForUpdateSkipLockedString();
+    }
+
+    @Override
+    public String getForUpdateNowaitString(String aliases) {
+        return delegate.getForUpdateNowaitString(aliases);
+    }
+
+    @Override
+    public String getForUpdateSkipLockedString(String aliases) {
+        return delegate.getForUpdateSkipLockedString(aliases);
+    }
+
+    @Override
+    @Deprecated
+    public String appendLockHint(LockMode mode, String tableName) {
+        return delegate.appendLockHint(mode, tableName);
+    }
+
+    @Override
+    public String appendLockHint(LockOptions lockOptions, String tableName) {
+        return delegate.appendLockHint(lockOptions, tableName);
+    }
+
+    @Override
+    public String applyLocksToSql(String sql, LockOptions aliasedLockOptions, Map<String, String[]> keyColumnNames) {
+        return delegate.applyLocksToSql(sql, aliasedLockOptions, keyColumnNames);
+    }
+
+    @Override
+    public String getCreateTableString() {
+        return delegate.getCreateTableString();
+    }
+
+    @Override
+    public String getCreateMultisetTableString() {
+        return delegate.getCreateMultisetTableString();
+    }
+
+    @Override
+    public MultiTableBulkIdStrategy getDefaultMultiTableBulkIdStrategy() {
+        return delegate.getDefaultMultiTableBulkIdStrategy();
+    }
+
+    @Override
+    public int registerResultSetOutParameter(CallableStatement statement, int position) throws SQLException {
+        return delegate.registerResultSetOutParameter(statement, position);
+    }
+
+    @Override
+    public int registerResultSetOutParameter(CallableStatement statement, String name) throws SQLException {
+        return delegate.registerResultSetOutParameter(statement, name);
+    }
+
+    @Override
+    public ResultSet getResultSet(CallableStatement statement) throws SQLException {
+        return delegate.getResultSet(statement);
+    }
+
+    @Override
+    public ResultSet getResultSet(CallableStatement statement, int position) throws SQLException {
+        return delegate.getResultSet(statement, position);
+    }
+
+    @Override
+    public ResultSet getResultSet(CallableStatement statement, String name) throws SQLException {
+        return delegate.getResultSet(statement, name);
+    }
+
+    @Override
+    public boolean supportsCurrentTimestampSelection() {
+        return delegate.supportsCurrentTimestampSelection();
+    }
+
+    @Override
+    public boolean isCurrentTimestampSelectStringCallable() {
+        return delegate.isCurrentTimestampSelectStringCallable();
+    }
+
+    @Override
+    public String getCurrentTimestampSelectString() {
+        return delegate.getCurrentTimestampSelectString();
+    }
+
+    @Override
+    public String getCurrentTimestampSQLFunctionName() {
+        return delegate.getCurrentTimestampSQLFunctionName();
+    }
+
+    @Override
+    @Deprecated
+    public SQLExceptionConverter buildSQLExceptionConverter() {
+        return delegate.buildSQLExceptionConverter();
+    }
+
+    @Override
+    public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
+        return delegate.buildSQLExceptionConversionDelegate();
+    }
+
+    @Override
+    public ViolatedConstraintNameExtracter getViolatedConstraintNameExtracter() {
+        return delegate.getViolatedConstraintNameExtracter();
+    }
+
+    @Override
+    public String getSelectClauseNullString(int sqlType) {
+        return delegate.getSelectClauseNullString(sqlType);
+    }
+
+    @Override
+    public boolean supportsUnionAll() {
+        return delegate.supportsUnionAll();
+    }
+
+    @Override
+    public JoinFragment createOuterJoinFragment() {
+        return delegate.createOuterJoinFragment();
+    }
+
+    @Override
+    public CaseFragment createCaseFragment() {
+        return delegate.createCaseFragment();
+    }
+
+    @Override
+    public String getNoColumnsInsertString() {
+        return delegate.getNoColumnsInsertString();
+    }
+
+    @Override
+    public String getLowercaseFunction() {
+        return delegate.getLowercaseFunction();
+    }
+
+    @Override
+    public String getCaseInsensitiveLike() {
+        return delegate.getCaseInsensitiveLike();
+    }
+
+    @Override
+    public boolean supportsCaseInsensitiveLike() {
+        return delegate.supportsCaseInsensitiveLike();
+    }
+
+    @Override
+    public String transformSelectString(String select) {
+        return delegate.transformSelectString(select);
+    }
+
+    @Override
+    public int getMaxAliasLength() {
+        return delegate.getMaxAliasLength();
+    }
+
+    @Override
+    public String toBooleanValueString(boolean bool) {
+        return delegate.toBooleanValueString(bool);
+    }
+
+    @Override
+    @Deprecated
+    public Set<String> getKeywords() {
+        return delegate.getKeywords();
+    }
+
+    @Override
+    public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData) throws SQLException {
+        return delegate.buildIdentifierHelper(builder, dbMetaData);
+    }
+
+    @Override
+    public char openQuote() {
+        return delegate.openQuote();
+    }
+
+    @Override
+    public char closeQuote() {
+        return delegate.closeQuote();
+    }
+
+    @Override
+    public Exporter<Table> getTableExporter() {
+        return delegate.getTableExporter();
+    }
+
+    @Override
+    public Exporter<Sequence> getSequenceExporter() {
+        return delegate.getSequenceExporter();
+    }
+
+    @Override
+    public Exporter<Index> getIndexExporter() {
+        return delegate.getIndexExporter();
+    }
+
+    @Override
+    public Exporter<ForeignKey> getForeignKeyExporter() {
+        return delegate.getForeignKeyExporter();
+    }
+
+    @Override
+    public Exporter<Constraint> getUniqueKeyExporter() {
+        return delegate.getUniqueKeyExporter();
+    }
+
+    @Override
+    public Exporter<AuxiliaryDatabaseObject> getAuxiliaryDatabaseObjectExporter() {
+        return delegate.getAuxiliaryDatabaseObjectExporter();
+    }
+
+    @Override
+    public boolean canCreateCatalog() {
+        return delegate.canCreateCatalog();
+    }
+
+    @Override
+    public String[] getCreateCatalogCommand(String catalogName) {
+        return delegate.getCreateCatalogCommand(catalogName);
+    }
+
+    @Override
+    public String[] getDropCatalogCommand(String catalogName) {
+        return delegate.getDropCatalogCommand(catalogName);
+    }
+
+    @Override
+    public boolean canCreateSchema() {
+        return delegate.canCreateSchema();
+    }
+
+    @Override
+    public String[] getCreateSchemaCommand(String schemaName) {
+        return delegate.getCreateSchemaCommand(schemaName);
+    }
+
+    @Override
+    public String[] getDropSchemaCommand(String schemaName) {
+        return delegate.getDropSchemaCommand(schemaName);
+    }
+
+    @Override
+    public String getCurrentSchemaCommand() {
+        return delegate.getCurrentSchemaCommand();
+    }
+
+    @Override
+    public SchemaNameResolver getSchemaNameResolver() {
+        return delegate.getSchemaNameResolver();
+    }
+
+    @Override
+    public boolean hasAlterTable() {
+        return delegate.hasAlterTable();
+    }
+
+    @Override
+    public boolean dropConstraints() {
+        return delegate.dropConstraints();
+    }
+
+    @Override
+    public boolean qualifyIndexName() {
+        return delegate.qualifyIndexName();
+    }
+
+    @Override
+    public String getAddColumnString() {
+        return delegate.getAddColumnString();
+    }
+
+    @Override
+    public String getAddColumnSuffixString() {
+        return delegate.getAddColumnSuffixString();
+    }
+
+    @Override
+    public String getDropForeignKeyString() {
+        return delegate.getDropForeignKeyString();
+    }
+
+    @Override
+    public String getTableTypeString() {
+        return delegate.getTableTypeString();
+    }
+
+    @Override
+    public String getAddForeignKeyConstraintString(String constraintName, String[] foreignKey, String referencedTable, String[] primaryKey, boolean referencesPrimaryKey) {
+        return delegate.getAddForeignKeyConstraintString(constraintName, foreignKey, referencedTable, primaryKey, referencesPrimaryKey);
+    }
+
+    @Override
+    public String getAddPrimaryKeyConstraintString(String constraintName) {
+        return delegate.getAddPrimaryKeyConstraintString(constraintName);
+    }
+
+    @Override
+    public boolean hasSelfReferentialForeignKeyBug() {
+        return delegate.hasSelfReferentialForeignKeyBug();
+    }
+
+    @Override
+    public String getNullColumnString() {
+        return delegate.getNullColumnString();
+    }
+
+    @Override
+    public boolean supportsCommentOn() {
+        return delegate.supportsCommentOn();
+    }
+
+    @Override
+    public String getTableComment(String comment) {
+        return delegate.getTableComment(comment);
+    }
+
+    @Override
+    public String getColumnComment(String comment) {
+        return delegate.getColumnComment(comment);
+    }
+
+    @Override
+    public boolean supportsIfExistsBeforeTableName() {
+        return delegate.supportsIfExistsBeforeTableName();
+    }
+
+    @Override
+    public boolean supportsIfExistsAfterTableName() {
+        return delegate.supportsIfExistsAfterTableName();
+    }
+
+    @Override
+    public boolean supportsIfExistsBeforeConstraintName() {
+        return delegate.supportsIfExistsBeforeConstraintName();
+    }
+
+    @Override
+    public boolean supportsIfExistsAfterConstraintName() {
+        return delegate.supportsIfExistsAfterConstraintName();
+    }
+
+    @Override
+    public String getDropTableString(String tableName) {
+        return delegate.getDropTableString(tableName);
+    }
+
+    @Override
+    public boolean supportsColumnCheck() {
+        return delegate.supportsColumnCheck();
+    }
+
+    @Override
+    public boolean supportsTableCheck() {
+        return delegate.supportsTableCheck();
+    }
+
+    @Override
+    public boolean supportsCascadeDelete() {
+        return delegate.supportsCascadeDelete();
+    }
+
+    @Override
+    public String getCascadeConstraintsString() {
+        return delegate.getCascadeConstraintsString();
+    }
+
+    @Override
+    public String getCrossJoinSeparator() {
+        return delegate.getCrossJoinSeparator();
+    }
+
+    @Override
+    public ColumnAliasExtractor getColumnAliasExtractor() {
+        return delegate.getColumnAliasExtractor();
+    }
+
+    @Override
+    public boolean supportsEmptyInList() {
+        return delegate.supportsEmptyInList();
+    }
+
+    @Override
+    public boolean areStringComparisonsCaseInsensitive() {
+        return delegate.areStringComparisonsCaseInsensitive();
+    }
+
+    @Override
+    public boolean supportsRowValueConstructorSyntax() {
+        return delegate.supportsRowValueConstructorSyntax();
+    }
+
+    @Override
+    public boolean supportsRowValueConstructorSyntaxInInList() {
+        return delegate.supportsRowValueConstructorSyntaxInInList();
+    }
+
+    @Override
+    public boolean useInputStreamToInsertBlob() {
+        return delegate.useInputStreamToInsertBlob();
+    }
+
+    @Override
+    public boolean supportsParametersInInsertSelect() {
+        return delegate.supportsParametersInInsertSelect();
+    }
+
+    @Override
+    public boolean replaceResultVariableInOrderByClauseWithPosition() {
+        return delegate.replaceResultVariableInOrderByClauseWithPosition();
+    }
+
+    @Override
+    public String renderOrderByElement(String expression, String collation, String order, NullPrecedence nulls) {
+        return delegate.renderOrderByElement(expression, collation, order, nulls);
+    }
+
+    @Override
+    public boolean requiresCastingOfParametersInSelectClause() {
+        return delegate.requiresCastingOfParametersInSelectClause();
+    }
+
+    @Override
+    public boolean supportsResultSetPositionQueryMethodsOnForwardOnlyCursor() {
+        return delegate.supportsResultSetPositionQueryMethodsOnForwardOnlyCursor();
+    }
+
+    @Override
+    public boolean supportsCircularCascadeDeleteConstraints() {
+        return delegate.supportsCircularCascadeDeleteConstraints();
+    }
+
+    @Override
+    public boolean supportsSubselectAsInPredicateLHS() {
+        return delegate.supportsSubselectAsInPredicateLHS();
+    }
+
+    @Override
+    public boolean supportsExpectedLobUsagePattern() {
+        return delegate.supportsExpectedLobUsagePattern();
+    }
+
+    @Override
+    public boolean supportsLobValueChangePropogation() {
+        return delegate.supportsLobValueChangePropogation();
+    }
+
+    @Override
+    public boolean supportsUnboundedLobLocatorMaterialization() {
+        return delegate.supportsUnboundedLobLocatorMaterialization();
+    }
+
+    @Override
+    public boolean supportsSubqueryOnMutatingTable() {
+        return delegate.supportsSubqueryOnMutatingTable();
+    }
+
+    @Override
+    public boolean supportsExistsInSelect() {
+        return delegate.supportsExistsInSelect();
+    }
+
+    @Override
+    public boolean doesReadCommittedCauseWritersToBlockReaders() {
+        return delegate.doesReadCommittedCauseWritersToBlockReaders();
+    }
+
+    @Override
+    public boolean doesRepeatableReadCauseReadersToBlockWriters() {
+        return delegate.doesRepeatableReadCauseReadersToBlockWriters();
+    }
+
+    @Override
+    public boolean supportsBindAsCallableArgument() {
+        return delegate.supportsBindAsCallableArgument();
+    }
+
+    @Override
+    public boolean supportsTupleCounts() {
+        return delegate.supportsTupleCounts();
+    }
+
+    @Override
+    public boolean supportsTupleDistinctCounts() {
+        return delegate.supportsTupleDistinctCounts();
+    }
+
+    @Override
+    public boolean requiresParensForTupleDistinctCounts() {
+        return delegate.requiresParensForTupleDistinctCounts();
+    }
+
+    @Override
+    public int getInExpressionCountLimit() {
+        return delegate.getInExpressionCountLimit();
+    }
+
+    @Override
+    public boolean forceLobAsLastValue() {
+        return delegate.forceLobAsLastValue();
+    }
+
+    @Override
+    public boolean useFollowOnLocking() {
+        return delegate.useFollowOnLocking();
+    }
+
+    @Override
+    public String getNotExpression(String expression) {
+        return delegate.getNotExpression(expression);
+    }
+
+    @Override
+    public UniqueDelegate getUniqueDelegate() {
+        return delegate.getUniqueDelegate();
+    }
+
+    @Override
+    @Deprecated
+    public boolean supportsUnique() {
+        return delegate.supportsUnique();
+    }
+
+    @Override
+    @Deprecated
+    public boolean supportsUniqueConstraintInCreateAlterTable() {
+        return delegate.supportsUniqueConstraintInCreateAlterTable();
+    }
+
+    @Override
+    @Deprecated
+    public String getAddUniqueConstraintString(String constraintName) {
+        return delegate.getAddUniqueConstraintString(constraintName);
+    }
+
+    @Override
+    @Deprecated
+    public boolean supportsNotNullUnique() {
+        return delegate.supportsNotNullUnique();
+    }
+
+    @Override
+    public String getQueryHintString(String query, List<String> hints) {
+        return delegate.getQueryHintString(query, hints);
+    }
+
+    @Override
+    public ScrollMode defaultScrollMode() {
+        return delegate.defaultScrollMode();
+    }
+
+    @Override
+    public boolean supportsTuplesInSubqueries() {
+        return delegate.supportsTuplesInSubqueries();
+    }
+
+    @Override
+    public CallableStatementSupport getCallableStatementSupport() {
+        return delegate.getCallableStatementSupport();
+    }
+
+    @Override
+    public NameQualifierSupport getNameQualifierSupport() {
+        return delegate.getNameQualifierSupport();
+    }
+
+    @Override
+    public BatchLoadSizingStrategy getDefaultBatchLoadSizingStrategy() {
+        return delegate.getDefaultBatchLoadSizingStrategy();
+    }
+
+    @Override
+    public boolean isJdbcLogWarningsEnabledByDefault() {
+        return delegate.isJdbcLogWarningsEnabledByDefault();
+    }
+
+    @Override
+    public void augmentRecognizedTableTypes(List<String> tableTypesList) {
+        delegate.augmentRecognizedTableTypes(tableTypesList);
+    }
+
+    @Override
+    public boolean supportsPartitionBy() {
+        // NOTE: we can't delegate because this is called in constructor
+        return false;
+    }
+}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53EntityManagerFactoryIntegrator.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53EntityManagerFactoryIntegrator.java
new file mode 100644
index 0000000000..c5959d74d8
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53EntityManagerFactoryIntegrator.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import com.blazebit.apt.service.ServiceProvider;
+import com.blazebit.persistence.integration.hibernate.base.HibernateJpa21Provider;
+import com.blazebit.persistence.integration.hibernate.base.function.AbstractHibernateEntityManagerFactoryIntegrator;
+import com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
+import com.blazebit.persistence.spi.JpaProvider;
+import com.blazebit.persistence.spi.JpaProviderFactory;
+import org.hibernate.Session;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.jpa.HibernateEntityManagerFactory;
+import org.hibernate.persister.collection.CollectionPersister;
+import org.hibernate.persister.entity.EntityPersister;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import java.util.Map;
+
+/**
+ *
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+@ServiceProvider(EntityManagerFactoryIntegrator.class)
+public class Hibernate53EntityManagerFactoryIntegrator extends AbstractHibernateEntityManagerFactoryIntegrator {
+
+    @Override
+    public String getDbms(EntityManagerFactory entityManagerFactory) {
+        if (entityManagerFactory == null) {
+            return null;
+        }
+
+        return getDbmsName(entityManagerFactory.unwrap(SessionFactoryImplementor.class).getDialect());
+    }
+
+    private String getDbms(EntityManager entityManager) {
+        if (entityManager == null) {
+            return null;
+        }
+        Session s = entityManager.unwrap(Session.class);
+        Dialect dialect = getDialect(s);
+        return getDbmsName(dialect);
+    }
+
+    private Map<String, CollectionPersister> getCollectionPersisters(EntityManager em) {
+        if (em == null) {
+            return null;
+        }
+
+        return em.unwrap(SessionImplementor.class).getFactory().getCollectionPersisters();
+    }
+
+    private Map<String, EntityPersister> getEntityPersisters(EntityManager em) {
+        if (em == null) {
+            return null;
+        }
+
+        return em.unwrap(SessionImplementor.class).getFactory().getEntityPersisters();
+    }
+
+    @Override
+    public JpaProviderFactory getJpaProviderFactory(final EntityManagerFactory entityManagerFactory) {
+        return new JpaProviderFactory() {
+            @Override
+            public JpaProvider createJpaProvider(EntityManager em) {
+                SessionFactoryImplementor factory = null;
+                if (em == null) {
+                    if (entityManagerFactory instanceof SessionFactoryImplementor) {
+                        factory = (SessionFactoryImplementor) entityManagerFactory;
+                    } else if (entityManagerFactory instanceof HibernateEntityManagerFactory) {
+                        factory = (SessionFactoryImplementor) ((HibernateEntityManagerFactory) entityManagerFactory).getSessionFactory();
+                    }
+                    if (factory == null && entityManagerFactory != null) {
+                        factory = entityManagerFactory.unwrap(SessionFactoryImplementor.class);
+                    }
+                    if (factory != null) {
+                        return new HibernateJpa21Provider(getDbmsName(factory.getDialect()), factory.getEntityPersisters(), factory.getCollectionPersisters(), MAJOR, MINOR, FIX);
+                    }
+                }
+                return new HibernateJpa21Provider(getDbms(em), getEntityPersisters(em), getCollectionPersisters(em), MAJOR, MINOR, FIX);
+            }
+        };
+    }
+}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53Integrator.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53Integrator.java
new file mode 100644
index 0000000000..68e8f2c5a9
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53Integrator.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import com.blazebit.apt.service.ServiceProvider;
+import com.blazebit.persistence.CTE;
+import com.blazebit.persistence.integration.hibernate.base.Database;
+import com.blazebit.persistence.integration.hibernate.base.MultiIterator;
+import com.blazebit.persistence.integration.hibernate.base.SimpleDatabase;
+import com.blazebit.persistence.integration.hibernate.base.TableNameFormatter;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.model.relational.Namespace;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.integrator.spi.Integrator;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Table;
+import org.hibernate.persister.spi.PersisterClassResolver;
+import org.hibernate.service.spi.SessionFactoryServiceRegistry;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.logging.Logger;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+@ServiceProvider(Integrator.class)
+public class Hibernate53Integrator implements Integrator {
+
+    private static final Logger LOG = Logger.getLogger(Hibernate53Integrator.class.getName());
+    
+    @Override
+    public void integrate(Metadata metadata, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
+        // TODO: remember metadata for exact column types
+        for (PersistentClass clazz : metadata.getEntityBindings()) {
+            Class<?> entityClass = clazz.getMappedClass();
+            
+            if (entityClass.isAnnotationPresent(CTE.class)) {
+                clazz.getTable().setSubselect("select * from " + clazz.getJpaEntityName());
+                // TODO: check that no collections are mapped
+            }
+        }
+
+        serviceRegistry.locateServiceBinding(PersisterClassResolver.class).setService(new CustomPersisterClassResolver());
+        TableNameFormatter formatter = new NativeTableNameFormatter(sessionFactory.getJdbcServices().getJdbcEnvironment().getQualifiedObjectNameFormatter());
+        serviceRegistry.locateServiceBinding(Database.class).setService(new SimpleDatabase(getTableIterator(metadata.getDatabase().getNamespaces()), sessionFactory.getDialect(), formatter, metadata));
+    }
+
+    private Iterator<Table> getTableIterator(Iterable<Namespace> namespaces) {
+        List<Iterator<Table>> iterators = new ArrayList<>();
+        Iterator<Namespace> namespaceIterator = namespaces.iterator();
+
+        while (namespaceIterator.hasNext()) {
+            iterators.add(namespaceIterator.next().getTables().iterator());
+        }
+
+        return new MultiIterator<>(iterators);
+    }
+
+    @Override
+    public void disintegrate(SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
+    }
+
+}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53LimitHandler.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53LimitHandler.java
new file mode 100644
index 0000000000..c0a33e5ac7
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53LimitHandler.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import com.blazebit.persistence.spi.DbmsDialect;
+import com.blazebit.persistence.spi.DbmsLimitHandler;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.pagination.LimitHandler;
+import org.hibernate.engine.spi.RowSelection;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class Hibernate53LimitHandler implements LimitHandler {
+
+    private final DbmsLimitHandler limitHandler;
+    private Integer limit;
+    private Integer offset;
+
+    public Hibernate53LimitHandler(Dialect dialect, DbmsDialect dbmsDialect) {
+        this.limitHandler = dbmsDialect.createLimitHandler();
+    }
+
+    @Override
+    public boolean supportsLimit() {
+        return limitHandler.supportsLimit();
+    }
+
+    @Override
+    public boolean supportsLimitOffset() {
+        return limitHandler.supportsLimitOffset();
+    }
+
+    @Override
+    public String processSql(String sql, RowSelection selection) {
+        if (selection == null || selection.getMaxRows() == null || selection.getMaxRows().intValue() == Integer.MAX_VALUE) {
+            this.limit = null;
+        } else {
+            this.limit = selection.getMaxRows();
+        }
+        if (selection == null || selection.getFirstRow() == null || selection.getFirstRow().intValue() < 1) {
+            this.offset = null;
+        } else {
+            this.offset = selection.getFirstRow();
+        }
+        return limitHandler.applySql(sql, false, limit, offset);
+    }
+
+    @Override
+    public int bindLimitParametersAtStartOfQuery(RowSelection selection, PreparedStatement statement, int index) throws SQLException {
+        return limitHandler.bindLimitParametersAtStartOfQuery(limit, offset, statement, index);
+    }
+
+    @Override
+    public int bindLimitParametersAtEndOfQuery(RowSelection selection, PreparedStatement statement, int index) throws SQLException {
+        return limitHandler.bindLimitParametersAtEndOfQuery(limit, offset, statement, index);
+    }
+
+    @Override
+    public void setMaxRows(RowSelection selection, PreparedStatement statement) throws SQLException {
+        limitHandler.setMaxRows(limit, offset, statement);
+    }
+}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53LimitHandlingDialect.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53LimitHandlingDialect.java
new file mode 100644
index 0000000000..d6524d0305
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53LimitHandlingDialect.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import com.blazebit.persistence.spi.DbmsDialect;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.pagination.LimitHandler;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class Hibernate53LimitHandlingDialect extends Hibernate53DelegatingDialect {
+
+    private final DbmsDialect dbmsDialect;
+
+    public Hibernate53LimitHandlingDialect(Dialect delegate, DbmsDialect dbmsDialect) {
+        super(delegate);
+        this.dbmsDialect = dbmsDialect;
+    }
+
+    @Override
+    public LimitHandler getLimitHandler() {
+        return new Hibernate53LimitHandler(this, dbmsDialect);
+    }
+
+}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53MetadataContributor.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53MetadataContributor.java
new file mode 100644
index 0000000000..bcb9a0b0c8
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53MetadataContributor.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import org.hibernate.boot.internal.ClassLoaderAccessImpl;
+import org.hibernate.boot.internal.MetadataBuildingContextRootImpl;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.spi.ClassLoaderAccess;
+import org.hibernate.boot.spi.InFlightMetadataCollector;
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.boot.spi.MetadataBuildingOptions;
+import org.hibernate.boot.spi.MetadataContributor;
+import org.hibernate.cfg.AnnotationBinder;
+import org.hibernate.cfg.InheritanceState;
+import org.jboss.jandex.IndexView;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class Hibernate53MetadataContributor implements MetadataContributor {
+
+    @Override
+    public void contribute(InFlightMetadataCollector metadataCollector, IndexView jandexIndex) {
+        // Skip if already registered
+        if (metadataCollector.getEntityBinding("com.blazebit.persistence.impl.function.entity.ValuesEntity") != null) {
+            return;
+        }
+
+        MetadataBuildingOptions options = metadataCollector.getMetadataBuildingOptions();
+        final ClassLoaderService classLoaderService = options.getServiceRegistry().getService( ClassLoaderService.class );
+
+        final ClassLoaderAccess classLoaderAccess = new ClassLoaderAccessImpl(
+                options.getTempClassLoader(),
+                classLoaderService
+        );
+
+        MetadataBuildingContext metadataBuildingContext = new MetadataBuildingContextRootImpl(
+                options,
+                classLoaderAccess,
+                metadataCollector);
+
+        addEntity("com.blazebit.persistence.impl.function.entity.ValuesEntity", metadataBuildingContext);
+    }
+
+    private void addEntity(String className, MetadataBuildingContext metadataBuildingContext) {
+        try {
+            MetadataBuildingOptions options = metadataBuildingContext.getBuildingOptions();
+            Object /*ReflectionManager*/ reflectionManager = MetadataBuildingOptions.class.getMethod("getReflectionManager").invoke(options);
+            //            Object /*XClass*/ clazz = reflectionManager.classForName(className);
+            Method classForName = reflectionManager.getClass().getMethod("classForName", String.class);
+            Object /*XClass*/ clazz = classForName.invoke(reflectionManager, className);
+            Map<Object /*XClass*/, InheritanceState> inheritanceStatePerClass = new HashMap<Object /*XClass*/, InheritanceState>(1);
+
+            //        InheritanceState state = new InheritanceState(clazz, inheritanceStatePerClass, metadataBuildingContext);
+            InheritanceState state = InheritanceState.class.getConstructor(classForName.getReturnType(), Map.class, MetadataBuildingContext.class)
+                    .newInstance(clazz, inheritanceStatePerClass, metadataBuildingContext);
+
+            inheritanceStatePerClass.put(clazz, state);
+
+            //        AnnotationBinder.bindClass(clazz, inheritanceStatePerClass, metadataBuildingContext);
+            AnnotationBinder.class.getMethod("bindClass", classForName.getReturnType(), Map.class, MetadataBuildingContext.class)
+                    .invoke(null, clazz, inheritanceStatePerClass, metadataBuildingContext);
+        } catch (RuntimeException ex) {
+            throw ex;
+        } catch (Exception ex) {
+            throw new RuntimeException("Could not add entity", ex);
+        }
+    }
+}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53ServiceContributor.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53ServiceContributor.java
new file mode 100644
index 0000000000..dca4b23ea0
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53ServiceContributor.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import com.blazebit.apt.service.ServiceProvider;
+import com.blazebit.persistence.integration.hibernate.base.Database;
+import org.hibernate.boot.registry.StandardServiceInitiator;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.service.Service;
+import org.hibernate.service.spi.ServiceContributor;
+import org.hibernate.service.spi.ServiceRegistryImplementor;
+
+import java.util.Map;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+@ServiceProvider(ServiceContributor.class)
+public class Hibernate53ServiceContributor implements ServiceContributor {
+
+    @Override
+    public void contribute(StandardServiceRegistryBuilder serviceRegistryBuilder) {
+        serviceRegistryBuilder.addInitiator(new StandardServiceInitiator() {
+            @Override
+            public Service initiateService(Map configurationValues, ServiceRegistryImplementor registry) {
+                return null;
+            }
+
+            @Override
+            public Class getServiceInitiated() {
+                return Database.class;
+            }
+        });
+    }
+}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53SessionFactoryInvocationHandler.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53SessionFactoryInvocationHandler.java
new file mode 100644
index 0000000000..6bc89029a7
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53SessionFactoryInvocationHandler.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class Hibernate53SessionFactoryInvocationHandler implements InvocationHandler {
+
+    private final SessionFactoryImplementor delegate;
+    private final Object dialect;
+
+    public Hibernate53SessionFactoryInvocationHandler(SessionFactoryImplementor delegate, Object dialect) {
+        this.delegate = delegate;
+        this.dialect = dialect;
+    }
+
+    @Override
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        if ("getDialect".equals(method.getName())) {
+            return dialect;
+        }
+        
+        return method.invoke(delegate, args);
+    }
+
+}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53SessionInvocationHandler.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53SessionInvocationHandler.java
new file mode 100644
index 0000000000..1fa8826c6e
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53SessionInvocationHandler.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import org.hibernate.engine.spi.SessionImplementor;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class Hibernate53SessionInvocationHandler implements InvocationHandler {
+    
+    private final SessionImplementor delegate;
+    private final Object jdbcCoordinatorProxy;
+
+    public Hibernate53SessionInvocationHandler(SessionImplementor delegate, Object jdbcCoordinatorProxy) {
+        this.delegate = delegate;
+        this.jdbcCoordinatorProxy = jdbcCoordinatorProxy;
+    }
+
+    @Override
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        if ("getJdbcCoordinator".equals(method.getName())) {
+            return jdbcCoordinatorProxy;
+        }
+        
+        return method.invoke(delegate, args);
+    }
+
+}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java
new file mode 100644
index 0000000000..fead1a48ab
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
+import com.blazebit.persistence.spi.DbmsDialect;
+import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
+import org.hibernate.engine.jdbc.spi.StatementPreparer;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class JdbcCoordinatorInvocationHandler implements InvocationHandler {
+    
+    private final JdbcCoordinator delegate;
+    private final SessionFactoryImplementor sessionFactoryImplementor;
+    private final DbmsDialect dbmsDialect;
+    private final String[][] columns;
+    private final int[] returningSqlTypes;
+    private final HibernateReturningResult<?> returningResult;
+    private transient StatementPreparer statementPreparer;
+
+    public JdbcCoordinatorInvocationHandler(JdbcCoordinator delegate, SessionFactoryImplementor sessionFactoryImplementor, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult) {
+        this.delegate = delegate;
+        this.sessionFactoryImplementor = sessionFactoryImplementor;
+        this.dbmsDialect = dbmsDialect;
+        this.columns = columns;
+        this.returningSqlTypes = returningSqlTypes;
+        this.returningResult = returningResult;
+    }
+
+    @Override
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        if ("getStatementPreparer".equals(method.getName())) {
+            if (statementPreparer == null) {
+                statementPreparer = new StatementPreparerImpl(delegate, sessionFactoryImplementor, dbmsDialect, columns, returningSqlTypes, returningResult);
+            }
+            
+            return statementPreparer;
+        }
+        
+        return method.invoke(delegate, args);
+    }
+
+}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/NativeTableNameFormatter.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/NativeTableNameFormatter.java
new file mode 100644
index 0000000000..69e234cee0
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/NativeTableNameFormatter.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import com.blazebit.persistence.integration.hibernate.base.TableNameFormatter;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.jdbc.env.spi.QualifiedObjectNameFormatter;
+import org.hibernate.mapping.Table;
+
+/**
+ *
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class NativeTableNameFormatter implements TableNameFormatter {
+
+    private final QualifiedObjectNameFormatter formatter;
+
+    public NativeTableNameFormatter(QualifiedObjectNameFormatter formatter) {
+        this.formatter = formatter;
+    }
+
+    @Override
+    public String getQualifiedTableName(Dialect dialect, Table table) {
+        return formatter.format(table.getQualifiedTableName(), dialect);
+    }
+}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java
new file mode 100644
index 0000000000..cd2449bdeb
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
+import com.blazebit.persistence.integration.hibernate.base.ResultSetInvocationHandler;
+import com.blazebit.persistence.spi.DbmsDialect;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class PreparedStatementInvocationHandler implements InvocationHandler {
+
+    private final PreparedStatement delegate;
+    private final DbmsDialect dbmsDialect;
+    private final Map<String, Integer> aliasIndex;
+    private final HibernateReturningResult<?> returningResult;
+
+    public PreparedStatementInvocationHandler(PreparedStatement delegate, DbmsDialect dbmsDialect, String[][] columns, HibernateReturningResult<?> returningResult) {
+        this.delegate = delegate;
+        this.dbmsDialect = dbmsDialect;
+        this.aliasIndex = new HashMap<String, Integer>(columns.length);
+        this.returningResult = returningResult;
+        
+        for (int i = 0; i < columns.length; i++) {
+            aliasIndex.put(columns[i][1], i + 1);
+        }
+    }
+
+    @Override
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        if ("executeQuery".equals(method.getName()) && method.getParameterTypes().length == 0) {
+            ResultSet rs;
+            HibernateReturningResult<?> result;
+            
+            if (delegate.execute()) {
+                rs = delegate.getResultSet();
+                result = returningResult;
+            } else {
+                result = null;
+                returningResult.setUpdateCount(delegate.getUpdateCount());
+                rs = dbmsDialect.extractReturningResult(delegate);
+            }
+            
+            return Proxy.newProxyInstance(rs.getClass().getClassLoader(), new Class[]{ ResultSet.class }, new ResultSetInvocationHandler(rs, aliasIndex, result));
+        }
+        
+        return method.invoke(delegate, args);
+    }
+
+}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java
new file mode 100644
index 0000000000..4a23f83c4c
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2014 - 2018 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.blazebit.persistence.integration.hibernate;
+
+import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
+import com.blazebit.persistence.spi.DbmsDialect;
+import org.hibernate.ScrollMode;
+import org.hibernate.boot.spi.SessionFactoryOptions;
+import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
+import org.hibernate.engine.jdbc.spi.StatementPreparer;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor;
+
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class StatementPreparerImpl implements StatementPreparer {
+
+    private JdbcCoordinator jdbcCoordinator;
+    private SessionFactoryImplementor sessionFactoryImplementor;
+    private DbmsDialect dbmsDialect;
+    private String[][] columns;
+    private int[] returningSqlTypes;
+    private HibernateReturningResult<?> returningResult;
+
+    public StatementPreparerImpl(JdbcCoordinator jdbcCoordinator, SessionFactoryImplementor sessionFactoryImplementor, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult) {
+        this.jdbcCoordinator = jdbcCoordinator;
+        this.sessionFactoryImplementor = sessionFactoryImplementor;
+        this.dbmsDialect = dbmsDialect;
+        this.columns = columns;
+        this.returningSqlTypes = returningSqlTypes;
+        this.returningResult = returningResult;
+    }
+
+    protected final SessionFactoryOptions settings() {
+        return sessionFactoryImplementor.getSessionFactoryOptions();
+    }
+
+    protected final Connection connection() {
+        return logicalConnection().getPhysicalConnection();
+    }
+
+    protected final LogicalConnectionImplementor logicalConnection() {
+        return jdbcCoordinator.getLogicalConnection();
+    }
+
+    protected final SqlExceptionHelper sqlExceptionHelper() {
+        return getJdbcService().getSqlExceptionHelper();
+    }
+
+    @Override
+    public Statement createStatement() {
+        throw new UnsupportedOperationException("Not yet implemented!");
+    }
+
+    @Override
+    public PreparedStatement prepareStatement(String sql) {
+        throw new UnsupportedOperationException("Not yet implemented!");
+    }
+
+    @Override
+    public PreparedStatement prepareStatement(String sql, final boolean isCallable) {
+        throw new UnsupportedOperationException("Not yet implemented!");
+    }
+
+    private void checkAutoGeneratedKeysSupportEnabled() {
+        // Not sure if we should respect this
+//        if (!settings().isGetGeneratedKeysEnabled()) {
+//            throw new AssertionFailure("getGeneratedKeys() support is not enabled");
+//        }
+    }
+
+    @Override
+    public PreparedStatement prepareStatement(String sql, final int autoGeneratedKeys) {
+        throw new UnsupportedOperationException("Not yet implemented!");
+    }
+
+    @Override
+    public PreparedStatement prepareStatement(String sql, final String[] columnNames) {
+        throw new UnsupportedOperationException("Not yet implemented!");
+    }
+
+    @Override
+    public PreparedStatement prepareQueryStatement(String sql, final boolean isCallable, final ScrollMode scrollMode) {
+        checkAutoGeneratedKeysSupportEnabled();
+        jdbcCoordinator.executeBatch();
+        PreparedStatement ps = new QueryStatementPreparationTemplate(sql) {
+
+            public PreparedStatement doPrepare() throws SQLException {
+                PreparedStatement ps;
+                ps = connection().prepareStatement(sql, dbmsDialect.getPrepareFlags());
+                return dbmsDialect.prepare(ps, returningSqlTypes);
+            }
+        }.prepareStatement();
+        ps = (PreparedStatement) Proxy.newProxyInstance(ps.getClass().getClassLoader(), new Class[]{PreparedStatement.class}, new PreparedStatementInvocationHandler(ps, dbmsDialect, columns, returningResult));
+        jdbcCoordinator.registerLastQuery(ps);
+        return ps;
+    }
+
+    /**
+     * @author Christian Beikov
+     * @since 1.2.0
+     */
+    private abstract class StatementPreparationTemplate {
+
+        protected final String sql;
+
+        protected StatementPreparationTemplate(String incomingSql) {
+            final String inspectedSql = jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getStatementInspector().inspect(incomingSql);
+            this.sql = inspectedSql == null ? incomingSql : inspectedSql;
+        }
+
+        public PreparedStatement prepareStatement() {
+            try {
+                getJdbcService().getSqlStatementLogger().logStatement(sql);
+
+                final PreparedStatement preparedStatement;
+                try {
+                    jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getObserver().jdbcPrepareStatementStart();
+                    preparedStatement = doPrepare();
+                    setStatementTimeout(preparedStatement);
+                } finally {
+                    jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getObserver().jdbcPrepareStatementEnd();
+                }
+                postProcess(preparedStatement);
+                return preparedStatement;
+            } catch (SQLException e) {
+                throw sqlExceptionHelper().convert(e, "could not prepare statement", sql);
+            }
+        }
+
+        protected abstract PreparedStatement doPrepare() throws SQLException;
+
+        public void postProcess(PreparedStatement preparedStatement) throws SQLException {
+            jdbcCoordinator.getResourceRegistry().register(preparedStatement, true);
+            //          logicalConnection().notifyObserversStatementPrepared();
+        }
+
+        private void setStatementTimeout(PreparedStatement preparedStatement) throws SQLException {
+            final int remainingTransactionTimeOutPeriod = jdbcCoordinator.determineRemainingTransactionTimeOutPeriod();
+            if (remainingTransactionTimeOutPeriod > 0) {
+                preparedStatement.setQueryTimeout(remainingTransactionTimeOutPeriod);
+            }
+        }
+    }
+
+    private JdbcServices getJdbcService() {
+        return jdbcCoordinator
+                .getJdbcSessionOwner()
+                .getJdbcSessionContext()
+                .getServiceRegistry()
+                .getService(JdbcServices.class);
+    }
+
+    /**
+     * @author Christian Beikov
+     * @since 1.2.0
+     */
+    private abstract class QueryStatementPreparationTemplate extends StatementPreparationTemplate {
+
+        protected QueryStatementPreparationTemplate(String sql) {
+            super(sql);
+        }
+
+        public void postProcess(PreparedStatement preparedStatement) throws SQLException {
+            super.postProcess(preparedStatement);
+            setStatementFetchSize(preparedStatement);
+        }
+    }
+
+    private void setStatementFetchSize(PreparedStatement statement) throws SQLException {
+        if (settings().getJdbcFetchSize() != null) {
+            statement.setFetchSize(settings().getJdbcFetchSize());
+        }
+    }
+
+}
diff --git a/integration/hibernate-5.3/src/main/resources/META-INF/services/org.hibernate.boot.spi.MetadataContributor b/integration/hibernate-5.3/src/main/resources/META-INF/services/org.hibernate.boot.spi.MetadataContributor
new file mode 100644
index 0000000000..ae1f7f3ebd
--- /dev/null
+++ b/integration/hibernate-5.3/src/main/resources/META-INF/services/org.hibernate.boot.spi.MetadataContributor
@@ -0,0 +1,16 @@
+#
+# Copyright 2014 - 2018 Blazebit.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+com.blazebit.persistence.integration.hibernate.Hibernate53MetadataContributor
\ No newline at end of file
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5Access.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5Access.java
index c75069be0d..69d7bf53a0 100644
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5Access.java
+++ b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5Access.java
@@ -36,9 +36,11 @@
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.TypedValue;
 import org.hibernate.event.spi.EventSource;
+import org.hibernate.hql.internal.ast.ParameterTranslationsImpl;
 import org.hibernate.hql.internal.ast.exec.BasicExecutor;
 import org.hibernate.hql.internal.ast.exec.StatementExecutor;
 import org.hibernate.hql.internal.classic.ParserHelper;
+import org.hibernate.hql.spi.ParameterTranslations;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.loader.hql.QueryLoader;
 import org.hibernate.param.ParameterSpecification;
@@ -313,4 +315,9 @@ public QueryParameters createQueryParameters(
         );
     }
 
+    @Override
+    public ParameterTranslations createParameterTranslations(List<ParameterSpecification> queryParameterSpecifications) {
+        return new ParameterTranslationsImpl(queryParameterSpecifications);
+    }
+
 }
diff --git a/integration/hibernate-6.0/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate60Access.java b/integration/hibernate-6.0/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate60Access.java
index ef72f8c0c0..35fb6e71f3 100644
--- a/integration/hibernate-6.0/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate60Access.java
+++ b/integration/hibernate-6.0/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate60Access.java
@@ -34,8 +34,10 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.engine.spi.TypedValue;
 import org.hibernate.event.spi.EventSource;
+import org.hibernate.hql.internal.ast.ParameterTranslationsImpl;
 import org.hibernate.hql.internal.ast.exec.BasicExecutor;
 import org.hibernate.hql.internal.ast.exec.StatementExecutor;
+import org.hibernate.hql.spi.ParameterTranslations;
 import org.hibernate.loader.hql.QueryLoader;
 import org.hibernate.param.ParameterSpecification;
 import org.hibernate.query.internal.AbstractProducedQuery;
@@ -207,4 +209,9 @@ public QueryParameters createQueryParameters(
         );
     }
 
+    @Override
+    public ParameterTranslations createParameterTranslations(List<ParameterSpecification> queryParameterSpecifications) {
+        return new ParameterTranslationsImpl(queryParameterSpecifications);
+    }
+
 }
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateAccess.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateAccess.java
index a2718141b2..2134e635b8 100644
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateAccess.java
+++ b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateAccess.java
@@ -27,6 +27,7 @@
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.TypedValue;
 import org.hibernate.hql.internal.ast.exec.StatementExecutor;
+import org.hibernate.hql.spi.ParameterTranslations;
 import org.hibernate.loader.hql.QueryLoader;
 import org.hibernate.param.ParameterSpecification;
 import org.hibernate.type.Type;
@@ -85,4 +86,6 @@ public QueryParameters createQueryParameters(
             final String comment,
             final List<String> queryHints,
             final Serializable[] collectionKeys);
+
+    public ParameterTranslations createParameterTranslations(List<ParameterSpecification> queryParameterSpecifications);
 }
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateExtendedQuerySupport.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateExtendedQuerySupport.java
index b657d63ce6..2010e4bf6e 100644
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateExtendedQuerySupport.java
+++ b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateExtendedQuerySupport.java
@@ -43,7 +43,6 @@
 import org.hibernate.event.spi.EventType;
 import org.hibernate.hql.internal.QueryExecutionRequestException;
 import org.hibernate.hql.internal.antlr.SqlTokenTypes;
-import org.hibernate.hql.internal.ast.ParameterTranslationsImpl;
 import org.hibernate.hql.internal.ast.exec.BasicExecutor;
 import org.hibernate.hql.internal.ast.exec.DeleteExecutor;
 import org.hibernate.hql.internal.ast.exec.StatementExecutor;
@@ -893,7 +892,7 @@ private void prepareQueryPlan(HQLQueryPlan queryPlan, List<ParameterSpecificatio
             }
             
             // Prepare queryTranslator for aggregated parameters
-            ParameterTranslations translations = new ParameterTranslationsImpl(queryParameterSpecifications);
+            ParameterTranslations translations = hibernateAccess.createParameterTranslations(queryParameterSpecifications);
             setField(queryTranslator, "paramTranslations", translations);
             setField(queryTranslator, "collectedParameterSpecifications", queryParameterSpecifications);
         } catch (Exception e1) {
diff --git a/integration/pom.xml b/integration/pom.xml
index d6edb1a39d..ded1e24b3f 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -37,8 +37,10 @@
         <module>hibernate-4.3</module>
         <module>hibernate-5</module>
         <module>hibernate-5.2</module>
+        <module>hibernate-5.3</module>
         <module>hibernate-6.0</module>
         <module>datanucleus</module>
+        <module>datanucleus-5.1</module>
         <module>eclipselink</module>
         <module>openjpa</module>
         <module>entity-view-cdi</module>
diff --git a/integration/spring-data/1.x/pom.xml b/integration/spring-data/1.x/pom.xml
index 42b40f2153..fd89cdc980 100644
--- a/integration/spring-data/1.x/pom.xml
+++ b/integration/spring-data/1.x/pom.xml
@@ -93,1275 +93,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <!-- RDBMS profiles -->
-        <profile>
-            <id>h2</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoH2,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:h2:mem:test</jdbc.url>
-                                <jdbc.user>admin</jdbc.user>
-                                <jdbc.password>admin</jdbc.password>
-                                <jdbc.driver>org.h2.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.h2database</groupId>
-                    <artifactId>h2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mysql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://localhost:3306/test?useUnicode=true&amp;characterEncoding=utf8</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>postgresql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:postgresql://localhost:5432/test</jdbc.url>
-                                <jdbc.user>postgres</jdbc.user>
-                                <jdbc.password>postgres</jdbc.password>
-                                <jdbc.driver>org.postgresql.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.postgresql</groupId>
-                    <artifactId>postgresql</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>sqlite</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlite:test.db</jdbc.url>
-                                <jdbc.user />
-                                <jdbc.password />
-                                <jdbc.driver>org.sqlite.JDBC</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.xerial</groupId>
-                    <artifactId>sqlite-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>db2</id>
-            <!-- In order to use this profile, you have to install the db2 driver
-                jars via: mvn -q install:install-file -Dfile=/PATH/TO/db2jcc4.jar -DgroupId=com.ibm.db2
-                -DartifactId=db2jcc4 -Dversion=9.7 -Dpackaging=jar -DgeneratePom=true mvn
-                -q install:install-file -Dfile=/PATH/TO/db2jcc_license_cu.jar -DgroupId=com.ibm.db2
-                -DartifactId=db2jcc_license_cu -Dversion=9.7 -Dpackaging=jar -DgeneratePom=true -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDB2,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:db2://localhost:50000/test</jdbc.url>
-                                <jdbc.user>db2inst1</jdbc.user>
-                                <jdbc.password>db2inst1-pwd</jdbc.password>
-                                <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.ibm.db2</groupId>
-                    <artifactId>db2jcc4</artifactId>
-                    <version>9.7</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.ibm.db2</groupId>
-                    <artifactId>db2jcc_license_cu</artifactId>
-                    <version>9.7</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>firebird</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:firebirdsql:localhost:/tmp/test.fdb</jdbc.url>
-                                <jdbc.user>SYSDBA</jdbc.user>
-                                <jdbc.password>masterkey</jdbc.password>
-                                <jdbc.driver>org.firebirdsql.jdbc.FBDriver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.firebirdsql.jdbc</groupId>
-                    <artifactId>jaybird-jdk16</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>oracle</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:oracle:thin:@localhost:1521/xe</jdbc.url>
-                                <jdbc.user>travis</jdbc.user>
-                                <jdbc.password>travis</jdbc.password>
-                                <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.oracle</groupId>
-                    <artifactId>ojdbc14</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <!-- JPA provider profiles -->
-        <profile>
-            <id>hibernate</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>1.3.0.Final</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <compilerArguments>${processor.plugin.compilerArguments}</compilerArguments>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>1.3.0.Final</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-4.3</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-4.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-4.3}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.0</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.1</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.1}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.2</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.2}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.0</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>JBoss Snapshots</id>
-                    <name>JBoss Snapshots</name>
-                    <url>http://repository.jboss.org/nexus/content/groups/public/</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-6.0}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.0</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.0}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-6.0}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>eclipselink</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink</jpa.excludedGroups>
-                <spring.activeProfiles>eclipselink</spring.activeProfiles>
-                <surefire.jvm.params>-Xms1024m -Xmx2048m -javaagent:${project.build.directory}/agents/spring-instrumentation-agent.jar</surefire.jvm.params>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>eclipselink</artifactId>
-                    <version>${version.eclipselink}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                    <version>${version.eclipselink}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>3.6.10.Final</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>jaxen</groupId>
-                    <artifactId>jaxen</artifactId>
-                    <version>1.1.6</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <eclipselink.persistencexml>${basedir}/src/main/resources/META-INF/persistence.xml</eclipselink.persistencexml>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.eclipse.persistence</groupId>
-                                <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                                <version>${version.eclipselink}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>copy-agent</id>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>org.springframework</groupId>
-                                            <artifactId>spring-instrument</artifactId>
-                                            <outputDirectory>${project.build.directory}/agents</outputDirectory>
-                                            <destFileName>spring-instrumentation-agent.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <!-- Only need this for IntelliJ -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>-javaagent:${project.build.directory}/agents/spring-instrumentation-agent.jar</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus,com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4</jpa.excludedGroups>
-                <spring.activeProfiles>datanucleus</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TEST-PU</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- The old version has a bug when generating the static metamodel for PolymorphicPropertyMapBase -->
-                            <dependency>
-                                <groupId>org.datanucleus</groupId>
-                                <artifactId>datanucleus-jpa-query</artifactId>
-                                <version>${version.datanucleus.jpa-5}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-                <spring.activeProfiles>datanucleus</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TEST-PU</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>openjpa</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA</jpa.excludedGroups>
-                <spring.activeProfiles>openjpa</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.openjpa</groupId>
-                    <artifactId>openjpa-all</artifactId>
-                    <version>${version.openjpa}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-openjpa</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.apache.openjpa.persistence.meta.AnnotationProcessor6</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <openjpa.metamodel>true</openjpa.metamodel>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.openjpa</groupId>
-                                <artifactId>openjpa-all</artifactId>
-                                <version>${version.openjpa}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>
\ No newline at end of file
diff --git a/integration/spring-data/2.x/pom.xml b/integration/spring-data/2.x/pom.xml
index 3806879f38..56695368ff 100644
--- a/integration/spring-data/2.x/pom.xml
+++ b/integration/spring-data/2.x/pom.xml
@@ -95,1275 +95,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <!-- RDBMS profiles -->
-        <profile>
-            <id>h2</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoH2,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:h2:mem:test</jdbc.url>
-                                <jdbc.user>admin</jdbc.user>
-                                <jdbc.password>admin</jdbc.password>
-                                <jdbc.driver>org.h2.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.h2database</groupId>
-                    <artifactId>h2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mysql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://localhost:3306/test?useUnicode=true&amp;characterEncoding=utf8</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>postgresql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:postgresql://localhost:5432/test</jdbc.url>
-                                <jdbc.user>postgres</jdbc.user>
-                                <jdbc.password>postgres</jdbc.password>
-                                <jdbc.driver>org.postgresql.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.postgresql</groupId>
-                    <artifactId>postgresql</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>sqlite</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlite:test.db</jdbc.url>
-                                <jdbc.user />
-                                <jdbc.password />
-                                <jdbc.driver>org.sqlite.JDBC</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.xerial</groupId>
-                    <artifactId>sqlite-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>db2</id>
-            <!-- In order to use this profile, you have to install the db2 driver
-                jars via: mvn -q install:install-file -Dfile=/PATH/TO/db2jcc4.jar -DgroupId=com.ibm.db2
-                -DartifactId=db2jcc4 -Dversion=9.7 -Dpackaging=jar -DgeneratePom=true mvn
-                -q install:install-file -Dfile=/PATH/TO/db2jcc_license_cu.jar -DgroupId=com.ibm.db2
-                -DartifactId=db2jcc_license_cu -Dversion=9.7 -Dpackaging=jar -DgeneratePom=true -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDB2,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:db2://localhost:50000/test</jdbc.url>
-                                <jdbc.user>db2inst1</jdbc.user>
-                                <jdbc.password>db2inst1-pwd</jdbc.password>
-                                <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.ibm.db2</groupId>
-                    <artifactId>db2jcc4</artifactId>
-                    <version>9.7</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.ibm.db2</groupId>
-                    <artifactId>db2jcc_license_cu</artifactId>
-                    <version>9.7</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>firebird</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:firebirdsql:localhost:/tmp/test.fdb</jdbc.url>
-                                <jdbc.user>SYSDBA</jdbc.user>
-                                <jdbc.password>masterkey</jdbc.password>
-                                <jdbc.driver>org.firebirdsql.jdbc.FBDriver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.firebirdsql.jdbc</groupId>
-                    <artifactId>jaybird-jdk16</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>oracle</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:oracle:thin:@localhost:1521/xe</jdbc.url>
-                                <jdbc.user>travis</jdbc.user>
-                                <jdbc.password>travis</jdbc.password>
-                                <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.oracle</groupId>
-                    <artifactId>ojdbc14</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <!-- JPA provider profiles -->
-        <profile>
-            <id>hibernate</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>1.3.0.Final</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <compilerArguments>${processor.plugin.compilerArguments}</compilerArguments>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>1.3.0.Final</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-4.3</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-4.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-4.3}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.0</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.1</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.1}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.2</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.2}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.0</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>JBoss Snapshots</id>
-                    <name>JBoss Snapshots</name>
-                    <url>http://repository.jboss.org/nexus/content/groups/public/</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-6.0}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.0</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.0}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-6.0}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>eclipselink</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink</jpa.excludedGroups>
-                <spring.activeProfiles>eclipselink</spring.activeProfiles>
-                <surefire.jvm.params>-Xms1024m -Xmx2048m -javaagent:${project.build.directory}/agents/spring-instrumentation-agent.jar</surefire.jvm.params>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>eclipselink</artifactId>
-                    <version>${version.eclipselink}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                    <version>${version.eclipselink}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>3.6.10.Final</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>jaxen</groupId>
-                    <artifactId>jaxen</artifactId>
-                    <version>1.1.6</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <eclipselink.persistencexml>${basedir}/src/main/resources/META-INF/persistence.xml</eclipselink.persistencexml>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.eclipse.persistence</groupId>
-                                <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                                <version>${version.eclipselink}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>copy-agent</id>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>org.springframework</groupId>
-                                            <artifactId>spring-instrument</artifactId>
-                                            <outputDirectory>${project.build.directory}/agents</outputDirectory>
-                                            <destFileName>spring-instrumentation-agent.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <!-- Only need this for IntelliJ -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>-javaagent:${project.build.directory}/agents/spring-instrumentation-agent.jar</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus,com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4</jpa.excludedGroups>
-                <spring.activeProfiles>datanucleus</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TEST-PU</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- The old version has a bug when generating the static metamodel for PolymorphicPropertyMapBase -->
-                            <dependency>
-                                <groupId>org.datanucleus</groupId>
-                                <artifactId>datanucleus-jpa-query</artifactId>
-                                <version>${version.datanucleus.jpa-5}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-                <spring.activeProfiles>datanucleus</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TEST-PU</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>openjpa</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA</jpa.excludedGroups>
-                <spring.activeProfiles>openjpa</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.openjpa</groupId>
-                    <artifactId>openjpa-all</artifactId>
-                    <version>${version.openjpa}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-openjpa</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.apache.openjpa.persistence.meta.AnnotationProcessor6</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <openjpa.metamodel>true</openjpa.metamodel>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.openjpa</groupId>
-                                <artifactId>openjpa-all</artifactId>
-                                <version>${version.openjpa}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>
\ No newline at end of file
diff --git a/integration/spring-data/base/pom.xml b/integration/spring-data/base/pom.xml
index 20db9f8ad7..b8350cb366 100644
--- a/integration/spring-data/base/pom.xml
+++ b/integration/spring-data/base/pom.xml
@@ -81,1275 +81,6 @@
     </dependencies>
 
     <profiles>
-        <!-- RDBMS profiles -->
-        <profile>
-            <id>h2</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoH2,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:h2:mem:test</jdbc.url>
-                                <jdbc.user>admin</jdbc.user>
-                                <jdbc.password>admin</jdbc.password>
-                                <jdbc.driver>org.h2.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.h2database</groupId>
-                    <artifactId>h2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mysql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://localhost:3306/test?useUnicode=true&amp;characterEncoding=utf8</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>postgresql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:postgresql://localhost:5432/test</jdbc.url>
-                                <jdbc.user>postgres</jdbc.user>
-                                <jdbc.password>postgres</jdbc.password>
-                                <jdbc.driver>org.postgresql.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.postgresql</groupId>
-                    <artifactId>postgresql</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>sqlite</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlite:test.db</jdbc.url>
-                                <jdbc.user />
-                                <jdbc.password />
-                                <jdbc.driver>org.sqlite.JDBC</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.xerial</groupId>
-                    <artifactId>sqlite-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>db2</id>
-            <!-- In order to use this profile, you have to install the db2 driver
-                jars via: mvn -q install:install-file -Dfile=/PATH/TO/db2jcc4.jar -DgroupId=com.ibm.db2
-                -DartifactId=db2jcc4 -Dversion=9.7 -Dpackaging=jar -DgeneratePom=true mvn
-                -q install:install-file -Dfile=/PATH/TO/db2jcc_license_cu.jar -DgroupId=com.ibm.db2
-                -DartifactId=db2jcc_license_cu -Dversion=9.7 -Dpackaging=jar -DgeneratePom=true -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDB2,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:db2://localhost:50000/test</jdbc.url>
-                                <jdbc.user>db2inst1</jdbc.user>
-                                <jdbc.password>db2inst1-pwd</jdbc.password>
-                                <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.ibm.db2</groupId>
-                    <artifactId>db2jcc4</artifactId>
-                    <version>9.7</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.ibm.db2</groupId>
-                    <artifactId>db2jcc_license_cu</artifactId>
-                    <version>9.7</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>firebird</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:firebirdsql:localhost:/tmp/test.fdb</jdbc.url>
-                                <jdbc.user>SYSDBA</jdbc.user>
-                                <jdbc.password>masterkey</jdbc.password>
-                                <jdbc.driver>org.firebirdsql.jdbc.FBDriver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.firebirdsql.jdbc</groupId>
-                    <artifactId>jaybird-jdk16</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>oracle</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:oracle:thin:@localhost:1521/xe</jdbc.url>
-                                <jdbc.user>travis</jdbc.user>
-                                <jdbc.password>travis</jdbc.password>
-                                <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.oracle</groupId>
-                    <artifactId>ojdbc14</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <!-- JPA provider profiles -->
-        <profile>
-            <id>hibernate</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>1.3.0.Final</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <compilerArguments>${processor.plugin.compilerArguments}</compilerArguments>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>1.3.0.Final</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-4.3</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-4.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-4.3}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.0</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.1</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.1}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.2</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.2}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.0</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>JBoss Snapshots</id>
-                    <name>JBoss Snapshots</name>
-                    <url>http://repository.jboss.org/nexus/content/groups/public/</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-6.0}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.0</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.0}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-6.0}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>eclipselink</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink</jpa.excludedGroups>
-                <spring.activeProfiles>eclipselink</spring.activeProfiles>
-                <surefire.jvm.params>-Xms1024m -Xmx2048m -javaagent:${project.build.directory}/agents/spring-instrumentation-agent.jar</surefire.jvm.params>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>eclipselink</artifactId>
-                    <version>${version.eclipselink}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                    <version>${version.eclipselink}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>3.6.10.Final</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>jaxen</groupId>
-                    <artifactId>jaxen</artifactId>
-                    <version>1.1.6</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <eclipselink.persistencexml>${basedir}/src/main/resources/META-INF/persistence.xml</eclipselink.persistencexml>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.eclipse.persistence</groupId>
-                                <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                                <version>${version.eclipselink}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>copy-agent</id>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>org.springframework</groupId>
-                                            <artifactId>spring-instrument</artifactId>
-                                            <outputDirectory>${project.build.directory}/agents</outputDirectory>
-                                            <destFileName>spring-instrumentation-agent.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <!-- Only need this for IntelliJ -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>-javaagent:${project.build.directory}/agents/spring-instrumentation-agent.jar</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus,com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4</jpa.excludedGroups>
-                <spring.activeProfiles>datanucleus</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TEST-PU</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- The old version has a bug when generating the static metamodel for PolymorphicPropertyMapBase -->
-                            <dependency>
-                                <groupId>org.datanucleus</groupId>
-                                <artifactId>datanucleus-jpa-query</artifactId>
-                                <version>${version.datanucleus.jpa-5}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-                <spring.activeProfiles>datanucleus</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TEST-PU</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>openjpa</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA</jpa.excludedGroups>
-                <spring.activeProfiles>openjpa</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.openjpa</groupId>
-                    <artifactId>openjpa-all</artifactId>
-                    <version>${version.openjpa}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-openjpa</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.apache.openjpa.persistence.meta.AnnotationProcessor6</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <openjpa.metamodel>true</openjpa.metamodel>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.openjpa</groupId>
-                                <artifactId>openjpa-all</artifactId>
-                                <version>${version.openjpa}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <!-- Profiles for various Spring-Data versions -->
         <profile>
             <id>spring-data-1.11.x</id>
diff --git a/integration/spring-data/rest/pom.xml b/integration/spring-data/rest/pom.xml
index 9dc5ac32aa..ba1986896f 100644
--- a/integration/spring-data/rest/pom.xml
+++ b/integration/spring-data/rest/pom.xml
@@ -63,1275 +63,6 @@
     </dependencies>
 
     <profiles>
-        <!-- RDBMS profiles -->
-        <profile>
-            <id>h2</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoH2,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:h2:mem:test</jdbc.url>
-                                <jdbc.user>admin</jdbc.user>
-                                <jdbc.password>admin</jdbc.password>
-                                <jdbc.driver>org.h2.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.h2database</groupId>
-                    <artifactId>h2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mysql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://localhost:3306/test?useUnicode=true&amp;characterEncoding=utf8</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>postgresql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:postgresql://localhost:5432/test</jdbc.url>
-                                <jdbc.user>postgres</jdbc.user>
-                                <jdbc.password>postgres</jdbc.password>
-                                <jdbc.driver>org.postgresql.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.postgresql</groupId>
-                    <artifactId>postgresql</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>sqlite</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlite:test.db</jdbc.url>
-                                <jdbc.user />
-                                <jdbc.password />
-                                <jdbc.driver>org.sqlite.JDBC</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.xerial</groupId>
-                    <artifactId>sqlite-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>db2</id>
-            <!-- In order to use this profile, you have to install the db2 driver
-                jars via: mvn -q install:install-file -Dfile=/PATH/TO/db2jcc4.jar -DgroupId=com.ibm.db2
-                -DartifactId=db2jcc4 -Dversion=9.7 -Dpackaging=jar -DgeneratePom=true mvn
-                -q install:install-file -Dfile=/PATH/TO/db2jcc_license_cu.jar -DgroupId=com.ibm.db2
-                -DartifactId=db2jcc_license_cu -Dversion=9.7 -Dpackaging=jar -DgeneratePom=true -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDB2,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:db2://localhost:50000/test</jdbc.url>
-                                <jdbc.user>db2inst1</jdbc.user>
-                                <jdbc.password>db2inst1-pwd</jdbc.password>
-                                <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.ibm.db2</groupId>
-                    <artifactId>db2jcc4</artifactId>
-                    <version>9.7</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.ibm.db2</groupId>
-                    <artifactId>db2jcc_license_cu</artifactId>
-                    <version>9.7</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>firebird</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:firebirdsql:localhost:/tmp/test.fdb</jdbc.url>
-                                <jdbc.user>SYSDBA</jdbc.user>
-                                <jdbc.password>masterkey</jdbc.password>
-                                <jdbc.driver>org.firebirdsql.jdbc.FBDriver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.firebirdsql.jdbc</groupId>
-                    <artifactId>jaybird-jdk16</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>oracle</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:oracle:thin:@localhost:1521/xe</jdbc.url>
-                                <jdbc.user>travis</jdbc.user>
-                                <jdbc.password>travis</jdbc.password>
-                                <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.oracle</groupId>
-                    <artifactId>ojdbc14</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <!-- JPA provider profiles -->
-        <profile>
-            <id>hibernate</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>1.3.0.Final</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <compilerArguments>${processor.plugin.compilerArguments}</compilerArguments>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>1.3.0.Final</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-4.3</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-4.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-4.3}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.0</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.1</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.1}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.2</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.2}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.0</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>JBoss Snapshots</id>
-                    <name>JBoss Snapshots</name>
-                    <url>http://repository.jboss.org/nexus/content/groups/public/</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-6.0}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.0</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.0}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-6.0}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>eclipselink</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink</jpa.excludedGroups>
-                <spring.activeProfiles>eclipselink</spring.activeProfiles>
-                <surefire.jvm.params>-Xms1024m -Xmx2048m -javaagent:${project.build.directory}/agents/spring-instrumentation-agent.jar</surefire.jvm.params>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>eclipselink</artifactId>
-                    <version>${version.eclipselink}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                    <version>${version.eclipselink}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>3.6.10.Final</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>jaxen</groupId>
-                    <artifactId>jaxen</artifactId>
-                    <version>1.1.6</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <eclipselink.persistencexml>${basedir}/src/main/resources/META-INF/persistence.xml</eclipselink.persistencexml>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.eclipse.persistence</groupId>
-                                <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                                <version>${version.eclipselink}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>copy-agent</id>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>org.springframework</groupId>
-                                            <artifactId>spring-instrument</artifactId>
-                                            <outputDirectory>${project.build.directory}/agents</outputDirectory>
-                                            <destFileName>spring-instrumentation-agent.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <!-- Only need this for IntelliJ -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>-javaagent:${project.build.directory}/agents/spring-instrumentation-agent.jar</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus,com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4</jpa.excludedGroups>
-                <spring.activeProfiles>datanucleus</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TEST-PU</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- The old version has a bug when generating the static metamodel for PolymorphicPropertyMapBase -->
-                            <dependency>
-                                <groupId>org.datanucleus</groupId>
-                                <artifactId>datanucleus-jpa-query</artifactId>
-                                <version>${version.datanucleus.jpa-5}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-                <spring.activeProfiles>datanucleus</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TEST-PU</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>openjpa</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA</jpa.excludedGroups>
-                <spring.activeProfiles>openjpa</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.openjpa</groupId>
-                    <artifactId>openjpa-all</artifactId>
-                    <version>${version.openjpa}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-openjpa</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.apache.openjpa.persistence.meta.AnnotationProcessor6</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <openjpa.metamodel>true</openjpa.metamodel>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.openjpa</groupId>
-                                <artifactId>openjpa-all</artifactId>
-                                <version>${version.openjpa}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <!-- Profiles for various Spring-Data versions -->
         <profile>
             <id>spring-data-1.11.x</id>
diff --git a/integration/spring-data/testsuite/log4j.properties b/integration/spring-data/testsuite/log4j.properties
new file mode 100644
index 0000000000..5445b470a8
--- /dev/null
+++ b/integration/spring-data/testsuite/log4j.properties
@@ -0,0 +1,22 @@
+#
+# Copyright 2014 - 2018 Blazebit.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Define the destination and format of our logging
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
+
+#log4j.category.DataNucleus.Enhancer=DEBUG, A1
\ No newline at end of file
diff --git a/integration/spring-data/testsuite/pom.xml b/integration/spring-data/testsuite/pom.xml
index 66bcab2747..0d03b3bacf 100644
--- a/integration/spring-data/testsuite/pom.xml
+++ b/integration/spring-data/testsuite/pom.xml
@@ -78,6 +78,28 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Preparation for Java 9+, include a dependency on the JAXB APIs -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${version.annotation}</version>
+        </dependency>
     </dependencies>
 
     <profiles>
@@ -318,8 +340,8 @@
                             <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:oracle:thin:@localhost:1521/xe</jdbc.url>
-                                <jdbc.user>travis</jdbc.user>
-                                <jdbc.password>travis</jdbc.password>
+                                <jdbc.user>SYSTEM</jdbc.user>
+                                <jdbc.password>oracle</jdbc.password>
                                 <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
                                 <activeProfiles>${spring.activeProfiles}</activeProfiles>
                             </systemPropertyVariables>
@@ -342,6 +364,40 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>mssql</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL,${jpa.excludedGroups}</excludedGroups>
+                            <systemPropertyVariables>
+                                <jdbc.url>jdbc:sqlserver://localhost:1433</jdbc.url>
+                                <jdbc.user>sa</jdbc.user>
+                                <jdbc.password>Blaze-Persistence</jdbc.password>
+                                <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
+                            </systemPropertyVariables>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-junit47</artifactId>
+                                <version>${version.surefire.plugin}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>com.microsoft.sqlserver</groupId>
+                    <artifactId>mssql-jdbc</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
 
         <!-- JPA provider profiles -->
         <profile>
@@ -387,9 +443,8 @@
                                 </goals>
                                 <phase>generate-sources</phase>
                                 <configuration>
-                                    <compilerArguments>${processor.plugin.compilerArguments}</compilerArguments>
                                     <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
                                     <processors>
                                         <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
                                     </processors>
@@ -403,6 +458,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>1.3.0.Final</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -417,19 +497,7 @@
                                 </goals>
                                 <configuration>
                                     <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
                                     </sources>
                                 </configuration>
                             </execution>
@@ -482,7 +550,7 @@
                                 <phase>generate-sources</phase>
                                 <configuration>
                                     <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
                                     <processors>
                                         <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
                                     </processors>
@@ -496,6 +564,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-4.3}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -510,19 +603,7 @@
                                 </goals>
                                 <configuration>
                                     <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
                                     </sources>
                                 </configuration>
                             </execution>
@@ -575,7 +656,7 @@
                                 <phase>generate-sources</phase>
                                 <configuration>
                                     <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
                                     <processors>
                                         <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
                                     </processors>
@@ -589,6 +670,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-5}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -603,19 +709,7 @@
                                 </goals>
                                 <configuration>
                                     <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
                                     </sources>
                                 </configuration>
                             </execution>
@@ -668,7 +762,7 @@
                                 <phase>generate-sources</phase>
                                 <configuration>
                                     <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
                                     <processors>
                                         <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
                                     </processors>
@@ -682,6 +776,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-5.1}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -696,19 +815,7 @@
                                 </goals>
                                 <configuration>
                                     <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
                                     </sources>
                                 </configuration>
                             </execution>
@@ -764,7 +871,7 @@
                                 <phase>generate-sources</phase>
                                 <configuration>
                                     <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
                                     <processors>
                                         <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
                                     </processors>
@@ -778,6 +885,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-5.2}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -792,19 +924,113 @@
                                 </goals>
                                 <configuration>
                                     <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
                                     </sources>
                                 </configuration>
                             </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>hibernate-5.3</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
+                <spring.activeProfiles>hibernate</spring.activeProfiles>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-entitymanager</artifactId>
+                    <version>${version.hibernate-5.3}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <!-- IntelliJ apparently needs the annotation processor here -->
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-jpamodelgen</artifactId>
+                    <version>${version.hibernate-5.3}</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
                             <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
+                                <id>process</id>
                                 <goals>
-                                    <goal>add-test-source</goal>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <!-- Metamodel -->
+                            <dependency>
+                                <groupId>org.hibernate</groupId>
+                                <artifactId>hibernate-jpamodelgen</artifactId>
+                                <version>${version.hibernate-5.3}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
                                 </goals>
                                 <configuration>
                                     <sources>
-                                        <source>src/test/hibernate</source>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
                                     </sources>
                                 </configuration>
                             </execution>
@@ -864,7 +1090,7 @@
                                 <phase>generate-sources</phase>
                                 <configuration>
                                     <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
                                     <processors>
                                         <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
                                     </processors>
@@ -878,6 +1104,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-6.0}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -892,19 +1143,7 @@
                                 </goals>
                                 <configuration>
                                     <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
                                     </sources>
                                 </configuration>
                             </execution>
@@ -938,18 +1177,6 @@
                     <version>${version.eclipselink}</version>
                     <scope>provided</scope>
                 </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>3.6.10.Final</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>jaxen</groupId>
-                    <artifactId>jaxen</artifactId>
-                    <version>1.1.6</version>
-                    <scope>provided</scope>
-                </dependency>
             </dependencies>
             <build>
                 <plugins>
@@ -965,7 +1192,7 @@
                                 <phase>generate-sources</phase>
                                 <configuration>
                                     <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
                                     <processors>
                                         <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
                                     </processors>
@@ -982,26 +1209,33 @@
                                 <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
                                 <version>${version.eclipselink}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
@@ -1025,6 +1259,24 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <!-- Only need this for IntelliJ -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -1080,6 +1332,10 @@
                     <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>
@@ -1093,12 +1349,12 @@
                             <verbose>false</verbose>
                             <fork>true</fork>
                             <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
+                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
                             <useFileListFile>true</useFileListFile>
                         </configuration>
                         <executions>
                             <execution>
-                                <phase>process-test-classes</phase>
+                                <phase>process-classes</phase>
                                 <goals>
                                     <goal>enhance</goal>
                                 </goals>
@@ -1117,14 +1373,14 @@
                         <artifactId>maven-processor-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>process-test</id>
+                                <id>process</id>
                                 <goals>
-                                    <goal>process-test</goal>
+                                    <goal>process</goal>
                                 </goals>
-                                <phase>generate-test-sources</phase>
+                                <phase>generate-sources</phase>
                                 <configuration>
                                     <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
                                     <processors>
                                         <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
                                     </processors>
@@ -1138,6 +1394,31 @@
                                 <artifactId>datanucleus-jpa-query</artifactId>
                                 <version>${version.datanucleus.jpa-5}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -1145,14 +1426,14 @@
                         <artifactId>build-helper-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
                                 <goals>
-                                    <goal>add-test-source</goal>
+                                    <goal>add-source</goal>
                                 </goals>
                                 <configuration>
                                     <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
                                     </sources>
                                 </configuration>
                             </execution>
@@ -1205,6 +1486,10 @@
                     <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>
@@ -1218,12 +1503,160 @@
                             <verbose>false</verbose>
                             <fork>true</fork>
                             <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
+                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
                             <useFileListFile>true</useFileListFile>
                         </configuration>
                         <executions>
                             <execution>
-                                <phase>process-test-classes</phase>
+                                <phase>process-classes</phase>
+                                <goals>
+                                    <goal>enhance</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
+                                <version>${project.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>datanucleus-5.1</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
+                <spring.activeProfiles>datanucleus</spring.activeProfiles>
+            </properties>
+            <repositories>
+                <repository>
+                    <id>DataNucleus Nightly</id>
+                    <name>DataNucleus Repository Nightly</name>
+                    <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
+                </repository>
+            </repositories>
+            <dependencies>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>javax.persistence</artifactId>
+                    <version>2.2.0-release</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-core</artifactId>
+                    <version>${version.datanucleus.base-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-api-jpa</artifactId>
+                    <version>${version.datanucleus.api-jpa-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-jpa-query</artifactId>
+                    <version>${version.datanucleus.jpa-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-rdbms</artifactId>
+                    <version>${version.datanucleus.rdbms-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.datanucleus</groupId>
+                        <artifactId>datanucleus-maven-plugin</artifactId>
+                        <version>4.0.0-release</version>
+                        <configuration>
+                            <api>JPA</api>
+                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
+                            <verbose>false</verbose>
+                            <fork>true</fork>
+                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
+                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
+                            <useFileListFile>true</useFileListFile>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>process-classes</phase>
                                 <goals>
                                     <goal>enhance</goal>
                                 </goals>
@@ -1242,34 +1675,61 @@
                         <artifactId>maven-processor-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>process-test</id>
+                                <id>process</id>
                                 <goals>
-                                    <goal>process-test</goal>
+                                    <goal>process</goal>
                                 </goals>
-                                <phase>generate-test-sources</phase>
+                                <phase>generate-sources</phase>
                                 <configuration>
                                     <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
                                     <processors>
                                         <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
                                     </processors>
                                 </configuration>
                             </execution>
                         </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
                     </plugin>
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
                                 <goals>
-                                    <goal>add-test-source</goal>
+                                    <goal>add-source</goal>
                                 </goals>
                                 <configuration>
                                     <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
                                     </sources>
                                 </configuration>
                             </execution>
@@ -1310,7 +1770,7 @@
                                 <phase>generate-sources</phase>
                                 <configuration>
                                     <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
                                     <processors>
                                         <processor>org.apache.openjpa.persistence.meta.AnnotationProcessor6</processor>
                                     </processors>
@@ -1326,6 +1786,31 @@
                                 <artifactId>openjpa-all</artifactId>
                                 <version>${version.openjpa}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -1340,7 +1825,7 @@
                                 </goals>
                                 <configuration>
                                     <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
+                                        <source>${project.build.directory}/generated-sources/metamodel</source>
                                     </sources>
                                 </configuration>
                             </execution>
diff --git a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/entity/Document.java b/integration/spring-data/testsuite/src/main/java/com/blazebit/persistence/spring/data/testsuite/entity/Document.java
similarity index 95%
rename from integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/entity/Document.java
rename to integration/spring-data/testsuite/src/main/java/com/blazebit/persistence/spring/data/testsuite/entity/Document.java
index 4d223eec28..8383ce23f2 100644
--- a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/entity/Document.java
+++ b/integration/spring-data/testsuite/src/main/java/com/blazebit/persistence/spring/data/testsuite/entity/Document.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.spring.data.impl.entity;
+package com.blazebit.persistence.spring.data.testsuite.entity;
 
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -36,7 +36,8 @@ public class Document implements Serializable {
     private long age;
     private Person owner;
 
-    public Document() {}
+    public Document() {
+    }
 
     public Document(String name) {
         this.name = name;
diff --git a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/entity/Person.java b/integration/spring-data/testsuite/src/main/java/com/blazebit/persistence/spring/data/testsuite/entity/Person.java
similarity index 93%
rename from integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/entity/Person.java
rename to integration/spring-data/testsuite/src/main/java/com/blazebit/persistence/spring/data/testsuite/entity/Person.java
index e94348e70d..db10fe8e04 100644
--- a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/entity/Person.java
+++ b/integration/spring-data/testsuite/src/main/java/com/blazebit/persistence/spring/data/testsuite/entity/Person.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.spring.data.impl.entity;
+package com.blazebit.persistence.spring.data.testsuite.entity;
 
 import javax.persistence.Basic;
 import javax.persistence.Entity;
@@ -23,10 +23,9 @@
 import java.io.Serializable;
 
 /**
- *
  * @author Christian Beikov
  * @author Moritz Becker
- * @since 1.0.0
+ * @since 1.2.0
  */
 @Entity
 public class Person implements Serializable {
@@ -36,7 +35,8 @@ public class Person implements Serializable {
     private String name;
     private long age;
 
-    public Person() {}
+    public Person() {
+    }
 
     public Person(String name) {
         this.name = name;
@@ -65,7 +65,7 @@ public String getName() {
     public void setName(String name) {
         this.name = name;
     }
-    
+
     public long getAge() {
         return age;
     }
diff --git a/integration/spring-data/testsuite/src/test/resources/META-INF/persistence.xml b/integration/spring-data/testsuite/src/main/resources/META-INF/persistence.xml
similarity index 82%
rename from integration/spring-data/testsuite/src/test/resources/META-INF/persistence.xml
rename to integration/spring-data/testsuite/src/main/resources/META-INF/persistence.xml
index f16acbe48b..49a641356c 100644
--- a/integration/spring-data/testsuite/src/test/resources/META-INF/persistence.xml
+++ b/integration/spring-data/testsuite/src/main/resources/META-INF/persistence.xml
@@ -17,6 +17,9 @@
 <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
     <persistence-unit name="TEST-PU" transaction-type="RESOURCE_LOCAL">
+        <class>com.blazebit.persistence.spring.data.testsuite.entity.Document</class>
+        <class>com.blazebit.persistence.spring.data.testsuite.entity.Person</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>
             <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
         </properties>
diff --git a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/AbstractSpringTest.java b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/AbstractSpringTest.java
similarity index 74%
rename from integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/AbstractSpringTest.java
rename to integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/AbstractSpringTest.java
index 856c241787..0f9185b25c 100644
--- a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/AbstractSpringTest.java
+++ b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/AbstractSpringTest.java
@@ -14,8 +14,12 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.spring.data.impl;
+package com.blazebit.persistence.spring.data.testsuite;
 
+import com.blazebit.persistence.spring.data.testsuite.entity.Document;
+import com.blazebit.persistence.spring.data.testsuite.entity.Person;
+import com.blazebit.persistence.testsuite.base.AbstractPersistenceTest;
+import com.blazebit.persistence.testsuite.base.jpa.MutablePersistenceUnitInfo;
 import org.junit.After;
 import org.junit.Before;
 import org.springframework.test.annotation.DirtiesContext;
@@ -27,10 +31,22 @@
  * @author Moritz Becker
  * @since 1.2.0
  */
-public class AbstractSpringTest {
+public class AbstractSpringTest extends AbstractPersistenceTest {
 
     private TestContextManager testContextManager;
 
+    @Override
+    protected Class<?>[] getEntityClasses() {
+        return new Class[] {
+                Document.class,
+                Person.class
+        };
+    }
+    @Override
+    protected void configurePersistenceUnitInfo(MutablePersistenceUnitInfo persistenceUnitInfo) {
+        // No-op
+    }
+
     @Before
     public void setUpContext() throws Exception {
         //this is where the magic happens, we actually do "by hand" what the spring runner would do for us,
@@ -38,6 +54,7 @@ public void setUpContext() throws Exception {
         testContextManager = new TestContextManager(getClass());
         testContextManager.prepareTestInstance(this);
         testContextManager.registerTestExecutionListeners(new DirtiesContextTestExecutionListener());
+        cleanDatabase();
     }
 
     @After
diff --git a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/DocumentRepositoryTest.java b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/DocumentRepositoryTest.java
similarity index 93%
rename from integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/DocumentRepositoryTest.java
rename to integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/DocumentRepositoryTest.java
index 26b3d251ff..6e3209a795 100644
--- a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/DocumentRepositoryTest.java
+++ b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/DocumentRepositoryTest.java
@@ -14,26 +14,28 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.spring.data.impl;
+package com.blazebit.persistence.spring.data.testsuite;
 
 import com.blazebit.persistence.integration.view.spring.EnableEntityViews;
-import com.blazebit.persistence.spring.data.impl.accessor.DocumentAccessor;
-import com.blazebit.persistence.spring.data.impl.accessor.DocumentAccessors;
-import com.blazebit.persistence.spring.data.impl.config.SystemPropertyBasedActiveProfilesResolver;
-import com.blazebit.persistence.spring.data.impl.entity.Document;
-import com.blazebit.persistence.spring.data.impl.entity.Person;
+import com.blazebit.persistence.spring.data.testsuite.accessor.DocumentAccessor;
+import com.blazebit.persistence.spring.data.testsuite.accessor.DocumentAccessors;
+import com.blazebit.persistence.spring.data.testsuite.config.SystemPropertyBasedActiveProfilesResolver;
+import com.blazebit.persistence.spring.data.testsuite.entity.Document;
+import com.blazebit.persistence.spring.data.testsuite.entity.Person;
 import com.blazebit.persistence.spring.data.impl.repository.BlazePersistenceRepositoryFactoryBean;
-import com.blazebit.persistence.spring.data.impl.repository.DocumentEntityRepository;
-import com.blazebit.persistence.spring.data.impl.repository.DocumentRepository;
-import com.blazebit.persistence.spring.data.impl.repository.DocumentViewRepository;
-import com.blazebit.persistence.spring.data.impl.tx.TransactionalWorkService;
-import com.blazebit.persistence.spring.data.impl.tx.TxWork;
-import com.blazebit.persistence.spring.data.impl.view.DocumentView;
+import com.blazebit.persistence.spring.data.testsuite.repository.DocumentEntityRepository;
+import com.blazebit.persistence.spring.data.testsuite.repository.DocumentRepository;
+import com.blazebit.persistence.spring.data.testsuite.repository.DocumentViewRepository;
+import com.blazebit.persistence.spring.data.testsuite.tx.TransactionalWorkService;
+import com.blazebit.persistence.spring.data.testsuite.tx.TxWork;
+import com.blazebit.persistence.spring.data.testsuite.view.DocumentView;
 import com.blazebit.persistence.spring.data.repository.KeysetAwarePage;
 import com.blazebit.persistence.spring.data.repository.KeysetPageRequest;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,6 +73,8 @@
 @ContextConfiguration(classes = DocumentRepositoryTest.TestConfig.class)
 @ActiveProfiles(resolver = SystemPropertyBasedActiveProfilesResolver.class)
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+// Since only Hibernate 5.1 fixed a bug in the SQLServer dialect regarding pagination, we will skip this test for MSSQL
+@Category({ NoMSSQL.class })
 public class DocumentRepositoryTest extends AbstractSpringTest {
 
     @Parameterized.Parameters
@@ -362,7 +366,7 @@ public void testFindSliceByAgeGreaterThanEqual() {
         final Document d3 = createDocument("d3", null, 5l, null);
 
         // When
-        Slice<DocumentAccessor> actual = DocumentAccessors.of(documentRepository.findSliceByAgeGreaterThanEqual(4l, new PageRequest(1, 1)));
+        Slice<DocumentAccessor> actual = DocumentAccessors.of(documentRepository.findSliceByAgeGreaterThanEqual(4l, new PageRequest(1, 1, Sort.Direction.ASC, "age")));
         List<Long> actualIds = getIdsFromViews(actual);
 
         // Then
@@ -541,9 +545,9 @@ private boolean isEclipseLink() {
     @Configuration
     @ComponentScan
     @ImportResource("classpath:/com/blazebit/persistence/spring/data/impl/application-config.xml")
-    @EnableEntityViews(basePackages = {"org.springframework.data.jpa.repository.support", "com.blazebit.persistence.spring.data.impl.view"})
+    @EnableEntityViews(basePackages = {"org.springframework.data.jpa.repository.support", "com.blazebit.persistence.spring.data.testsuite.view"})
     @EnableJpaRepositories(
-            basePackages = "com.blazebit.persistence.spring.data.impl.repository",
+            basePackages = "com.blazebit.persistence.spring.data.testsuite.repository",
             entityManagerFactoryRef = "myEmf",
             repositoryFactoryBeanClass = BlazePersistenceRepositoryFactoryBean.class)
     static class TestConfig {
diff --git a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/accessor/DocumentAccessor.java b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/accessor/DocumentAccessor.java
similarity index 92%
rename from integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/accessor/DocumentAccessor.java
rename to integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/accessor/DocumentAccessor.java
index b4d7a3520f..2db085a7f9 100644
--- a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/accessor/DocumentAccessor.java
+++ b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/accessor/DocumentAccessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.spring.data.impl.accessor;
+package com.blazebit.persistence.spring.data.testsuite.accessor;
 
 /**
  * @author Moritz Becker
diff --git a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/accessor/DocumentAccessors.java b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/accessor/DocumentAccessors.java
similarity index 95%
rename from integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/accessor/DocumentAccessors.java
rename to integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/accessor/DocumentAccessors.java
index c27f63a50a..59270c829b 100644
--- a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/accessor/DocumentAccessors.java
+++ b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/accessor/DocumentAccessors.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.spring.data.impl.accessor;
+package com.blazebit.persistence.spring.data.testsuite.accessor;
 
-import com.blazebit.persistence.spring.data.impl.entity.Document;
+import com.blazebit.persistence.spring.data.testsuite.entity.Document;
 import com.blazebit.persistence.spring.data.base.query.KeysetAwarePageImpl;
-import com.blazebit.persistence.spring.data.impl.view.DocumentView;
+import com.blazebit.persistence.spring.data.testsuite.view.DocumentView;
 import com.blazebit.persistence.spring.data.repository.KeysetAwarePage;
 import com.blazebit.persistence.spring.data.repository.KeysetPageRequest;
 import org.springframework.data.domain.Page;
diff --git a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/config/BlazePersistenceConfiguration.java b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/config/BlazePersistenceConfiguration.java
similarity index 97%
rename from integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/config/BlazePersistenceConfiguration.java
rename to integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/config/BlazePersistenceConfiguration.java
index 3d77cf0ef4..238abbe187 100644
--- a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/config/BlazePersistenceConfiguration.java
+++ b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/config/BlazePersistenceConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.spring.data.impl.config;
+package com.blazebit.persistence.spring.data.testsuite.config;
 
 import com.blazebit.persistence.Criteria;
 import com.blazebit.persistence.CriteriaBuilderFactory;
diff --git a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/config/SystemPropertyBasedActiveProfilesResolver.java b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/config/SystemPropertyBasedActiveProfilesResolver.java
similarity index 94%
rename from integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/config/SystemPropertyBasedActiveProfilesResolver.java
rename to integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/config/SystemPropertyBasedActiveProfilesResolver.java
index b30f1472dc..1c88d7f035 100644
--- a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/config/SystemPropertyBasedActiveProfilesResolver.java
+++ b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/config/SystemPropertyBasedActiveProfilesResolver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.spring.data.impl.config;
+package com.blazebit.persistence.spring.data.testsuite.config;
 
 import org.springframework.test.context.support.DefaultActiveProfilesResolver;
 
diff --git a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/repository/DocumentEntityRepository.java b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/repository/DocumentEntityRepository.java
similarity index 82%
rename from integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/repository/DocumentEntityRepository.java
rename to integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/repository/DocumentEntityRepository.java
index 9c070214d2..14086d828a 100644
--- a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/repository/DocumentEntityRepository.java
+++ b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/repository/DocumentEntityRepository.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.spring.data.impl.repository;
+package com.blazebit.persistence.spring.data.testsuite.repository;
 
-import com.blazebit.persistence.spring.data.impl.entity.Document;
-import com.blazebit.persistence.spring.data.impl.view.DocumentView;
+import com.blazebit.persistence.spring.data.testsuite.entity.Document;
+import com.blazebit.persistence.spring.data.testsuite.view.DocumentView;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/repository/DocumentRepository.java b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/repository/DocumentRepository.java
similarity index 93%
rename from integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/repository/DocumentRepository.java
rename to integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/repository/DocumentRepository.java
index 107f38597d..5ac639aeb2 100644
--- a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/repository/DocumentRepository.java
+++ b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/repository/DocumentRepository.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.spring.data.impl.repository;
+package com.blazebit.persistence.spring.data.testsuite.repository;
 
-import com.blazebit.persistence.spring.data.impl.entity.Document;
+import com.blazebit.persistence.spring.data.testsuite.entity.Document;
 import com.blazebit.persistence.spring.data.repository.EntityViewRepository;
 import com.blazebit.persistence.spring.data.repository.EntityViewSpecificationExecutor;
 import com.blazebit.persistence.spring.data.repository.KeysetAwarePage;
diff --git a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/repository/DocumentViewRepository.java b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/repository/DocumentViewRepository.java
similarity index 82%
rename from integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/repository/DocumentViewRepository.java
rename to integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/repository/DocumentViewRepository.java
index 28e49fcbe5..454962d377 100644
--- a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/repository/DocumentViewRepository.java
+++ b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/repository/DocumentViewRepository.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.spring.data.impl.repository;
+package com.blazebit.persistence.spring.data.testsuite.repository;
 
-import com.blazebit.persistence.spring.data.impl.entity.Document;
-import com.blazebit.persistence.spring.data.impl.view.DocumentView;
+import com.blazebit.persistence.spring.data.testsuite.entity.Document;
+import com.blazebit.persistence.spring.data.testsuite.view.DocumentView;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/tx/TransactionalWorkService.java b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/tx/TransactionalWorkService.java
similarity index 95%
rename from integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/tx/TransactionalWorkService.java
rename to integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/tx/TransactionalWorkService.java
index 1228401777..9e4dc7a80a 100644
--- a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/tx/TransactionalWorkService.java
+++ b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/tx/TransactionalWorkService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.spring.data.impl.tx;
+package com.blazebit.persistence.spring.data.testsuite.tx;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/tx/TxVoidWork.java b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/tx/TxVoidWork.java
similarity index 92%
rename from integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/tx/TxVoidWork.java
rename to integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/tx/TxVoidWork.java
index 4572b2fb8c..e5bdc1090d 100644
--- a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/tx/TxVoidWork.java
+++ b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/tx/TxVoidWork.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.spring.data.impl.tx;
+package com.blazebit.persistence.spring.data.testsuite.tx;
 
 import javax.persistence.EntityManager;
 
diff --git a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/tx/TxWork.java b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/tx/TxWork.java
similarity index 92%
rename from integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/tx/TxWork.java
rename to integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/tx/TxWork.java
index 636743f338..0a2ea6f92f 100644
--- a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/tx/TxWork.java
+++ b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/tx/TxWork.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.spring.data.impl.tx;
+package com.blazebit.persistence.spring.data.testsuite.tx;
 
 import javax.persistence.EntityManager;
 
diff --git a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/view/DocumentView.java b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/view/DocumentView.java
similarity index 87%
rename from integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/view/DocumentView.java
rename to integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/view/DocumentView.java
index 0a9781ae7f..3c51919215 100644
--- a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/view/DocumentView.java
+++ b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/view/DocumentView.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.spring.data.impl.view;
+package com.blazebit.persistence.spring.data.testsuite.view;
 
-import com.blazebit.persistence.spring.data.impl.entity.Document;
+import com.blazebit.persistence.spring.data.testsuite.entity.Document;
 import com.blazebit.persistence.view.EntityView;
 import com.blazebit.persistence.view.IdMapping;
 
diff --git a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/view/PersonView.java b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/view/PersonView.java
similarity index 86%
rename from integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/view/PersonView.java
rename to integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/view/PersonView.java
index a8544406d2..abe94e1ffa 100644
--- a/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/impl/view/PersonView.java
+++ b/integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/view/PersonView.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.blazebit.persistence.spring.data.impl.view;
+package com.blazebit.persistence.spring.data.testsuite.view;
 
-import com.blazebit.persistence.spring.data.impl.entity.Person;
+import com.blazebit.persistence.spring.data.testsuite.entity.Person;
 import com.blazebit.persistence.view.EntityView;
 import com.blazebit.persistence.view.IdMapping;
 
diff --git a/integration/spring-data/testsuite/src/test/resources/com/blazebit/persistence/spring/data/impl/application-config.xml b/integration/spring-data/testsuite/src/test/resources/com/blazebit/persistence/spring/data/impl/application-config.xml
index ac6dcf2d4f..80b1716896 100644
--- a/integration/spring-data/testsuite/src/test/resources/com/blazebit/persistence/spring/data/impl/application-config.xml
+++ b/integration/spring-data/testsuite/src/test/resources/com/blazebit/persistence/spring/data/impl/application-config.xml
@@ -44,8 +44,11 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
                     <prop key="hibernate.show_sql">false</prop>
 
                     <!-- required for Hibernate 4.2 -->
-                    <prop key="hibernate.connection.url">jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</prop>
-                    <prop key="hibernate.hbm2ddl.auto">create-drop</prop>
+                    <prop key="hibernate.connection.url">#{systemProperties['jdbc.url']}</prop>
+                    <prop key="hibernate.connection.username">#{systemProperties['jdbc.user']}</prop>
+                    <prop key="hibernate.connection.password">#{systemProperties['jdbc.password']}</prop>
+                    <prop key="hibernate.connection.driver_class">#{systemProperties['jdbc.driver']}</prop>
+                    <prop key="hibernate.hbm2ddl.auto">none</prop>
                 </props>
             </property>
         </bean>
@@ -66,6 +69,7 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
                     <prop key="javax.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
                     <prop key="javax.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
                     <prop key="javax.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
+                    <prop key="javax.persistence.schema-generation.database.action">NONE</prop>
                     <prop key="eclipselink.logging.level">OFF</prop> <!-- use FINE for debugging -->
                 </props>
             </property>
@@ -82,6 +86,7 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
                     <prop key="javax.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
                     <prop key="javax.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
                     <prop key="javax.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
+                    <prop key="javax.persistence.schema-generation.database.action">NONE</prop>
                 </props>
             </property>
         </bean>
@@ -99,6 +104,7 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
                     <prop key="javax.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
                     <prop key="javax.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
                     <prop key="javax.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
+                    <prop key="javax.persistence.schema-generation.database.action">NONE</prop>
                 </props>
             </property>
         </bean>
diff --git a/integration/spring-data/testsuite/src/test/resources/logging.properties b/integration/spring-data/testsuite/src/test/resources/logging.properties
new file mode 100644
index 0000000000..497c77b711
--- /dev/null
+++ b/integration/spring-data/testsuite/src/test/resources/logging.properties
@@ -0,0 +1,43 @@
+#
+# Copyright 2014 - 2018 Blazebit.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+handlers = java.util.logging.ConsoleHandler
+
+# For debugging purposes use ALL
+# We turn it off for TravisCI build with SEVERE
+org.hibernate.level = SEVERE
+org.hibernate.tool.hbm2ddl.level = OFF
+#org.hibernate.SQL.level = ALL
+#org.hibernate.type.descriptor.sql.level = ALL
+#org.hibernate.tool.hbm2ddl.level = ALL
+#org.hibernate.pretty.level = ALL
+#org.hibernate.cache.level = ALL
+#org.hibernate.hql.internal.ast.AST.level = ALL
+
+#DataNucleus.Datastore.Native.level = ALL
+
+org.eclipse.persistence.level = SEVERE
+#org.eclipse.persistence.session.default.sql.level = SEVERE
+#org.eclipse.persistence.session.default.sql.level = ALL
+
+com.blazebit.persistence.spi.EntityManagerFactoryIntegrator.level = OFF
+com.blazebit.persistence.impl.datanucleus.function.DataNucleusEntityManagerFactoryIntegrator.level = OFF
+
+# Enable connection pool error logging
+org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl.level = SEVERE
+
+java.util.logging.ConsoleHandler.level = ALL
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
\ No newline at end of file
diff --git a/jpa-criteria/testsuite/pom.xml b/jpa-criteria/testsuite/pom.xml
index b5939bb9e5..80ac10f632 100644
--- a/jpa-criteria/testsuite/pom.xml
+++ b/jpa-criteria/testsuite/pom.xml
@@ -100,6 +100,28 @@
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Preparation for Java 9+, include a dependency on the JAXB APIs -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${version.annotation}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -195,6 +217,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>1.3.0.Final</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -275,6 +322,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-4.3}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -355,6 +427,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-5}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -435,6 +532,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-5.1}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -518,6 +640,136 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-5.2}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-test-source-metamodel</id>
+                                <phase>generate-test-sources</phase>
+                                <goals>
+                                    <goal>add-test-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/test-metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>hibernate-5.3</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-entitymanager</artifactId>
+                    <version>${version.hibernate-5.3}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <!-- IntelliJ apparently needs the annotation processor here -->
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-jpamodelgen</artifactId>
+                    <version>${version.hibernate-5.3}</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process-test</id>
+                                <goals>
+                                    <goal>process-test</goal>
+                                </goals>
+                                <phase>generate-test-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <!-- Metamodel -->
+                            <dependency>
+                                <groupId>org.hibernate</groupId>
+                                <artifactId>hibernate-jpamodelgen</artifactId>
+                                <version>${version.hibernate-5.3}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -605,6 +857,31 @@
                                 <artifactId>hibernate-jpamodelgen</artifactId>
                                 <version>${version.hibernate-6.0}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -683,6 +960,31 @@
                                 <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
                                 <version>${version.eclipselink}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -749,6 +1051,10 @@
                     <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>
@@ -807,6 +1113,31 @@
                                 <artifactId>datanucleus-jpa-query</artifactId>
                                 <version>${version.datanucleus.jpa-5}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
@@ -873,6 +1204,10 @@
                     <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>
@@ -924,6 +1259,181 @@
                                 </configuration>
                             </execution>
                         </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-test-source-metamodel</id>
+                                <phase>generate-test-sources</phase>
+                                <goals>
+                                    <goal>add-test-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/test-metamodel</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>datanucleus-5.1</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
+                <spring.activeProfiles>datanucleus</spring.activeProfiles>
+            </properties>
+            <repositories>
+                <repository>
+                    <id>DataNucleus Nightly</id>
+                    <name>DataNucleus Repository Nightly</name>
+                    <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
+                </repository>
+            </repositories>
+            <dependencies>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>javax.persistence</artifactId>
+                    <version>2.2.0-release</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-core</artifactId>
+                    <version>${version.datanucleus.base-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-api-jpa</artifactId>
+                    <version>${version.datanucleus.api-jpa-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-jpa-query</artifactId>
+                    <version>${version.datanucleus.jpa-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-rdbms</artifactId>
+                    <version>${version.datanucleus.rdbms-5.1}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.datanucleus</groupId>
+                        <artifactId>datanucleus-maven-plugin</artifactId>
+                        <version>4.0.0-release</version>
+                        <configuration>
+                            <api>JPA</api>
+                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
+                            <verbose>false</verbose>
+                            <fork>true</fork>
+                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
+                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
+                            <useFileListFile>true</useFileListFile>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>process-classes</phase>
+                                <goals>
+                                    <goal>enhance</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
+                                <version>${project.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>process</id>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <!-- source output directory -->
+                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
+                                    <processors>
+                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
+                                    </processors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
+                        </dependencies>
                     </plugin>
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
@@ -999,6 +1509,31 @@
                                 <artifactId>openjpa-all</artifactId>
                                 <version>${version.openjpa}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-core</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.sun.xml.bind</groupId>
+                                <artifactId>jaxb-impl</artifactId>
+                                <version>${version.jaxb}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.transaction</groupId>
+                                <artifactId>javax.transaction-api</artifactId>
+                                <version>${version.jta}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.activation</groupId>
+                                <artifactId>activation</artifactId>
+                                <version>${version.activation}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
diff --git a/parent/pom.xml b/parent/pom.xml
index 32e1ff14f3..47de679cfb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -35,11 +35,14 @@
     <properties>
         <blaze-persistence.codename>Ink</blaze-persistence.codename>
 
+        <version.jaxb>2.2.11</version.jaxb>
+        <version.jta>1.2</version.jta>
+        <version.activation>1.1.1</version.activation>
+        <version.annotation>1.3.2</version.annotation>
         <version.blazecbav>0.2.0</version.blazecbav>
         <version.blazeutils>0.1.16</version.blazeutils>
-        <version.deltaspike>1.8.0</version.deltaspike>
         <version.junit>4.12</version.junit>
-        <version.javassist>3.18.2-GA</version.javassist>
+        <version.javassist>3.22.0-GA</version.javassist>
 
         <!-- Minimum version is 4.2.8.Final -->
         <!-- 4.2.15.Final has a bug regarding naming strategies -->
@@ -47,10 +50,12 @@
         <version.hibernate-4.3>4.3.11.Final</version.hibernate-4.3>
         <version.hibernate-5>5.0.12.Final</version.hibernate-5>
         <version.hibernate-5.1>5.1.4.Final</version.hibernate-5.1>
-        <version.hibernate-5.2>5.2.8.Final</version.hibernate-5.2>
+        <!-- The SQLServer Dialect had a bug before 5.2.9.Final making it impossible to use pagination -->
+        <version.hibernate-5.2>5.2.9.Final</version.hibernate-5.2>
+        <version.hibernate-5.3>5.3.0.CR1</version.hibernate-5.3>
         <!-- Use 5.2.8 for now until there is a milestone release because the maven release always messes up setting the appropriate version.. -->
         <!--<version.hibernate-6.0>6.0.0-SNAPSHOT</version.hibernate-6.0>-->
-        <version.hibernate-6.0>5.2.8.Final</version.hibernate-6.0>
+        <version.hibernate-6.0>5.2.9.Final</version.hibernate-6.0>
 
         <version.datanucleus.base-4>4.1.17</version.datanucleus.base-4>
         <version.datanucleus.rdbms-4>4.1.19</version.datanucleus.rdbms-4>
@@ -62,20 +67,22 @@
         <version.datanucleus.api-jpa-5>5.0.13</version.datanucleus.api-jpa-5>
         <version.datanucleus.jpa-5>5.0.2</version.datanucleus.jpa-5>
 
-        <!-- Datanucleus 5.1 -->
-        <!--<version.datanucleus.base-5.1>5.1.1</version.datanucleus.base-5.1>-->
-        <!--<version.datanucleus.rdbms-5.1>5.1.1</version.datanucleus.rdbms-5.1>-->
-        <!--<version.datanucleus.api-jpa-5.1>5.1.1</version.datanucleus.api-jpa-5.1>-->
-        <!--<version.datanucleus.jpa-5.1>5.0.2</version.datanucleus.jpa-5.1>-->
-        
+        <version.datanucleus.base-5.1>5.1.6</version.datanucleus.base-5.1>
+        <version.datanucleus.rdbms-5.1>5.1.6</version.datanucleus.rdbms-5.1>
+        <version.datanucleus.api-jpa-5.1>5.1.4</version.datanucleus.api-jpa-5.1>
+        <version.datanucleus.jpa-5.1>5.0.4</version.datanucleus.jpa-5.1>
+
         <version.eclipselink>2.6.4</version.eclipselink>
         <version.openjpa>2.4.1</version.openjpa>
 
+        <version.deltaspike-1.7>1.7.2</version.deltaspike-1.7>
+        <version.deltaspike-1.8>1.8.1</version.deltaspike-1.8>
+
         <version.spring-data-1.x>1.11.10.RELEASE</version.spring-data-1.x>
         <version.spring-data-2.x>2.0.4.RELEASE</version.spring-data-2.x>
 
-        <version.openejb>4.6.0</version.openejb>
-        <version.openejb.javaee-api>6.0-4</version.openejb.javaee-api>
+        <version.openejb>4.7.5</version.openejb>
+        <version.openejb.javaee-api>6.0-6</version.openejb.javaee-api>
 
         <version.weld>2.4.5.Final</version.weld>
 
@@ -178,6 +185,11 @@
                 <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-hibernate-6.0</artifactId>
@@ -188,6 +200,11 @@
                 <artifactId>blaze-persistence-integration-datanucleus</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-eclipselink</artifactId>
@@ -214,6 +231,11 @@
                 <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
@@ -261,7 +283,12 @@
             </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-deltaspike-data-impl</artifactId>
+                <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.7</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.blazebit</groupId>
+                <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.8</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -299,14 +326,6 @@
                 <scope>provided</scope>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.deltaspike.distribution</groupId>
-                <artifactId>distributions-bom</artifactId>
-                <version>${version.deltaspike}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
             <dependency>
                 <groupId>org.jboss.weld.se</groupId>
                 <artifactId>weld-se-core</artifactId>
diff --git a/pom.xml b/pom.xml
index 3da6d8313d..28607352c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,8 +36,6 @@
         <version.checkstyle>8.7</version.checkstyle>
         <maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
         <currentYearDynamic>${maven.build.timestamp}</currentYearDynamic>
-        <processor.plugin.compilerArguments />
-        <surefire.openejb.jvm.params />
     </properties>
 
     <inceptionYear>2014</inceptionYear>
@@ -143,17 +141,11 @@
             </build>
         </profile>
         <profile>
-            <!-- Use latest javassist version on JDK > 9 -->
-            <id>jdk9</id>
+            <id>jdk9+</id>
             <activation>
                 <jdk>[1.9,)</jdk>
             </activation>
             <properties>
-                <version.javassist>3.22.0-CR2</version.javassist>
-                <processor.plugin.compilerArguments>--add-modules=java.xml.bind</processor.plugin.compilerArguments>
-                <!-- When forking, we need another flag -->
-                <!--<processor.plugin.compilerArguments>&#45;&#45;add-modules=java.xml.bind -J&#45;&#45;add-modules=java.xml.bind</processor.plugin.compilerArguments>-->
-                <surefire.openejb.jvm.params>--add-modules=java.xml.bind,java.corba</surefire.openejb.jvm.params>
                 <version.enforcer.plugin>3.0.0-M1</version.enforcer.plugin>
                 <maven.processor.source>1.9</maven.processor.source>
                 <maven.processor.target>1.9</maven.processor.target>
@@ -249,6 +241,10 @@
                         <exclude>**/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java</exclude>
                         <exclude>**/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java</exclude>
                         <exclude>**/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaQueryCreator.java</exclude>
+
+                        <exclude>**/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/RepositoryDefinitionException.java</exclude>
+                        <exclude>**/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/RepositoryComponents.java</exclude>
+                        <exclude>**/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/RepositoryComponentsFactory.java</exclude>
                     </excludes>
                     <properties>
                         <inceptionYear>${project.inceptionYear}</inceptionYear>
diff --git a/testsuite-base/datanucleus/pom.xml b/testsuite-base/datanucleus/pom.xml
index 882531d016..0bab9cc4ab 100644
--- a/testsuite-base/datanucleus/pom.xml
+++ b/testsuite-base/datanucleus/pom.xml
@@ -50,10 +50,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-testsuite-base-jpa</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
diff --git a/testsuite-base/datanucleus/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java b/testsuite-base/datanucleus/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
index a35b2b3a65..c0e424a010 100644
--- a/testsuite-base/datanucleus/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
+++ b/testsuite-base/datanucleus/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
@@ -20,8 +20,11 @@
 import com.blazebit.persistence.testsuite.base.jpa.cleaner.DatabaseCleaner;
 import org.datanucleus.ExecutionContext;
 import org.datanucleus.store.StoreManager;
+import org.datanucleus.store.connection.ConnectionManager;
+import org.datanucleus.store.connection.ManagedConnection;
 
 import javax.persistence.EntityManager;
+import java.lang.reflect.Method;
 import java.sql.Connection;
 import java.util.Properties;
 
@@ -58,15 +61,15 @@ protected void addIgnores(DatabaseCleaner applicableCleaner) {
     protected Connection getConnection(EntityManager em) {
         StoreManager storeManager = em.unwrap(StoreManager.class);
         ExecutionContext ec = em.unwrap(ExecutionContext.class);
-//        try {
-//            // Datanucleus 5.1 changed the API
-//            Method getConnection = ConnectionManager.class.getMethod("getConnection", ExecutionContext.class);
-//            ConnectionManager connectionManager = storeManager.getConnectionManager();
-//            return (Connection) ((ManagedConnection) getConnection.invoke(connectionManager, ec)).getConnection();
-//        } catch (NoSuchMethodException ex) {
-        return (Connection) storeManager.getConnection(ec).getConnection();
-//        } catch (Exception ex) {
-//            throw new RuntimeException(ex);
-//        }
+        try {
+            // Datanucleus 5.1 changed the API
+            Method getConnection = ConnectionManager.class.getMethod("getConnection", ExecutionContext.class);
+            ConnectionManager connectionManager = storeManager.getConnectionManager();
+            return (Connection) ((ManagedConnection) getConnection.invoke(connectionManager, ec)).getConnection();
+        } catch (NoSuchMethodException ex) {
+            return (Connection) storeManager.getConnection(ec).getConnection();
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
     }
 }
diff --git a/testsuite-base/hibernate/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java b/testsuite-base/hibernate/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
index ae419828a2..51db2b3656 100644
--- a/testsuite-base/hibernate/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
+++ b/testsuite-base/hibernate/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
@@ -20,6 +20,7 @@
 import com.blazebit.persistence.testsuite.base.jpa.AbstractJpaPersistenceTest;
 import com.blazebit.persistence.testsuite.base.jpa.MutablePersistenceUnitInfo;
 import com.blazebit.persistence.testsuite.base.jpa.RelationalModelAccessor;
+import com.blazebit.persistence.testsuite.base.jpa.cleaner.DatabaseCleaner;
 import org.hibernate.dialect.SQLServer2012Dialect;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.persister.entity.AbstractEntityPersister;
@@ -43,6 +44,11 @@ protected Connection getConnection(EntityManager em) {
         return em.unwrap(SessionImplementor.class).connection();
     }
 
+    @Override
+    protected void addIgnores(DatabaseCleaner applicableCleaner) {
+        applicableCleaner.addIgnoredTable("hibernate_sequence");
+    }
+
     @Override
     protected Properties applyProperties(Properties properties) {
         if (System.getProperty("hibernate.dialect") != null) {
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/AbstractJpaPersistenceTest.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/AbstractJpaPersistenceTest.java
index 46392d28a6..32df306421 100644
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/AbstractJpaPersistenceTest.java
+++ b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/AbstractJpaPersistenceTest.java
@@ -70,6 +70,9 @@
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 /**
  *
  * @author Christian Beikov
@@ -183,6 +186,10 @@ protected void clearCollections(EntityManager em, Class<?>... entityClasses) {
     }
 
     private void clearSchema() {
+        clearSchema(em, databaseCleaner);
+    }
+
+    public void clearSchema(EntityManager em, DatabaseCleaner databaseCleaner) {
         boolean wasAutoCommit = false;
         Connection connection = getConnection(em);
         try {
@@ -212,6 +219,59 @@ private void clearSchema() {
         }
     }
 
+
+    public DatabaseCleaner getDatabaseCleanerOrDefault(EntityManager em) {
+        DatabaseCleaner databaseCleaner = getDatabaseCleaner(em);
+        if (databaseCleaner == null) {
+            return getDefaultDatabaseCleaner();
+        }
+        return databaseCleaner;
+    }
+
+    public DatabaseCleaner getDefaultDatabaseCleaner() {
+        return new DatabaseCleaner() {
+            @Override
+            public boolean isApplicable(Connection connection) {
+                return true;
+            }
+
+            @Override
+            public boolean supportsClearSchema() {
+                return false;
+            }
+
+            @Override
+            public void clearSchema(Connection connection) {
+            }
+
+            @Override
+            public void addIgnoredTable(String tableName) {
+            }
+
+            @Override
+            public void clearData(Connection connection) {
+                recreateOrClearSchema();
+            }
+        };
+    }
+
+    public DatabaseCleaner getDatabaseCleaner(EntityManager em) {
+        // Find an applicable cleaner
+        Connection connection = getConnection(em);
+        DatabaseCleaner applicableCleaner = null;
+        for (DatabaseCleaner.Factory factory : DATABASE_CLEANERS) {
+            DatabaseCleaner cleaner = factory.create();
+            if (cleaner.isApplicable(connection)) {
+                applicableCleaner = cleaner;
+                break;
+            }
+        }
+
+        addIgnores(applicableCleaner);
+        setLastDatabaseCleaner(applicableCleaner);
+        return applicableCleaner;
+    }
+
     @Before
     public void init() {
         boolean firstTest = lastTestClass != getClass();
@@ -241,52 +301,18 @@ public void init() {
         QueryInspectorListener.collectSequences = false;
 
         if (!resolvedNoop && databaseCleaner == null) {
-            // Find an applicable cleaner
-            Connection connection = getConnection(em);
-            DatabaseCleaner applicableCleaner = null;
-            for (DatabaseCleaner.Factory factory : DATABASE_CLEANERS) {
-                DatabaseCleaner cleaner = factory.create();
-                if (cleaner.isApplicable(connection)) {
-                    applicableCleaner = cleaner;
-                    break;
-                }
-            }
+            DatabaseCleaner applicableCleaner = getDatabaseCleaner(em);
 
             if (applicableCleaner == null) {
                 // If none was found, we use the default cleaner
                 Logger.getLogger(getClass().getName()).warning("Could not resolve database cleaner for the database, falling back to drop-and-create strategy.");
                 resolvedNoop = true;
             }
-            addIgnores(applicableCleaner);
-            setLastDatabaseCleaner(applicableCleaner);
         }
 
         if (databaseCleaner == null) {
             // The default cleaner which recreates the schema
-            setLastDatabaseCleaner(new DatabaseCleaner() {
-                @Override
-                public boolean isApplicable(Connection connection) {
-                    return true;
-                }
-
-                @Override
-                public boolean supportsClearSchema() {
-                    return false;
-                }
-
-                @Override
-                public void clearSchema(Connection connection) {
-                }
-
-                @Override
-                public void addIgnoredTable(String tableName) {
-                }
-
-                @Override
-                public void clearData(Connection connection) {
-                    recreateOrClearSchema();
-                }
-            });
+            setLastDatabaseCleaner(getDefaultDatabaseCleaner());
         }
 
         CriteriaBuilderConfiguration config = Criteria.getDefault();
@@ -532,6 +558,11 @@ public static void disableQueryCollecting() {
         QueryInspectorListener.EXECUTED_QUERIES.clear();
     }
 
+    public static void assertUnorderedEquals(List<?> list1, List<?> list2) {
+        assertEquals(list1.size(), list2.size());
+        assertTrue(list1.containsAll(list2));
+    }
+
     public static void assertQueryCount(int count) {
         List<String> queries = QueryInspectorListener.EXECUTED_QUERIES;
         if (count != queries.size()) {
diff --git a/travis/install_jdk.sh b/travis/install_jdk.sh
new file mode 100644
index 0000000000..d138159cd6
--- /dev/null
+++ b/travis/install_jdk.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -e
+
+# Adapted from https://sormuras.github.io/blog/2017-12-08-install-jdk-on-travis.html
+
+TMP=$(curl -L jdk.java.net/${JDK})
+TMP="${TMP#*Most recent build: jdk-${JDK}+}" # remove everything before the number
+TMP="${TMP%%<*}"                                        # remove everything after the number
+JDK_BUILD="$(echo "${TMP}" | tr -d '[:space:]')"     # remove all whitespace
+
+JDK_ARCHIVE=jdk-${JDK}+${JDK_BUILD}_linux-x64_bin.tar.gz
+
+cd ~
+wget http://download.java.net/java/jdk${JDK}/archive/${JDK_BUILD}/BCL/${JDK_ARCHIVE}
+tar -xzf ${JDK_ARCHIVE}
+export JAVA_HOME=~/jdk-${JDK}
+export PATH=${JAVA_HOME}/bin:$PATH
+cd -
+
+java -version
\ No newline at end of file
diff --git a/travis/install_jdk_ea.sh b/travis/install_jdk_ea.sh
new file mode 100644
index 0000000000..0298524ac6
--- /dev/null
+++ b/travis/install_jdk_ea.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -e
+
+# Adapted from https://sormuras.github.io/blog/2017-12-08-install-jdk-on-travis.html
+
+TMP=$(curl -L jdk.java.net/${JDK})
+TMP="${TMP#*Most recent build: jdk-${JDK}-ea+}" # remove everything before the number
+TMP="${TMP%%<*}"                                        # remove everything after the number
+JDK_BUILD="$(echo "${TMP}" | tr -d '[:space:]')"     # remove all whitespace
+
+JDK_ARCHIVE=jdk-${JDK}-ea+${JDK_BUILD}_linux-x64_bin.tar.gz
+
+cd ~
+wget http://download.java.net/java/jdk${JDK}/archive/${JDK_BUILD}/BCL/${JDK_ARCHIVE}
+tar -xzf ${JDK_ARCHIVE}
+export JAVA_HOME=~/jdk-${JDK}
+export PATH=${JAVA_HOME}/bin:$PATH
+cd -
+
+java -version
\ No newline at end of file
diff --git a/website/pom.xml b/website/pom.xml
index 5dec4f3ca3..cafc960ae2 100644
--- a/website/pom.xml
+++ b/website/pom.xml
@@ -185,6 +185,12 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>jdk9+</id>
+            <activation>
+                <jdk>[1.9,)</jdk>
+            </activation>
+        </profile>
     </profiles>
 
     <build>
@@ -194,6 +200,13 @@
                     <groupId>com.blazebit</groupId>
                     <artifactId>jbake-maven-plugin</artifactId>
                     <version>1.0.0</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.jbake</groupId>
+                            <artifactId>jbake-core</artifactId>
+                            <version>2.6.0</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
diff --git a/website/src/main/jbake/content/downloads.adoc b/website/src/main/jbake/content/downloads.adoc
index a0a47de8c7..2ea6bd41a2 100644
--- a/website/src/main/jbake/content/downloads.adoc
+++ b/website/src/main/jbake/content/downloads.adoc
@@ -79,9 +79,19 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <version>${blaze-persistence.version}</version>
     <scope>compile</scope>
 </dependency>
+
+<!-- DeltaSpike Data 1.8 integration module -->
+<dependency>
+    <groupId>com.blazebit</groupId>
+    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.7</artifactId>
+    <version>${blaze-persistence.version}</version>
+    <scope>runtime</scope>
+</dependency>
+
+<!-- DeltaSpike Data 1.7 integration module -->
 <dependency>
     <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-deltaspike-data-impl</artifactId>
+    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.7</artifactId>
     <version>${blaze-persistence.version}</version>
     <scope>runtime</scope>
 </dependency>
@@ -100,6 +110,21 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <version>${blaze-persistence.version}</version>
 </dependency>
 
+<!-- Spring Data Rest integration module -->
+<dependency>
+    <groupId>com.blazebit</groupId>
+    <artifactId>blaze-persistence-integration-spring-data-rest</artifactId>
+    <version>${blaze-persistence.version}</version>
+</dependency>
+
+
+<!-- Hibernate 5.3 integration module -->
+<dependency>
+    <groupId>com.blazebit</groupId>
+    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
+    <version>${blaze-persistence.version}</version>
+    <scope>runtime</scope>
+</dependency>
 
 <!-- Hibernate 5.2 integration module -->
 <dependency>
@@ -141,6 +166,14 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <scope>runtime</scope>
 </dependency>
 
+<!-- Datanucleus 5.1 integration module -->
+<dependency>
+    <groupId>com.blazebit</groupId>
+    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
+    <version>${blaze-persistence.version}</version>
+    <scope>runtime</scope>
+</dependency>
+
 <!-- EclipseLink integration module -->
 <dependency>
     <groupId>com.blazebit</groupId>
diff --git a/website/src/main/jbake/templates/feed.ftl b/website/src/main/jbake/templates/feed.ftl
index bf9f6aaffc..05efa93b47 100644
--- a/website/src/main/jbake/templates/feed.ftl
+++ b/website/src/main/jbake/templates/feed.ftl
@@ -19,7 +19,7 @@
             <description>
               <#if post.body?contains("<!-- PREVIEW-SUFFIX -->")>
                 <#assign preview = post.body?keep_before("<!-- PREVIEW-SUFFIX -->")>
-                <#assign previewSuffix = post.body?keep_after("<!-- PREVIEW-SUFFIX --><!-- ")?keep_before(" --><!-- PREVIEW-END -->")>
+                <#assign previewSuffix = post.body?keep_after("<!-- PREVIEW-SUFFIX -->")?trim?keep_after("<!--")?keep_before("-->")>
                 <#escape x as x?xml>
                 ${preview} ..
                 ${previewSuffix}
diff --git a/website/src/main/jbake/templates/news.ftl b/website/src/main/jbake/templates/news.ftl
index 9ea9af18dd..002847ccc7 100644
--- a/website/src/main/jbake/templates/news.ftl
+++ b/website/src/main/jbake/templates/news.ftl
@@ -26,7 +26,7 @@
                   <div class="post-content">
                         <#if post.body?contains("<!-- PREVIEW-SUFFIX -->")>
                             <#assign preview = post.body?keep_before("<!-- PREVIEW-SUFFIX -->")>
-                            <#assign previewSuffix = post.body?keep_after("<!-- PREVIEW-SUFFIX --><!-- ")?keep_before(" --><!-- PREVIEW-END -->")>
+                            <#assign previewSuffix = post.body?keep_after("<!-- PREVIEW-SUFFIX -->")?trim?keep_after("<!--")?keep_before("-->")>
                             ${preview} ..
                             ${previewSuffix}
                             (<a href="${post.uri}">click here to read more</a>)