diff --git a/example-context/example-persistence/pom.xml b/example-context/example-persistence/pom.xml
index 837eb423..6dfb0018 100644
--- a/example-context/example-persistence/pom.xml
+++ b/example-context/example-persistence/pom.xml
@@ -20,7 +20,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>persistence-deltaspike</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.utils</groupId>
@@ -51,13 +50,11 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-common</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>test-utils-persistence</artifactId>
-            <version>${event-store.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -67,14 +64,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.everit.json</groupId>
+            <groupId>com.github.everit-org.json-schema</groupId>
             <artifactId>org.everit.json.schema</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.schema</groupId>
             <artifactId>schema-service</artifactId>
-            <version>${json-schema-catalog.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/example-context/example-service/example-command/example-command-api/pom.xml b/example-context/example-service/example-command/example-command-api/pom.xml
index 28b9fd90..38a09eee 100644
--- a/example-context/example-service/example-command/example-command-api/pom.xml
+++ b/example-context/example-service/example-command/example-command-api/pom.xml
@@ -29,22 +29,18 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>common</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>core</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-adapter-file-service</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.utils</groupId>
             <artifactId>utilities-file</artifactId>
-            <version>${utilities.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
@@ -53,12 +49,10 @@
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-adapter-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-client-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
 
         <!-- Test Dependencies -->
@@ -75,7 +69,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-core</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -87,7 +80,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-enveloper-provider</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -97,7 +89,7 @@
             <plugin>
                 <groupId>uk.gov.justice.framework-generators</groupId>
                 <artifactId>messaging-client-generator-plugin</artifactId>
-                <version>${framework-generators.version}</version>
+                <version>${framework.version}</version>
                 <executions>
                     <execution>
                         <id>external-ramls</id>
@@ -130,7 +122,7 @@
                     <dependency>
                         <groupId>uk.gov.justice.framework-generators</groupId>
                         <artifactId>messaging-client-generator</artifactId>
-                        <version>${framework-generators.version}</version>
+                        <version>${framework.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/example-context/example-service/example-command/example-command-handler/pom.xml b/example-context/example-service/example-command/example-command-handler/pom.xml
index 3318c262..d08962b1 100644
--- a/example-context/example-service/example-command/example-command-handler/pom.xml
+++ b/example-context/example-service/example-command/example-command-handler/pom.xml
@@ -37,12 +37,10 @@
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>aggregate-snapshot-service</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>command-handler-interceptors</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services.example</groupId>
@@ -52,37 +50,30 @@
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>messaging-adapter-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-client-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-source</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-publisher-jms</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-repository-jdbc</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>aggregate</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-store-management-core</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
 
         <!-- Test Dependencies -->
@@ -100,7 +91,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-enveloper-provider</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/example-context/example-service/example-custom/example-custom-api/pom.xml b/example-context/example-service/example-custom/example-custom-api/pom.xml
index f8ddc41e..bc24d7b9 100644
--- a/example-context/example-service/example-custom/example-custom-api/pom.xml
+++ b/example-context/example-service/example-custom/example-custom-api/pom.xml
@@ -24,27 +24,22 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>common</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>core</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.schema</groupId>
             <artifactId>schema-service</artifactId>
-            <version>${json-schema-catalog.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-adapter-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-client-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>javax</groupId>
@@ -75,7 +70,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-core</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -87,7 +81,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-enveloper-provider</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/example-context/example-service/example-event/example-event-indexer/pom.xml b/example-context/example-service/example-event/example-event-indexer/pom.xml
index 6679e109..7ca42fbe 100644
--- a/example-context/example-service/example-event/example-event-indexer/pom.xml
+++ b/example-context/example-service/example-event/example-event-indexer/pom.xml
@@ -35,22 +35,18 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>common</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>core</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>messaging-adapter-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>unifiedsearch-client-generator</artifactId>
-            <version>${framework-generators.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>joda-time</groupId>
@@ -61,22 +57,18 @@
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>subscription-manager</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-subscription-registry</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>subscription-event-interceptors</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-api</groupId>
             <artifactId>framework-api-event-listener-interceptors</artifactId>
-            <version>${framework-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.ejb3</groupId>
@@ -96,13 +88,11 @@
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-buffer-core</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
 
         <dependency>
             <groupId>uk.gov.justice.json</groupId>
             <artifactId>json-transformer-jolt</artifactId>
-            <version>${json-transformer.version}</version>
         </dependency>
 
         <!-- Test Dependencies -->
@@ -119,7 +109,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-core</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/example-context/example-service/example-event/example-event-indexer/src/main/java/uk/gov/justice/services/example/cakeshop/dummy/DummyUnifiedSearchIndexer.java b/example-context/example-service/example-event/example-event-indexer/src/main/java/uk/gov/justice/services/example/cakeshop/dummy/DummyUnifiedSearchIndexer.java
index 8e2a3fcc..7ad81099 100644
--- a/example-context/example-service/example-event/example-event-indexer/src/main/java/uk/gov/justice/services/example/cakeshop/dummy/DummyUnifiedSearchIndexer.java
+++ b/example-context/example-service/example-event/example-event-indexer/src/main/java/uk/gov/justice/services/example/cakeshop/dummy/DummyUnifiedSearchIndexer.java
@@ -4,6 +4,7 @@
 
 import uk.gov.justice.services.example.cakeshop.persistence.IndexRepository;
 import uk.gov.justice.services.example.cakeshop.persistence.entity.Index;
+import uk.gov.justice.services.messaging.Envelope;
 import uk.gov.justice.services.unifiedsearch.UnifiedSearchIndexer;
 
 import java.time.ZonedDateTime;
@@ -20,9 +21,10 @@ public class DummyUnifiedSearchIndexer implements UnifiedSearchIndexer {
     private IndexRepository indexRepository;
 
     @Override
-    public void indexData(final JsonObject jsonObject) {
-        final UUID recipeId = fromString(jsonObject.getString("recipeId"));
-        final ZonedDateTime deliveryDate = ZonedDateTime.parse(jsonObject.getString("deliveryDate"));
+    public void indexData(final Envelope<JsonObject> eventWithJoltTransformedPayload) {
+        final JsonObject payload = eventWithJoltTransformedPayload.payload();
+        final UUID recipeId = fromString(payload.getString("recipeId"));
+        final ZonedDateTime deliveryDate = ZonedDateTime.parse(payload.getString("deliveryDate"));
         final Index index = new Index(recipeId, deliveryDate);
         indexRepository.save(index);
     }
diff --git a/example-context/example-service/example-event/example-event-listener/pom.xml b/example-context/example-service/example-event/example-event-listener/pom.xml
index d5a60907..ccb4395d 100644
--- a/example-context/example-service/example-event/example-event-listener/pom.xml
+++ b/example-context/example-service/example-event/example-event-listener/pom.xml
@@ -29,37 +29,30 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>common</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>core</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>messaging-adapter-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>subscription-manager</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-subscription-registry</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>subscription-event-interceptors</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-api</groupId>
             <artifactId>framework-api-event-listener-interceptors</artifactId>
-            <version>${framework-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.ejb3</groupId>
@@ -79,7 +72,6 @@
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-buffer-core</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
 
         <!-- Test Dependencies -->
@@ -96,7 +88,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-core</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/example-context/example-service/example-event/example-event-processor/pom.xml b/example-context/example-service/example-event/example-event-processor/pom.xml
index aeef82ca..d2e55913 100644
--- a/example-context/example-service/example-event/example-event-processor/pom.xml
+++ b/example-context/example-service/example-event/example-event-processor/pom.xml
@@ -28,32 +28,26 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>common</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>core</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>messaging-adapter-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>subscription-manager</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-subscription-registry</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-client-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
 
         <!-- Test Dependencies -->
diff --git a/example-context/example-service/example-event/other-event-listener/pom.xml b/example-context/example-service/example-event/other-event-listener/pom.xml
index ff0c61c1..9dc2658e 100644
--- a/example-context/example-service/example-event/other-event-listener/pom.xml
+++ b/example-context/example-service/example-event/other-event-listener/pom.xml
@@ -29,32 +29,26 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>common</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>core</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>messaging-adapter-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>subscription-manager</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-subscription-registry</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-api</groupId>
             <artifactId>framework-api-event-listener-interceptors</artifactId>
-            <version>${framework-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.ejb3</groupId>
diff --git a/example-context/example-service/example-event/pom.xml b/example-context/example-service/example-event/pom.xml
index 19fb2fa0..76cb276e 100644
--- a/example-context/example-service/example-event/pom.xml
+++ b/example-context/example-service/example-event/pom.xml
@@ -93,7 +93,7 @@
                     <plugin>
                         <groupId>uk.gov.justice.framework-generators</groupId>
                         <artifactId>unifiedsearch-client-generator-plugin</artifactId>
-                        <version>${framework-generators.version}</version>
+                        <version>${framework.version}</version>
                         <configuration>
                             <generatorName>
                                 uk.gov.justice.services.clients.unifiedsearch.generator.UnifiedSearchClientGenerator
@@ -127,13 +127,13 @@
                             <dependency>
                                 <artifactId>unifiedsearch-client-generator</artifactId>
                                 <groupId>uk.gov.justice.framework-generators</groupId>
-                                <version>${framework-generators.version}</version>
+                                <version>${framework.version}</version>
                             </dependency>
 
                             <dependency>
                                 <groupId>uk.gov.justice.framework-generators</groupId>
                                 <artifactId>generators-commons</artifactId>
-                                <version>${framework-generators.version}</version>
+                                <version>${framework.version}</version>
                             </dependency>
                             <dependency>
                                 <groupId>javax</groupId>
@@ -147,8 +147,8 @@
                     <plugin>
                         <groupId>uk.gov.justice.schema</groupId>
                         <artifactId>catalog-generation-plugin</artifactId>
-                        <version>${json-schema-catalog.version}</version>
-                        <executions>
+                        <version>${framework-libraries.version}</version>
+                       <executions>
                             <execution>
                                 <id>schema-catalog-generation</id>
                                 <configuration>
@@ -183,14 +183,14 @@
                             <dependency>
                                 <groupId>uk.gov.justice.schema</groupId>
                                 <artifactId>catalog-generation</artifactId>
-                                <version>${json-schema-catalog.version}</version>
+                                <version>${framework-libraries.version}</version>
                             </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
                         <groupId>uk.gov.justice.framework-generators</groupId>
                         <artifactId>messaging-adapter-generator-plugin</artifactId>
-                        <version>${framework-generators.version}</version>
+                        <version>${framework.version}</version>
                         <executions>
                         <execution>
                                 <id>generate-yaml-messaging-adapters</id>
@@ -225,7 +225,7 @@
                             <dependency>
                                 <groupId>uk.gov.justice.framework-generators</groupId>
                                 <artifactId>messaging-adapter-generator</artifactId>
-                                <version>${framework-generators.version}</version>
+                                <version>${framework.version}</version>
                             </dependency>
                             <dependency>
                                 <groupId>uk.gov.justice.services.example</groupId>
@@ -238,7 +238,7 @@
                     <plugin>
                         <groupId>uk.gov.justice.framework-generators</groupId>
                         <artifactId>messaging-client-generator-plugin</artifactId>
-                        <version>${framework-generators.version}</version>
+                        <version>${framework.version}</version>
                         <executions>
                             <execution>
                                 <id>generate-from-yaml</id>
@@ -274,7 +274,7 @@
                             <dependency>
                                 <groupId>uk.gov.justice.framework-generators</groupId>
                                 <artifactId>messaging-client-generator</artifactId>
-                                <version>${framework-generators.version}</version>
+                                <version>${framework.version}</version>
                             </dependency>
                             <dependency>
                                 <groupId>uk.gov.justice.services.example</groupId>
diff --git a/example-context/example-service/example-it/pom.xml b/example-context/example-service/example-it/pom.xml
index 5201ddcd..c3c3d3f7 100644
--- a/example-context/example-service/example-it/pom.xml
+++ b/example-context/example-service/example-it/pom.xml
@@ -35,7 +35,6 @@
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>aggregate-snapshot-repository</artifactId>
-            <version>${event-store.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -47,7 +46,6 @@
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-repository-jdbc</artifactId>
-            <version>${event-store.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -68,7 +66,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-core</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -85,13 +82,11 @@
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>test-utils-persistence</artifactId>
-            <version>${event-store.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-buffer-core</artifactId>
-            <version>${event-store.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -102,7 +97,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>file-service-api</artifactId>
-            <version>${file.service.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -123,7 +117,6 @@
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>published-event-processor</artifactId>
-            <version>${event-store.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -135,31 +128,26 @@
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>test-utils-event</artifactId>
-            <version>${event-store.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>subscription-manager</artifactId>
-            <version>${event-store.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-store-management-core</artifactId>
-            <version>${event-store.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>framework-management</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>jmx-api</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -170,31 +158,26 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>jmx-command-client</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-jmx</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-domain</artifactId>
-            <version>${event-store.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-store-management-commands</artifactId>
-            <version>${event-store.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-store-management-command-handler-extension</artifactId>
-            <version>${event-store.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -321,7 +304,7 @@
                     <dependency>
                         <groupId>uk.gov.justice.services</groupId>
                         <artifactId>file-service-liquibase</artifactId>
-                        <version>${file.service.version}</version>
+                        <version>${framework-libraries.version}</version>
                     </dependency>
                     <dependency>
                         <groupId>uk.gov.justice.services</groupId>
diff --git a/example-context/example-service/example-query/example-query-api/pom.xml b/example-context/example-service/example-query/example-query-api/pom.xml
index f2a2b5a8..024a78cb 100644
--- a/example-context/example-service/example-query/example-query-api/pom.xml
+++ b/example-context/example-service/example-query/example-query-api/pom.xml
@@ -29,27 +29,22 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>common</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>core</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-adapter-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-client-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.utils</groupId>
             <artifactId>utilities-file</artifactId>
-            <version>${utilities.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
@@ -58,7 +53,6 @@
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-adapter-file-service</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
 
         <!-- Test Dependencies -->
@@ -80,7 +74,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-core</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -102,7 +95,7 @@
             <plugin>
                 <groupId>uk.gov.justice.framework-generators</groupId>
                 <artifactId>rest-client-generator-plugin</artifactId>
-                <version>${framework-generators.version}</version>
+                <version>${framework.version}</version>
                 <executions>
                     <execution>
                         <id>external-ramls</id>
@@ -133,7 +126,7 @@
                     <dependency>
                         <groupId>uk.gov.justice.framework-generators</groupId>
                         <artifactId>rest-client-generator</artifactId>
-                        <version>${framework-generators.version}</version>
+                        <version>${framework.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/example-context/example-service/example-query/example-query-view/pom.xml b/example-context/example-service/example-query/example-query-view/pom.xml
index d81990e2..31b76547 100644
--- a/example-context/example-service/example-query/example-query-view/pom.xml
+++ b/example-context/example-service/example-query/example-query-view/pom.xml
@@ -29,17 +29,14 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>common</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>core</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-adapter-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services.example</groupId>
@@ -76,7 +73,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-core</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -88,7 +84,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-enveloper-provider</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/example-context/example-service/example-single/pom.xml b/example-context/example-service/example-single/pom.xml
index 1cb705ed..e8a11b05 100644
--- a/example-context/example-service/example-single/pom.xml
+++ b/example-context/example-service/example-single/pom.xml
@@ -62,12 +62,10 @@
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-publisher-timer</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>framework-management</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services.example</groupId>
@@ -78,24 +76,20 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>jmx-api</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-store-management-commands</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-store-management-command-handler-extension</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
 
         <!-- Test Dependencies -->
         <dependency>
             <groupId>uk.gov.justice.utils</groupId>
             <artifactId>test-utils-core</artifactId>
-            <version>${test-utils.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/example-context/example-service/pom.xml b/example-context/example-service/pom.xml
index cfbb07b8..23c23365 100644
--- a/example-context/example-service/pom.xml
+++ b/example-context/example-service/pom.xml
@@ -13,8 +13,6 @@
     <packaging>pom</packaging>
 
     <properties>
-        <plugins.raml-maven.version>${raml-maven-plugin.version}</plugins.raml-maven.version>
-        <wiremock.service.version>1.1.0</wiremock.service.version>
         <cpp.service-component>UNKNOWN_SERVICE_COMPONENT</cpp.service-component>
         <skip.mockito.json.validation>true</skip.mockito.json.validation>
     </properties>
@@ -52,7 +50,7 @@
                 <plugin>
                     <groupId>uk.gov.justice.maven</groupId>
                     <artifactId>raml-maven-plugin</artifactId>
-                    <version>${plugins.raml-maven.version}</version>
+                    <version>${framework.version}</version>
                     <executions>
                         <execution>
                             <id>generate-rest-clients</id>
@@ -101,12 +99,12 @@
                         <dependency>
                             <groupId>uk.gov.justice.framework-generators</groupId>
                             <artifactId>rest-client-generator</artifactId>
-                            <version>${framework-generators.version}</version>
+                            <version>${framework.version}</version>
                         </dependency>
                         <dependency>
                             <groupId>uk.gov.justice.framework-generators</groupId>
                             <artifactId>messaging-client-generator</artifactId>
-                            <version>${framework-generators.version}</version>
+                            <version>${framework.version}</version>
                         </dependency>
                         <dependency>
                             <groupId>javax</groupId>
@@ -120,7 +118,7 @@
                 <plugin>
                     <groupId>uk.gov.justice.schema</groupId>
                     <artifactId>catalog-generation-plugin</artifactId>
-                    <version>${json-schema-catalog.version}</version>
+                    <version>${framework-libraries.version}</version>
                     <executions>
                         <execution>
                             <id>schema-catalog-generation</id>
@@ -169,12 +167,12 @@
                         <dependency>
                             <groupId>uk.gov.justice.schema</groupId>
                             <artifactId>catalog-generation</artifactId>
-                            <version>${json-schema-catalog.version}</version>
+                            <version>${framework-libraries.version}</version>
                         </dependency>
                         <dependency>
                             <groupId>uk.gov.justice.maven.generator</groupId>
                             <artifactId>parser-common</artifactId>
-                            <version>${generator-maven-plugin.version}</version>
+                            <version>${framework-libraries.version}</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -205,7 +203,7 @@
                     <plugin>
                         <groupId>uk.gov.justice.maven</groupId>
                         <artifactId>raml-maven-plugin</artifactId>
-                        <version>${plugins.raml-maven.version}</version>
+                        <version>${framework.version}</version>
                         <executions>
                             <execution>
                                 <id>check-raml-syntax</id>
@@ -245,7 +243,7 @@
                             <dependency>
                                 <groupId>uk.gov.justice.framework-generators</groupId>
                                 <artifactId>lint-check-rules</artifactId>
-                                <version>${framework-generators.version}</version>
+                                <version>${framework.version}</version>
                             </dependency>
                             <dependency>
                                 <groupId>javax</groupId>
@@ -338,7 +336,7 @@
                     <plugin>
                         <groupId>uk.gov.justice.schema</groupId>
                         <artifactId>catalog-generation-plugin</artifactId>
-                        <version>${json-schema-catalog.version}</version>
+                        <version>${framework-libraries.version}</version>
                         <configuration>
                             <parserName>uk.gov.justice.maven.generator.io.files.parser.RamlFileParser
                             </parserName>
@@ -363,19 +361,19 @@
                             <dependency>
                                 <groupId>uk.gov.justice.schema</groupId>
                                 <artifactId>catalog-generation</artifactId>
-                                <version>${json-schema-catalog.version}</version>
+                                <version>${framework-libraries.version}</version>
                             </dependency>
                             <dependency>
                                 <groupId>uk.gov.justice.maven.generator</groupId>
-                                <artifactId>raml-parser</artifactId>
-                                <version>${generator-maven-plugin.version}</version>
+                                <artifactId>generator-raml-parser</artifactId>
+                                <version>${framework-libraries.version}</version>
                             </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
                         <groupId>uk.gov.justice.framework-generators</groupId>
                         <artifactId>rest-adapter-generator-plugin</artifactId>
-                        <version>${framework-generators.version}</version>
+                        <version>${framework.version}</version>
                         <executions>
                             <execution>
                                 <id>generate-rest-adapters</id>
@@ -407,14 +405,14 @@
                             <dependency>
                                 <groupId>uk.gov.justice.framework-generators</groupId>
                                 <artifactId>rest-adapter-generator</artifactId>
-                                <version>${framework-generators.version}</version>
+                                <version>${framework.version}</version>
                             </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
                         <groupId>uk.gov.justice.framework-generators</groupId>
                         <artifactId>messaging-adapter-generator-plugin</artifactId>
-                        <version>${framework-generators.version}</version>
+                        <version>${framework.version}</version>
                            <executions>
                             <execution>
                                 <id>generate-raml-messaging-adapters</id>
@@ -449,14 +447,14 @@
                             <dependency>
                                 <groupId>uk.gov.justice.framework-generators</groupId>
                                 <artifactId>messaging-adapter-generator</artifactId>
-                                <version>${framework-generators.version}</version>
+                                <version>${framework.version}</version>
                             </dependency>
                         </dependencies>
                     </plugin>
                     <plugin>
                         <groupId>uk.gov.justice.framework-generators</groupId>
                         <artifactId>messaging-client-generator-plugin</artifactId>
-                        <version>${framework-generators.version}</version>
+                        <version>${framework.version}</version>
                         <executions>
                             <execution>
                                 <id>generate-src-raml-message-clients</id>
@@ -489,7 +487,7 @@
                             <dependency>
                                 <groupId>uk.gov.justice.framework-generators</groupId>
                                 <artifactId>messaging-client-generator</artifactId>
-                                <version>${framework-generators.version}</version>
+                                <version>${framework.version}</version>
                             </dependency>
                         </dependencies>
                     </plugin>
diff --git a/pom.xml b/pom.xml
index 44ff9192..13cf5b13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,82 +31,26 @@
     <properties>
         <cpp.repo.name>cake-shop</cpp.repo.name>
 
-        <framework-api.version>4.1.0</framework-api.version>
-        <framework.version>6.4.0</framework.version>
-        <event-store.version>2.4.9</event-store.version>
-        <framework-generators.version>2.4.0</framework-generators.version>
-        <file.service.version>1.17.12</file.service.version>
-
-        <common-bom.version>2.4.0</common-bom.version>
-        <utilities.version>1.20.3</utilities.version>
-        <test-utils.version>1.24.3</test-utils.version>
-
-        <json-schema-catalog.version>1.7.6</json-schema-catalog.version>
-        <embedded-artemis.version>1.2.0</embedded-artemis.version>
-        <generator-maven-plugin.version>2.7.2</generator-maven-plugin.version>
-        <jboss-ejb3-ext-api.version>2.2.0.Final</jboss-ejb3-ext-api.version>
-        <jboss-vfs.version>3.2.12.Final</jboss-vfs.version>
-        <raml-maven-plugin.version>1.6.9</raml-maven-plugin.version>
-        <annotation-validator-maven-plugin.version>1.0.1</annotation-validator-maven-plugin.version>
-        <json-transformer.version>1.0.9</json-transformer.version>
+        <framework-libraries.version>7.0.4</framework-libraries.version>
+        <framework.version>7.0.3</framework.version>
+        <event-store.version>7.0.1</event-store.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>uk.gov.justice</groupId>
-                <artifactId>maven-common-bom</artifactId>
-                <version>${common-bom.version}</version>
+                <groupId>uk.gov.justice.event-store</groupId>
+                <artifactId>event-store-bom</artifactId>
+                <version>${event-store.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.artemis</groupId>
                 <artifactId>embedded-artemis</artifactId>
-                <version>${embedded-artemis.version}</version>
+                <version>${framework-libraries.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>uk.gov.justice.services</groupId>
-                <artifactId>file-service-persistence</artifactId>
-                <version>${file.service.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>uk.gov.justice.utils</groupId>
-                <artifactId>utilities-core</artifactId>
-                <version>${utilities.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.ejb3</groupId>
-                <artifactId>jboss-ejb3-ext-api</artifactId>
-                <version>${jboss-ejb3-ext-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>uk.gov.justice.utils</groupId>
-                <artifactId>test-utils-logging-simple</artifactId>
-                <version>${test-utils.version}</version>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>uk.gov.justice.utils</groupId>
-                <artifactId>test-utils-logging-log4j</artifactId>
-                <version>${test-utils.version}</version>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>uk.gov.justice.framework-api</groupId>
-                <artifactId>framework-api-bom</artifactId>
-                <version>${framework-api.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>uk.gov.justice.services</groupId>
-                <artifactId>framework-bom</artifactId>
-                <version>${framework.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -131,7 +75,7 @@
             <plugin>
                 <groupId>uk.gov.justice.maven</groupId>
                 <artifactId>annotation-validator-maven-plugin</artifactId>
-                <version>${annotation-validator-maven-plugin.version}</version>
+                <version>${framework-libraries.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -156,7 +100,7 @@
                     <dependency>
                         <groupId>uk.gov.justice.framework-api</groupId>
                         <artifactId>framework-api-validator</artifactId>
-                        <version>${framework-api.version}</version>
+                        <version>${framework-libraries.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>