diff --git a/Spring Data Commons.sonargraph b/Spring Data Commons.sonargraph
index 0e9e1d0bd..8497439ea 100644
--- a/Spring Data Commons.sonargraph	
+++ b/Spring Data Commons.sonargraph	
@@ -1,112 +1,220 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<context version="7.1.10.209">
+<context version="7.2.2.230">
     <scope type="Project" name="spring-data-commons">
         <element type="TypeFilterReferenceOverridden" name="Filter">
             <element type="IncludeTypePattern" name="**"/>
         </element>
         <architecture>
-            <element type="LayerReference" name="Repositories">
-                <element type="TypeFilterReferenceOverridden" name="Assignment">
+            <element type="Layer" name="Web">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="**.web.**"/>
+                </element>
+                <element type="Subsystem" name="Config">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.config.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Support" type="AllowedDependency"/>
+                </element>
+                <dependency toName="Project|spring-data-commons::Layer|Application" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-commons::Layer|Core" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-commons::Layer|Mapping" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-commons::Layer|Repositories" type="AllowedDependency"/>
+            </element>
+            <element type="Layer" name="Repositories">
+                <element type="TypeFilter" name="Assignment">
                     <element type="IncludeTypePattern" name="**.repository.**"/>
-                    <element type="IncludeTypePattern" name="**.querydsl.**"/>
+                </element>
+                <element type="Subsystem" name="API">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.repository.*"/>
+                    </element>
+                    <stereotype name="Public"/>
+                    <dependency toName="Project|spring-data-commons::Layer|Application::Subsystem|Domain" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="Core">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.util.**"/>
+                        <element type="IncludeTypePattern" name="**.core.*"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="Query">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.query.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-commons::Layer|Application::Subsystem|Domain" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Core" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="Implementation">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.core.support.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-commons::Layer|Application::Subsystem|Domain" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Core" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Query" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="Support">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="WeakTypePattern" name="**.support.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Core" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Implementation" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Query" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="History">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.history.**"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="Configuration">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.config.**"/>
+                    </element>
+                    <stereotype name="Unrestricted"/>
+                    <dependency toName="Project|spring-data-commons::Layer|Repositories::Subsystem|CDI" type="DisallowedDependency"/>
+                </element>
+                <element type="Subsystem" name="CDI">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.cdi.**"/>
+                    </element>
+                    <dependency toName="External|External::Subsystem|JavaEE" type="AllowedDependency"/>
+                    <dependency toName="External|External::Subsystem|Logging" type="AllowedDependency"/>
+                    <dependency toName="External|External::Subsystem|Reflection" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Configuration" type="AllowedDependency"/>
+                    <dependency toName="External|External::Subsystem|Spring" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="Init">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.init.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Support" type="AllowedDependency"/>
+                </element>
+                <dependency toName="Project|spring-data-commons::Layer|Application" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-commons::Layer|Core" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-commons::Layer|Mapping" type="AllowedDependency"/>
+            </element>
+            <element type="Layer" name="Auditing">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="**.auditing.**"/>
+                </element>
+                <element type="Subsystem" name="Configuration">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.config.**"/>
+                    </element>
+                </element>
+                <dependency toName="External|External" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-commons::Layer|Application" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-commons::Layer|Conversion" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-commons::Layer|Core" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-commons::Layer|Mapping" type="AllowedDependency"/>
+            </element>
+            <element type="Layer" name="Conversion">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="**.convert.**"/>
+                </element>
+                <dependency toName="Project|spring-data-commons::Layer|Core" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-commons::Layer|Mapping" type="AllowedDependency"/>
+            </element>
+            <element type="Layer" name="Mapping">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="**.mapping.**"/>
+                </element>
+                <element type="Subsystem" name="Model">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.model.**"/>
+                        <element type="IncludeTypePattern" name="**.mapping.*"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="Context">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.context.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-commons::Layer|Mapping::Subsystem|Model" type="AllowedDependency"/>
+                </element>
+                <dependency toName="Project|spring-data-commons::Layer|Core" type="AllowedDependency"/>
+            </element>
+            <element type="Layer" name="Core">
+                <element type="TypeFilter" name="Assignment"/>
+                <element type="Subsystem" name="Types">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="WeakTypePattern" name="**.util.**"/>
+                    </element>
+                    <stereotype name="Public"/>
+                </element>
+                <element type="Subsystem" name="Annotations">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.annotation.**"/>
+                    </element>
+                    <stereotype name="Public"/>
+                </element>
+                <element type="Subsystem" name="Geo">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.geo.**"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="Authentication">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.authentication.**"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="History">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="WeakTypePattern" name="**.history.**"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="Support">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="WeakTypePattern" name="**.support.**"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="Transactions">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.transaction.**"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="Configuration">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="WeakTypePattern" name="**.config.**"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="Projection">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.projection.**"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="Querydsl">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.querydsl.**"/>
+                    </element>
+                </element>
+                <dependency toName="Project|spring-data-commons::Layer|Application" type="AllowedDependency"/>
+            </element>
+            <element type="Layer" name="Application">
+                <element type="TypeFilter" name="Assignment"/>
+                <element type="Subsystem" name="Domain">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="WeakTypePattern" name="**.domain.**"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="JAXB">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.domain.jaxb.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-commons::Layer|Application::Subsystem|Domain" type="AllowedDependency"/>
+                    <dependency toName="External|External::Subsystem|JAXB" type="AllowedDependency"/>
+                    <dependency toName="External|External::Subsystem|Spring" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="Cross store">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.crossstore.**"/>
+                    </element>
                 </element>
             </element>
         </architecture>
         <workspace>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/annotation">
