diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 656fc7c..821e2f5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -20,7 +20,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/utilis/ObjectConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/KlausMvcController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/KlausMvcController.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/main/java/com/release11/klaus/controller/KlausMvcController.java b/src/main/java/com/release11/klaus/controller/KlausMvcController.java
index 2bf568f..1225fe0 100644
--- a/src/main/java/com/release11/klaus/controller/KlausMvcController.java
+++ b/src/main/java/com/release11/klaus/controller/KlausMvcController.java
@@ -8,6 +8,7 @@ import com.release11.klaus.utilis.TrackingClient;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -32,7 +33,8 @@ import java.util.*;
 @AllArgsConstructor
 public class KlausMvcController {
     private final KlausService klausService;
-    private static MockedMessageDto globalMockedMessageDto = new MockedMessageDto();
+    @Autowired
+    private static MockedMessageDto globalMockedMessageDto;
     private final Set<MockedMessageDto> globalMockedMessageDtoList = new HashSet<>();
 
     @SneakyThrows
@@ -47,6 +49,11 @@ public class KlausMvcController {
         return "mock";
     }
 
+//    @GetMapping("/mock/raw/{uuid}")
+//    public MockedMessageDto getJsonMessageDto(){
+//        return globalMockedMessageDto;
+//    }
+
     @PostMapping("/mock/{uuid}")
     public String showHomePost(@Valid MockedMessageDto mockedMessageDto, BindingResult bindingResult, Model model) {
         TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "setMockedResponse",
diff --git a/src/main/java/com/release11/klaus/utilis/ObjectConfig.java b/src/main/java/com/release11/klaus/utilis/ObjectConfig.java
new file mode 100644
index 0000000..470708b
--- /dev/null
+++ b/src/main/java/com/release11/klaus/utilis/ObjectConfig.java
@@ -0,0 +1,13 @@
+package com.release11.klaus.utilis;
+
+import com.release11.klaus.model.MockedMessageDto;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class ObjectConfig {
+    @Bean
+    public MockedMessageDto globalMessageDto(){
+        return new MockedMessageDto();
+    }
+}