diff --git a/templates/server/src/main/resources/archetype-resources/core/pom.xml b/templates/server/src/main/resources/archetype-resources/core/pom.xml
index 97286fdb4..ea8e7bb62 100644
--- a/templates/server/src/main/resources/archetype-resources/core/pom.xml
+++ b/templates/server/src/main/resources/archetype-resources/core/pom.xml
@@ -63,12 +63,6 @@
       <groupId>io.oasp.java.starters</groupId>
       <artifactId>oasp4j-starter-spring-data-jpa</artifactId>
     </dependency>
-    
-    <!-- Envers for historization/journalling of entities -->
-    <dependency>
-      <groupId>io.oasp.java.modules</groupId>
-      <artifactId>oasp4j-jpa-envers</artifactId>
-    </dependency>
 
     <!-- auto-configure datasource
       https://stackoverflow.com/questions/34964066/spring-boot-doesnt-use-datasource-properties
diff --git a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/SpringBootApp.java b/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/SpringBootApp.java
index bfa40f6df..e3ddb77ab 100644
--- a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/SpringBootApp.java
+++ b/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/SpringBootApp.java
@@ -3,15 +3,18 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 
 import io.oasp.module.jpa.dataaccess.api.AdvancedRevisionEntity;
+import io.oasp.module.jpa.dataaccess.impl.data.GenericRepositoryFactoryBean;
 
 /**
  * Main entry point of this {@link SpringBootApplication}. Simply run this class to start this app.
  */
 @SpringBootApplication
 @EntityScan(basePackages = { "${package}" }, basePackageClasses = { AdvancedRevisionEntity.class })