+            <element type="JavaRootDirectory" name="src/main/java">
                 <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
             </element>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/auditing">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/web">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/util">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/authentication">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/config">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/convert">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/crossstore">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/domain/jaxb">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/geo">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/history">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/mapping">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/querydsl">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/repository">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/support">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/transaction">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/annotation">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/auditing">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/authentication">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/config">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/convert">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/crossstore">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/domain">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/geo">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/history">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/mapping">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/querydsl">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/repository">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/support">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/transaction">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/util">
-                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/web">
+            <element type="JavaRootDirectory" name="target/classes">
                 <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
             </element>
         </workspace>
@@ -137,22 +245,6 @@
             <element type="BuildUnit" name="spring-data-commons"/>
         </physical>
     </scope>
-    <scope type="Project" name="spring-data-commons-keyvalue">
-        <stereotype name="Unrestricted"/>
-        <workspace>
-            <element type="JavaRootDirectory" name="src/main/java/org/springframework/data/keyvalue">
-                <reference name="Project|spring-data-commons-keyvalue::BuildUnit|spring-data-keyvalue"/>
-            </element>
-            <element type="JavaRootDirectory" name="target/classes/org/springframework/data/keyvalue">
-                <reference name="Project|spring-data-commons-keyvalue::BuildUnit|spring-data-keyvalue"/>
-            </element>
-        </workspace>
-        <physical>
-            <element type="BuildUnit" name="spring-data-keyvalue">
-                <stereotype name="Unrestricted"/>
-            </element>
-        </physical>
-    </scope>
     <scope type="External" name="External">
         <element type="TypeFilter" name="Filter">
             <element type="IncludeTypePattern" name="**"/>
@@ -236,6 +328,16 @@
                     <element type="WeakTypePattern" name="java.**"/>
                 </element>
             </element>
+            <element type="Subsystem" name="Guava">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="com.google.common.**"/>
+                </element>
+            </element>
+            <element type="Subsystem" name="ThreeTen Backport">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="org.threeten.bp.**"/>
+                </element>
+            </element>
         </architecture>
     </scope>
     <scope type="Global" name="Global">
