diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml
index 9ecd74fe4..b8f365e94 100644
--- a/ccm-cms/pom.xml
+++ b/ccm-cms/pom.xml
@@ -48,6 +48,11 @@
             <scope>provided</scope>
         </dependency>
         
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-jpamodelgen</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-envers</artifactId>
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 29db15f4a..cf22ffcc2 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -44,7 +44,11 @@
             <artifactId>hibernate-entitymanager</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-jpamodelgen</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-envers</artifactId>
@@ -239,6 +243,8 @@
             </resource>
         </resources>-->
         
+        
+        
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -267,19 +273,6 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
-            <!--<plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxb2-maven-plugin</artifactId>
-                <version>2.1</version>
-                <executions>
-                    <execution>
-                        <id>schemagen</id>
-                        <goals>
-                            <goal>schemagen</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java b/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java
index 7a5e958e7..b41b99e6c 100644
--- a/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java
+++ b/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java
@@ -82,7 +82,7 @@ public class CcmObjectRepository extends AbstractEntityRepository<Long, CcmObjec
         final TypedQuery<CcmObject> query = getEntityManager().createNamedQuery(
                 "CcmObject.findByUuid", CcmObject.class);
         query.setParameter("uuid", uuid);
-
+        
         try {
             return Optional.of(query.getSingleResult());
         } catch (NoResultException ex) {
diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml
index 93da4e8f4..164d30014 100644
--- a/ccm-shortcuts/pom.xml
+++ b/ccm-shortcuts/pom.xml
@@ -53,6 +53,11 @@
             <scope>provided</scope>
         </dependency>
         
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-jpamodelgen</artifactId>
+        </dependency>
+        
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-envers</artifactId>
diff --git a/pom.xml b/pom.xml
index 06ad57635..a349fb36c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,6 +171,11 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>1.12</version>
+                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>findbugs-maven-plugin</artifactId>
@@ -253,6 +258,17 @@
                 <version>5.0.7.Final</version>
             </dependency>
             
+            <!--
+                Hibernate Metamodel Generator. Required for generating the
+                metamodel classes for use with JPA Criteria API for completly
+                typesafe queries.
+            -->
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-jpamodelgen</artifactId>
+                <version>5.0.7.Final</version>
+            </dependency>
+            
             <!-- 
                 Hibernate Envers, used for providing versioning/auditing for
                 Entities.