diff --git a/src/main/java/com/mattrixwv/cipherstream/config/FullFilter.java b/src/main/java/com/mattrixwv/cipherstream/config/FullFilter.java
index 7e5bf05..e66e214 100644
--- a/src/main/java/com/mattrixwv/cipherstream/config/FullFilter.java
+++ b/src/main/java/com/mattrixwv/cipherstream/config/FullFilter.java
@@ -3,6 +3,7 @@ package com.mattrixwv.cipherstream.config;
 
 import java.io.IOException;
 import java.util.StringJoiner;
+import java.util.UUID;
 
 import org.slf4j.MDC;
 import org.springframework.lang.NonNull;
@@ -37,6 +38,9 @@ public class FullFilter extends OncePerRequestFilter{
 		if(request.getHeader("X-Request-Id") != null){
 			MDC.put("requestId", request.getHeader("X-Request-Id"));
 		}
+		else{
+			MDC.put("requestId", UUID.randomUUID().toString());
+		}
 
 		//Get IP address
 		if(request.getHeader("X-Forwarded-For") != null){
diff --git a/src/main/resources/template.json b/src/main/resources/template.json
index cf76113..e81ad85 100644
--- a/src/main/resources/template.json
+++ b/src/main/resources/template.json
@@ -1,5 +1,5 @@
 {
-	"msg_timestamp": {
+	"timestamp": {
 		"$resolver": "timestamp",
 		"pattern": {
 			"format": "yyyy-MM-dd HH:mm:ss.SSSZ"
@@ -9,10 +9,6 @@
 		"$resolver": "level",
 		"field": "name"
 	},
-	"requestId": {
-		"$resolver": "mdc",
-		"key": "requestId"
-	},
 	"logger": {
 		"$resolver": "logger",
 		"field": "name"