@@ -243,206 +345,6 @@
         <element type="TypeFilter" name="Filter">
             <element type="IncludeTypePattern" name="**"/>
         </element>
-        <architecture>
-            <element type="Layer" name="Web">
-                <element type="TypeFilter" name="Assignment">
-                    <element type="IncludeTypePattern" name="**.web.**"/>
-                </element>
-                <element type="Subsystem" name="Config">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.config.**"/>
-                    </element>
-                    <dependency toName="Global|Global::Layer|Core::Subsystem|Geo" type="AllowedDependency"/>
-                </element>
-                <dependency toName="Global|Global::Layer|Application" type="AllowedDependency"/>
-                <dependency toName="Global|Global::Layer|Repositories" type="AllowedDependency"/>
-            </element>
-            <element type="Layer" name="Repositories">
-                <element type="TypeFilter" name="Assignment">
-                    <element type="IncludeTypePattern" name="**.repository.**"/>
-                </element>
-                <element type="Subsystem" name="API">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.repository.*"/>
-                    </element>
-                    <stereotype name="Public"/>
-                    <dependency toName="Global|Global::Layer|Application::Subsystem|Domain" type="AllowedDependency"/>
-                </element>
-                <element type="Subsystem" name="Core">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.util.**"/>
-                        <element type="IncludeTypePattern" name="**.core.*"/>
-                    </element>
-                </element>
-                <element type="Subsystem" name="Query">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.query.**"/>
-                    </element>
-                    <dependency toName="Global|Global::Layer|Application::Subsystem|Domain" type="AllowedDependency"/>
-                    <dependency toName="Global|Global::Layer|Repositories::Subsystem|Core" type="AllowedDependency"/>
-                </element>
-                <element type="Subsystem" name="Implementation">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.core.support.**"/>
-                    </element>
-                    <dependency toName="Global|Global::Layer|Application::Subsystem|Domain" type="AllowedDependency"/>
-                    <dependency toName="Global|Global::Layer|Repositories::Subsystem|Core" type="AllowedDependency"/>
-                    <dependency toName="Global|Global::Layer|Repositories::Subsystem|Query" type="AllowedDependency"/>
-                </element>
-                <element type="Subsystem" name="Querydsl">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.querydsl.**"/>
-                    </element>
-                    <dependency toName="Global|Global::Layer|Application::Subsystem|Domain" type="AllowedDependency"/>
-                </element>
-                <element type="Subsystem" name="Support">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="WeakTypePattern" name="**.support.**"/>
-                    </element>
-                    <dependency toName="Global|Global::Layer|Repositories::Subsystem|Core" type="AllowedDependency"/>
-                    <dependency toName="Global|Global::Layer|Repositories::Subsystem|Implementation" type="AllowedDependency"/>
-                    <dependency toName="Global|Global::Layer|Repositories::Subsystem|Query" type="AllowedDependency"/>
-                    <dependency toName="Global|Global::Layer|Repositories::Subsystem|Querydsl" type="AllowedDependency"/>
-                </element>
-                <element type="Subsystem" name="History">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.history.**"/>
-                    </element>
-                </element>
-                <element type="Subsystem" name="Configuration">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.config.**"/>
-                    </element>
-                    <stereotype name="Unrestricted"/>
-                </element>
-                <element type="Subsystem" name="CDI">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.cdi.**"/>
-                    </element>
-                    <dependency toName="External|External::Subsystem|JavaEE" type="AllowedDependency"/>
-                    <dependency toName="External|External::Subsystem|Logging" type="AllowedDependency"/>
-                    <dependency toName="External|External::Subsystem|Reflection" type="AllowedDependency"/>
-                    <dependency toName="Global|Global::Layer|Repositories::Subsystem|Configuration" type="AllowedDependency"/>
-                    <dependency toName="External|External::Subsystem|Spring" type="AllowedDependency"/>
-                </element>
-                <element type="Subsystem" name="Init">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.init.**"/>
-                    </element>
-                    <dependency toName="Global|Global::Layer|Repositories::Subsystem|Core" type="AllowedDependency"/>
-                    <dependency toName="Global|Global::Layer|Repositories::Subsystem|Support" type="AllowedDependency"/>
-                </element>
-                <dependency toName="Global|Global::Layer|Application" type="AllowedDependency"/>
-                <dependency toName="Global|Global::Layer|Core" type="AllowedDependency"/>
-                <dependency toName="Global|Global::Layer|Mapping" type="AllowedDependency"/>
-            </element>
-            <element type="Layer" name="Conversion">
-                <element type="TypeFilter" name="Assignment">
-                    <element type="IncludeTypePattern" name="**.convert.**"/>
-                </element>
-                <dependency toName="Global|Global::Layer|Core" type="AllowedDependency"/>
-                <dependency toName="Global|Global::Layer|Mapping" type="AllowedDependency"/>
-            </element>
-            <element type="Layer" name="Auditing">
-                <element type="TypeFilter" name="Assignment">
-                    <element type="IncludeTypePattern" name="**.auditing.**"/>
-                </element>
-                <element type="Subsystem" name="Configuration">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.config.**"/>
-                    </element>
-                </element>
-                <dependency toName="External|External" type="AllowedDependency"/>
-                <dependency toName="Global|Global::Layer|Application" type="AllowedDependency"/>
-                <dependency toName="Global|Global::Layer|Core" type="AllowedDependency"/>
-                <dependency toName="Global|Global::Layer|Mapping" type="AllowedDependency"/>
-            </element>
-            <element type="Layer" name="Mapping">
-                <element type="TypeFilter" name="Assignment">
-                    <element type="IncludeTypePattern" name="**.mapping.**"/>
-                </element>
-                <element type="Subsystem" name="Model">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.model.**"/>
-                        <element type="IncludeTypePattern" name="**.mapping.*"/>
-                    </element>
-                </element>
-                <element type="Subsystem" name="Context">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.context.**"/>
-                    </element>
-                    <dependency toName="Global|Global::Layer|Mapping::Subsystem|Model" type="AllowedDependency"/>
-                </element>
-                <dependency toName="Global|Global::Layer|Core" type="AllowedDependency"/>
-            </element>
-            <element type="Layer" name="Core">
-                <element type="TypeFilter" name="Assignment"/>
-                <element type="Subsystem" name="Types">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="WeakTypePattern" name="**.util.**"/>
-                    </element>
-                    <stereotype name="Public"/>
-                </element>
-                <element type="Subsystem" name="Annotations">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.annotation.**"/>
-                    </element>
-                    <stereotype name="Public"/>
-                </element>
-                <element type="Subsystem" name="Geo">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.geo.**"/>
-                    </element>
-                </element>
-                <element type="Subsystem" name="Authentication">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.authentication.**"/>
-                    </element>
-                </element>
-                <element type="Subsystem" name="History">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="WeakTypePattern" name="**.history.**"/>
-                    </element>
-                </element>
-                <element type="Subsystem" name="Support">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="WeakTypePattern" name="**.support.**"/>
-                    </element>
-                </element>
-                <element type="Subsystem" name="Transactions">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.transaction.**"/>
-                    </element>
-                </element>
-                <element type="Subsystem" name="Configuration">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="WeakTypePattern" name="**.config.**"/>
-                    </element>
-                </element>
-                <dependency toName="Global|Global::Layer|Application" type="AllowedDependency"/>
-            </element>
-            <element type="Layer" name="Application">
-                <element type="TypeFilter" name="Assignment"/>
-                <element type="Subsystem" name="Domain">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="WeakTypePattern" name="**.domain.**"/>
-                    </element>
-                </element>
-                <element type="Subsystem" name="JAXB">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.domain.jaxb.**"/>
-                    </element>
-                    <dependency toName="Global|Global::Layer|Application::Subsystem|Domain" type="AllowedDependency"/>
-                    <dependency toName="External|External::Subsystem|JAXB" type="AllowedDependency"/>
-                    <dependency toName="External|External::Subsystem|Spring" type="AllowedDependency"/>
-                </element>
-                <element type="Subsystem" name="Cross store">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.crossstore.**"/>
-                    </element>
-                </element>
-            </element>
-        </architecture>
         <itemDefinition>
             <item type="ThresholdItem">
                 <property value="NumberOfNotAssignedTypes" name="AttributeId"/>