+@EnableJpaRepositories(repositoryFactoryBeanClass = GenericRepositoryFactoryBean.class)
 @EnableGlobalMethodSecurity(jsr250Enabled = true)
 public class SpringBootApp {
 
diff --git a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/api/dao/ApplicationDao.java b/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/api/dao/ApplicationDao.java
deleted file mode 100644
index b98e1dbb6..000000000
--- a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/api/dao/ApplicationDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package ${package}.general.dataaccess.api.dao;
-
-import io.oasp.module.jpa.dataaccess.api.Dao;
-import io.oasp.module.jpa.dataaccess.api.GenericRevisionedDao;
-import io.oasp.module.jpa.dataaccess.api.MutablePersistenceEntity;
-
-/**
- * Interface for all {@link GenericRevisionedDao DAOs} (Data Access Object) of this application.
- *
- * @param <ENTITY> is the type of the managed entity.
- */
-public interface ApplicationDao<ENTITY extends MutablePersistenceEntity<Long>> extends Dao<ENTITY> {
-
-}
diff --git a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/api/dao/ApplicationRevisionedDao.java b/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/api/dao/ApplicationRevisionedDao.java
deleted file mode 100644
index 008325e59..000000000
--- a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/api/dao/ApplicationRevisionedDao.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package ${package}.general.dataaccess.api.dao;
-
-import io.oasp.module.jpa.dataaccess.api.GenericRevisionedDao;
-import io.oasp.module.jpa.dataaccess.api.RevisionedDao;
-import io.oasp.module.jpa.dataaccess.api.MutablePersistenceEntity;
-
-/**
- * Interface for all {@link GenericRevisionedDao DAOs} (Data Access Object) of this application.
- *
- * @param <ENTITY> is the type of the managed entity.
- */
-public interface ApplicationRevisionedDao<ENTITY extends MutablePersistenceEntity<Long>> extends
-    ApplicationDao<ENTITY>, RevisionedDao<ENTITY> {
-
-}
diff --git a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/api/dao/BinaryObjectDao.java b/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/api/dao/BinaryObjectDao.java
deleted file mode 100644
index f5fe50c68..000000000
--- a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/api/dao/BinaryObjectDao.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package ${package}.general.dataaccess.api.dao;
-
-import ${package}.general.dataaccess.api.BinaryObjectEntity;
-
-/**
- * {@link ApplicationDao Data Access Object} for {@link BinaryObjectEntity} entity.
- */
-public interface BinaryObjectDao extends ApplicationDao<BinaryObjectEntity> {
-
-}
diff --git a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/api/dao/BinaryObjectRepository.java b/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/api/dao/BinaryObjectRepository.java
new file mode 100644
index 000000000..b6a15a3de
--- /dev/null
+++ b/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/api/dao/BinaryObjectRepository.java
@@ -0,0 +1,11 @@
+package ${package}.general.dataaccess.api.dao;
+
+import io.oasp.module.jpa.dataaccess.api.data.DefaultRepository;
+import ${package}.general.dataaccess.api.BinaryObjectEntity;
+
+/**
+ * {@link DefaultRepository} for {@link BinaryObjectEntity}.
+ */
+public interface BinaryObjectRepository extends DefaultRepository<BinaryObjectEntity> {
+
+}
diff --git a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/base/dao/ApplicationDaoImpl.java b/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/base/dao/ApplicationDaoImpl.java
deleted file mode 100644
index 350e235e8..000000000
--- a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/base/dao/ApplicationDaoImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package ${package}.general.dataaccess.base.dao;
-
-import ${package}.general.dataaccess.api.dao.ApplicationDao;
-import io.oasp.module.jpa.dataaccess.api.MutablePersistenceEntity;
-import io.oasp.module.jpa.dataaccess.base.AbstractRevisionedDao;
-
-import org.springframework.stereotype.Repository;
-
-/**
- * This is the abstract base implementation of {@link ApplicationDao}.
- *
- * @param <ENTITY> is the {@link #getEntityClass() type} of the managed entity.
- */
-@Repository
-public abstract class ApplicationDaoImpl<ENTITY extends MutablePersistenceEntity<Long>> extends
-    AbstractRevisionedDao<ENTITY> implements ApplicationDao<ENTITY> {
-
-  /**
-   * The constructor.
-   */
-  public ApplicationDaoImpl() {
-
-    super();
-  }
-
-}
diff --git a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/base/dao/ApplicationMasterDataDaoImpl.java b/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/base/dao/ApplicationMasterDataDaoImpl.java
deleted file mode 100644
index 224a4176e..000000000
--- a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/base/dao/ApplicationMasterDataDaoImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package ${package}.general.dataaccess.base.dao;
-
-import java.util.List;
-
-import io.oasp.module.jpa.dataaccess.api.MutablePersistenceEntity;
-import io.oasp.module.jpa.dataaccess.api.RevisionedMasterDataDao;
-
-/**
- * This is the abstract base implementation of {@link RevisionedMasterDataDao} based on {@link ApplicationDaoImpl}.
- *
- * @param <ENTITY> is the {@link #getEntityClass() type} of the managed entity.
- */
-public abstract class ApplicationMasterDataDaoImpl<ENTITY extends MutablePersistenceEntity<Long>>
-    extends ApplicationDaoImpl<ENTITY> implements RevisionedMasterDataDao<ENTITY> {
-
-  /**
-   * The constructor.
-   */
-  public ApplicationMasterDataDaoImpl() {
-
-    super();
-  }
-
-  @Override
-  public List<ENTITY> findAll() {
-
-    return super.findAll();
-  }
-
-}
diff --git a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/base/dao/BinaryObjectDaoImpl.java b/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/base/dao/BinaryObjectDaoImpl.java
deleted file mode 100644
index 751c52c44..000000000
--- a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/dataaccess/base/dao/BinaryObjectDaoImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package ${package}.general.dataaccess.base.dao;
-
-import ${package}.general.dataaccess.api.BinaryObjectEntity;
-import ${package}.general.dataaccess.api.dao.BinaryObjectDao;
-
-import javax.inject.Named;
-
-/**
- * Implementation of {@link BinaryObjectDao}.
- */
-@Named
-public class BinaryObjectDaoImpl extends ApplicationDaoImpl<BinaryObjectEntity> implements BinaryObjectDao {
-
-  @Override
-  public Class<BinaryObjectEntity> getEntityClass() {
-
-    return BinaryObjectEntity.class;
-  }
-
-}
diff --git a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/logic/impl/UcManageBinaryObjectImpl.java b/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/logic/impl/UcManageBinaryObjectImpl.java
index 12fb5eec1..2676cfad9 100644
--- a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/logic/impl/UcManageBinaryObjectImpl.java
+++ b/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/logic/impl/UcManageBinaryObjectImpl.java
@@ -6,7 +6,7 @@
 import javax.inject.Named;
 
 import ${package}.general.dataaccess.api.BinaryObjectEntity;
-import ${package}.general.dataaccess.api.dao.BinaryObjectDao;
+import ${package}.general.dataaccess.api.dao.BinaryObjectRepository;
 import ${package}.general.logic.api.UcManageBinaryObject;
 import ${package}.general.logic.api.to.BinaryObjectEto;
 import ${package}.general.logic.base.AbstractUc;
@@ -17,23 +17,23 @@
 @Named
 public class UcManageBinaryObjectImpl extends AbstractUc implements UcManageBinaryObject {
 
-  private BinaryObjectDao binaryObjectDao;
+  private BinaryObjectRepository binaryObjectRepository;
 
   /**
-   * @return binaryObjectDao
+   * @return {@link BinaryObjectRepository} instance.
    */
-  public BinaryObjectDao binaryObjectDao() {
+  public BinaryObjectRepository getBinaryObjectRepository() {
 
-    return this.binaryObjectDao;
+    return this.binaryObjectRepository;
   }
 
   /**
-   * @param binaryObjectDao the binaryObjectDao to set
+   * @param binaryObjectRepository the {@link BinaryObjectRepository} to set
    */
   @Inject
-  public void setBinaryObjectDao(BinaryObjectDao binaryObjectDao) {
+  public void setBinaryObjectRepository(BinaryObjectRepository binaryObjectRepository) {
 
-    this.binaryObjectDao = binaryObjectDao;
+    this.binaryObjectRepository = binaryObjectRepository;
   }
 
   @Override
@@ -41,27 +41,27 @@ public BinaryObjectEto saveBinaryObject(Blob data, BinaryObjectEto binaryObjectE
 
     BinaryObjectEntity binaryObjectEntity = getBeanMapper().map(binaryObjectEto, BinaryObjectEntity.class);
     binaryObjectEntity.setData(data);
-    this.binaryObjectDao.save(binaryObjectEntity);
+    this.binaryObjectRepository.save(binaryObjectEntity);
     return getBeanMapper().map(binaryObjectEntity, BinaryObjectEto.class);
   }
 
   @Override
   public void deleteBinaryObject(Long binaryObjectId) {
 
-    this.binaryObjectDao.delete(binaryObjectId);
+    this.binaryObjectRepository.delete(binaryObjectId);
 
   }
 
   @Override
   public BinaryObjectEto findBinaryObject(Long binaryObjectId) {
 
-    return getBeanMapper().map(this.binaryObjectDao.findOne(binaryObjectId), BinaryObjectEto.class);
+    return getBeanMapper().map(this.binaryObjectRepository.findOne(binaryObjectId), BinaryObjectEto.class);
   }
 
   @Override
   public Blob getBinaryObjectBlob(Long binaryObjectId) {
 
-    return this.binaryObjectDao.findOne(binaryObjectId).getData();
+    return this.binaryObjectRepository.findOne(binaryObjectId).getData();
   }
 
 }