diff --git a/jikkou/kafka-connectors-values.yaml b/jikkou/kafka-connectors-values.yaml
index e0b5f6b..04b3357 100644
--- a/jikkou/kafka-connectors-values.yaml
+++ b/jikkou/kafka-connectors-values.yaml
@@ -103,6 +103,12 @@ apps:
       - topicName: topic.ProcessedBsm
         collectionName: ProcessedBsm
         generateTimestamp: true
+      - topicName: topic.ProcessedSrm
+        collectionName: ProcessedSrm
+        generateTimestamp: true
+      - topicName: topic.ProcessedSsm
+        collectionName: ProcessedSsm
+        generateTimestamp: true
   intersection_api:
     name: intersection_api
     connectors:
@@ -271,7 +277,10 @@ apps:
         collectionName: CmRtcmMinimumDataEventAggregation
         generateTimestamp: true
         timestampField: eventGeneratedAt
-
+      - topicName: topic.CmPriorityPreemptionRequestEvent
+        collectionName: CmPriorityPreemptionRequestEvent
+        useTimestamp: true
+        timestampField: eventGeneratedAt
 
 
       # Record BSM events:
diff --git a/jikkou/kafka-topics-values.yaml b/jikkou/kafka-topics-values.yaml
index 21a60c2..55e78a0 100644
--- a/jikkou/kafka-topics-values.yaml
+++ b/jikkou/kafka-topics-values.yaml
@@ -88,6 +88,8 @@ apps:
       - topic.ProcessedMapWKT
       - topic.ProcessedBsm
       - topic.ProcessedRtcm
+      - topic.ProcessedSrm
+      - topic.ProcessedSsm
     tableTopics: {}
     customTopics: {}
   conflictmonitor:
@@ -128,6 +130,7 @@ apps:
       - topic.CmMapMessageCountProgressionEventAggregation
       - topic.CmSpatMessageCountProgressionEventAggregation
       - topic.CmRevocableEnabledLaneAlignmentEventAggregation
+      - topic.CmPriorityPreemptionRequestEvent
     tableTopics:
       - topic.CmLaneDirectionOfTravelNotification
       - topic.CmConnectionOfTravelNotification
diff --git a/mongo/create_indexes.js b/mongo/create_indexes.js
index 0344f5d..d0a1244 100644
--- a/mongo/create_indexes.js
+++ b/mongo/create_indexes.js
@@ -81,7 +81,9 @@ const odeCollections = [
 const geoJsonConverterCollections = [
     {name: "ProcessedMap", ttlField: "recordGeneratedAt", timeField: "properties.timeStamp", intersectionField: "properties.intersectionId", expireTime: expireSeconds},
     {name: "ProcessedSpat", ttlField: "recordGeneratedAt", timeField: "utcTimeStamp", intersectionField: "intersectionId", expireTime: expireSeconds},
-    {name: "ProcessedBsm", ttlField: "recordGeneratedAt", timeField: "timeStamp", geoSpatialField: "geometry.coordinates", expireTime: expireSeconds}
+    {name: "ProcessedBsm", ttlField: "recordGeneratedAt", timeField: "timeStamp", geoSpatialField: "geometry.coordinates", expireTime: expireSeconds},
+    {name: "ProcessedSrm", ttlField: "recordGeneratedAt", timeField: "timeStamp", geoSpatialField: "geometry.coordinates", expireTime: expireSeconds},
+    {name: "ProcessedSsm", ttlField: "recordGeneratedAt", timeField: "timeStamp", geoSpatialField: "geometry.coordinates", expireTime: expireSeconds}
 ];
 
 
@@ -104,7 +106,7 @@ const conflictMonitorCollections = [
     { name: "CmTimestampDeltaEvent", ttlField: "eventGeneratedAt", timeField: "eventGeneratedAt", intersectionField: "intersectionID", expireTime: expireSeconds },
     { name: "CmSpatTransitionEvent", ttlField: "eventGeneratedAt", timeField: "eventGeneratedAt", intersectionField: "intersectionID", expireTime: expireSeconds },
     { name: "CmEventStateProgressionEvent", ttlField: "eventGeneratedAt", timeField: "eventGeneratedAt", intersectionField: "intersectionID", expireTime: expireSeconds },
-
+    { name: "CmPriorityPreemptionRequestEvent", ttlField: "eventGeneratedAt", timeField: "eventGeneratedAt", intersectionField: "intersectionID", expireTime: expireSeconds },
     
 
 
@@ -113,6 +115,7 @@ const conflictMonitorCollections = [
     { name: "CmBsmMessageCountProgressionEvents", ttlField: "eventGeneratedAt", timeField: "eventGeneratedAt", intersectionField: "intersectionID", expireTime: expireSeconds },
     { name: "CmRevocableEnabledLaneAlignmentEvent", ttlField: "eventGeneratedAt", timeField: "eventGeneratedAt", intersectionField: "intersectionID", expireTime: expireSeconds },
 
+
     { name: "CmSpatMinimumDataEventAggregation", ttlField: "eventGeneratedAt", timeField: "eventGeneratedAt", intersectionField: "intersectionID", expireTime: expireSeconds },
     { name: "CmMapMinimumDataEventAggregation", ttlField: "eventGeneratedAt", timeField: "eventGeneratedAt", intersectionField: "intersectionID", expireTime: expireSeconds },
     { name: "CmIntersectionReferenceAlignmentEventAggregation", ttlField: "eventGeneratedAt", timeField: "eventGeneratedAt", intersectionField: "intersectionID", expireTime: expireSeconds },