@@ -507,58 +409,58 @@
         </item>
     </itemDefinition>
     <attributeConfiguration type="AttributeConfiguration">
-        <property value="disabled" name="ExtendedCyclomaticComplexity"/>
-        <property value="disabled" name="MaxExtendedCyclomaticComplexityPerMethod"/>
-        <property value="disabled" name="NumberOfWarnings"/>
-        <property value="disabled" name="AverageCyclomaticComplexityPerMethod"/>
-        <property value="disabled" name="NumberOfAbstractTypes"/>
-        <property value="disabled" name="JdkVersion"/>
+        <property value="disabled" name="DistributedOverPathContainers"/>
+        <property value="disabled" name="AccumulatedCyclomaticComplexity"/>
         <property value="disabled" name="NumberOfCyclicDirectories"/>
+        <property value="disabled" name="AverageCyclomaticComplexityPerMethod"/>
+        <property value="disabled" name="NumberOfCyclicProjects"/>
+        <property value="disabled" name="NumberOfCyclicSourceFiles"/>
+        <property value="disabled" name="RelativeAverageTypeDependency"/>
+        <property value="disabled" name="NumberOfLayers"/>
         <property value="disabled" name="CyclomaticComplexity"/>
         <property value="disabled" name="NumberOfMethodsWithImplementation"/>
-        <property value="disabled" name="NumberOfIgnoredWarnings"/>
-        <property value="disabled" name="NumberOfNamedInterfaces"/>
-        <property value="disabled" name="NumberOfCyclicProjects"/>
-        <property value="disabled" name="NumberOfRefactorings"/>
-        <property value="disabled" name="DependsUpon"/>
         <property value="disabled" name="NumberOfVerticalSliceGroups"/>
-        <property value="disabled" name="DistributedOverPathContainers"/>
-        <property value="disabled" name="AverageExtendedCyclomaticComplexityPerMethod"/>
-        <property value="disabled" name="AverageTypeDependency"/>
+        <property value="disabled" name="ExtendedCyclomaticComplexity"/>
         <property value="disabled" name="NumberOfDuplicateCodeBlocksWarnings"/>
-        <property value="disabled" name="RelativeAverageTypeDependency"/>
-        <property value="disabled" name="AverageAccumulatedExtendedCyclomaticComplexityPerType"/>
-        <property value="disabled" name="NumberOfLayerGroups"/>
-        <property value="disabled" name="NumberOfIgnoredViolations"/>
-        <property value="disabled" name="NumberOfFixWarnings"/>
-        <property value="disabled" name="NumberOfExcludedSourceFiles"/>
-        <property value="disabled" name="NumberOfVerticalSlices"/>
-        <property value="disabled" name="AverageAccumulatedCyclomaticComplexityPerType"/>
-        <property value="disabled" name="Timestamp"/>
-        <property value="disabled" name="AverageAssertionUsage"/>
-        <property value="disabled" name="NumberOfCyclicSubsystems"/>
-        <property value="disabled" name="NumberOfCyclicNamespaces"/>
-        <property value="disabled" name="NumberOfExcludedTargetFiles"/>
-        <property value="disabled" name="NumberOfCyclicVerticalSliceGroups"/>
+        <property value="disabled" name="NormalizedCumulativeTypeDependency"/>
         <property value="disabled" name="AccumulatedExtendedCyclomaticComplexity"/>
-        <property value="disabled" name="NumberOfLayers"/>
-        <property value="disabled" name="NumberOfCyclicSourceFiles"/>
+        <property value="disabled" name="NumberOfLayerGroups"/>
+        <property value="disabled" name="NumberOfExcludedTargetFiles"/>
+        <property value="disabled" name="NumberOfCyclicLayers"/>
+        <property value="disabled" name="NumberOfRefactorings"/>
+        <property value="disabled" name="NumberOfSubsystems"/>
+        <property value="disabled" name="MaxCyclomaticComplexityPerMethod"/>
+        <property value="disabled" name="NumberOfWorkspaceWarnings"/>
+        <property value="disabled" name="NumberOfCyclicLayerGroups"/>
+        <property value="disabled" name="NumberOfTasks"/>
+        <property value="disabled" name="JdkVersion"/>
+        <property value="disabled" name="AverageAccumulatedExtendedCyclomaticComplexityPerType"/>
+        <property value="disabled" name="NumberOfAbstractMethods"/>
+        <property value="disabled" name="NumberOfCyclicVerticalSliceGroups"/>
+        <property value="disabled" name="AverageAssertionUsage"/>
+        <property value="disabled" name="NumberOfFixWarnings"/>
+        <property value="disabled" name="Timestamp"/>
+        <property value="disabled" name="NumberOfNameParts"/>
+        <property value="disabled" name="NumberOfAssertions"/>
+        <property value="disabled" name="AverageTypeDependency"/>
+        <property value="disabled" name="NumberOfNamedInterfaces"/>
+        <property value="disabled" name="NumberOfTypesWithImplementation"/>
+        <property value="disabled" name="NumberOfAbstractTypes"/>
+        <property value="disabled" name="NumberOfVerticalSlices"/>
+        <property value="disabled" name="NumberOfMetricWarnings"/>
+        <property value="disabled" name="MaxExtendedCyclomaticComplexityPerMethod"/>
+        <property value="disabled" name="DependsUpon"/>
+        <property value="disabled" name="NumberOfExcludedSourceFiles"/>
+        <property value="disabled" name="AverageExtendedCyclomaticComplexityPerMethod"/>
+        <property value="disabled" name="NumberOfCyclicSubsystems"/>
         <property value="disabled" name="MaxAccumulatedCyclomaticComplexityPerType"/>
         <property value="disabled" name="MaxAccumulatedExtendedCyclomaticComplexityPerType"/>
-        <property value="disabled" name="NumberOfCyclicLayerGroups"/>
-        <property value="disabled" name="NumberOfAssertions"/>
-        <property value="disabled" name="NumberOfCyclicVerticalSlices"/>
-        <property value="disabled" name="NormalizedCumulativeTypeDependency"/>
-        <property value="disabled" name="AccumulatedCyclomaticComplexity"/>
-        <property value="disabled" name="NumberOfMetricWarnings"/>
-        <property value="disabled" name="NumberOfNameParts"/>
-        <property value="disabled" name="NumberOfTasks"/>
-        <property value="disabled" name="NumberOfWorkspaceWarnings"/>
-        <property value="disabled" name="NumberOfAbstractMethods"/>
-        <property value="disabled" name="NumberOfTypesWithImplementation"/>
+        <property value="disabled" name="NumberOfIgnoredViolations"/>
         <property value="disabled" name="Level"/>
-        <property value="disabled" name="NumberOfSubsystems"/>
-        <property value="disabled" name="NumberOfCyclicLayers"/>
-        <property value="disabled" name="MaxCyclomaticComplexityPerMethod"/>
+        <property value="disabled" name="NumberOfWarnings"/>
+        <property value="disabled" name="NumberOfCyclicNamespaces"/>
+        <property value="disabled" name="NumberOfCyclicVerticalSlices"/>
+        <property value="disabled" name="NumberOfIgnoredWarnings"/>
+        <property value="disabled" name="AverageAccumulatedCyclomaticComplexityPerType"/>
     </attributeConfiguration>
 </context>