diff --git a/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml
new file mode 100644
index 0000000..3077cc0
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/retry/spring-retry/1.2.5.RELEASE/spring-retry-1.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/retry/spring-retry/1.2.5.RELEASE/spring-retry-1.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/retry/spring-retry/1.2.5.RELEASE/spring-retry-1.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 72fff16..0c15478 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,7 +22,15 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="" />
+    <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Klaus.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Klaus.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -73,7 +81,7 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit5" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit5" value="" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../mockedservices-klaus-config-server" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources" />
     <property name="restartRequiresConfirmation" value="false" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
@@ -97,11 +105,11 @@
       <recent name="D:\git\Szakalakamaka\Klaus\src\main\resources\static" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\phabricator\mockedservices-master\src\main\resources" />
+      <recent name="D:\phabricator\mockedservices-master\src\main\resources\templates" />
       <recent name="D:\git\Szakalakamaka\Klaus\src\main\resources\static\js" />
       <recent name="D:\git\Szakalakamaka\Klaus\src\main\resources\templates" />
       <recent name="D:\git\Szakalakamaka\Klaus\src\main\resources\static\img" />
-      <recent name="D:\git\Szakalakamaka\Klaus\src\main\resources\static\images" />
-      <recent name="D:\git\Szakalakamaka\Klaus\src\main\resources\static\assets\img" />
     </key>
     <key name="CreateClassDialog.RecentsKey">
       <recent name="com.release11.klaus.repository" />
@@ -261,13 +269,6 @@
       <option name="presentableId" value="Default" />
       <updated>1598862102028</updated>
     </task>
-    <task id="LOCAL-00057" summary="adding logs from the application">
-      <created>1601297400597</created>
-      <option name="number" value="00057" />
-      <option name="presentableId" value="LOCAL-00057" />
-      <option name="project" value="LOCAL" />
-      <updated>1601297400597</updated>
-    </task>
     <task id="LOCAL-00058" summary="adding logs from the application">
       <created>1601297733933</created>
       <option name="number" value="00058" />
@@ -604,7 +605,14 @@
       <option name="project" value="LOCAL" />
       <updated>1602747495998</updated>
     </task>
-    <option name="localTasksCounter" value="106" />
+    <task id="LOCAL-00106" summary="EUREKA_INSTANCE_PREFER_IP_ADDRESS: true">
+      <created>1602747978224</created>
+      <option name="number" value="00106" />
+      <option name="presentableId" value="LOCAL-00106" />
+      <option name="project" value="LOCAL" />
+      <updated>1602747978224</updated>
+    </task>
+    <option name="localTasksCounter" value="107" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -692,41 +700,41 @@
     <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602062761111" />
     <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602747357420" />
     <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1602147205037" />
-    <state width="1493" height="58" key="GridCell.Tab.0.bottom" timestamp="1602683462011">
-      <screen x="0" y="0" width="1536" height="824" />
+    <state width="1877" height="386" key="GridCell.Tab.0.bottom" timestamp="1602755512350">
+      <screen x="1920" y="0" width="1920" height="1160" />
     </state>
     <state width="1877" height="239" key="GridCell.Tab.0.bottom/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
     <state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
     <state width="1877" height="261" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424969" />
-    <state width="1493" height="58" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602683462011" />
-    <state width="1877" height="309" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602674787447" />
+    <state width="1493" height="274" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602752975306" />
+    <state width="1877" height="386" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602755512350" />
     <state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
-    <state width="1493" height="58" key="GridCell.Tab.0.center" timestamp="1602683462011">
-      <screen x="0" y="0" width="1536" height="824" />
+    <state width="1877" height="386" key="GridCell.Tab.0.center" timestamp="1602755512350">
+      <screen x="1920" y="0" width="1920" height="1160" />
     </state>
     <state width="1877" height="239" key="GridCell.Tab.0.center/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
     <state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
     <state width="1877" height="261" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424968" />
-    <state width="1493" height="58" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602683462011" />
-    <state width="1877" height="309" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602674787447" />
+    <state width="1493" height="274" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602752975306" />
+    <state width="1877" height="386" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602755512350" />
     <state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
-    <state width="1493" height="58" key="GridCell.Tab.0.left" timestamp="1602683462010">
-      <screen x="0" y="0" width="1536" height="824" />
+    <state width="1877" height="386" key="GridCell.Tab.0.left" timestamp="1602755512349">
+      <screen x="1920" y="0" width="1920" height="1160" />
     </state>
     <state width="1877" height="239" key="GridCell.Tab.0.left/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
     <state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
     <state width="1877" height="261" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424967" />
-    <state width="1493" height="58" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602683462010" />
-    <state width="1877" height="309" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602674787447" />
+    <state width="1493" height="274" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602752975306" />
+    <state width="1877" height="386" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602755512349" />
     <state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
-    <state width="1493" height="58" key="GridCell.Tab.0.right" timestamp="1602683462011">
-      <screen x="0" y="0" width="1536" height="824" />
+    <state width="1877" height="386" key="GridCell.Tab.0.right" timestamp="1602755512350">
+      <screen x="1920" y="0" width="1920" height="1160" />
     </state>
     <state width="1877" height="239" key="GridCell.Tab.0.right/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
     <state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
     <state width="1877" height="261" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424969" />
-    <state width="1493" height="58" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602683462011" />
-    <state width="1877" height="309" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602674787447" />
+    <state width="1493" height="274" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602752975306" />
+    <state width="1877" height="386" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602755512350" />
     <state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
     <state width="1877" height="297" key="GridCell.Tab.1.bottom" timestamp="1602672852817">
       <screen x="1920" y="0" width="1920" height="1160" />
@@ -774,13 +782,13 @@
     </state>
     <state x="277" y="57" key="SettingsEditor/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600935670743" />
     <state x="277" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1601975962923" />
-    <state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1602747500252">
+    <state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1602747980842">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="451" y="183" key="Vcs.Push.Dialog.v2/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275760386" />
     <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600350277680" />
     <state x="2371" y="183" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255416393" />
-    <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602747500252" />
+    <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602747980842" />
     <state x="2371" y="204" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602678116120" />
     <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1602145235569" />
     <state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1602076898344">
diff --git a/Klaus.iml b/Klaus.iml
index 9d7024e..7269cf0 100644
--- a/Klaus.iml
+++ b/Klaus.iml
@@ -191,5 +191,6 @@
     <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.11.1" level="project" />
     <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
     <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index cf08277..189466f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,6 +110,10 @@
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 			<version>${eureka-client.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.retry</groupId>
+			<artifactId>spring-retry</artifactId>
+		</dependency>
     </dependencies>
 
 	<build>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index ff451ba..4071bd9 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,13 +1,23 @@
 #environment:
-eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/
-
 server.port = 8097
+
 spring.application.name = klaus
+spring.profiles.active = DEV
+
 spring.cloud.discovery.enabled=true
+spring.cloud.config.discovery.enabled = true
 spring.cloud.config.discovery.service-id = klaus-config-service
-#spring.cloud.config.fail-fast=true
+spring.cloud.config.fail-fast=true
+spring.cloud.config.retry.initial-interval = 1500
+spring.cloud.config.retry.multiplier = 1.5
+spring.cloud.config.retry.max-attempts = 10000
+spring.cloud.config.retry.max-intervals = 1000
 #spring.cloud.config.username = SpringConfigUsername
 #spring.cloud.config.password = SpringConfigPassword
+
+eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/
+
+
 #logging:
 spring.output.ansi.enabled = always
 logging.level.root=INFO
diff --git a/target/classes/application.properties b/target/classes/application.properties
index 1eaba88..4071bd9 100644
--- a/target/classes/application.properties
+++ b/target/classes/application.properties
@@ -1,12 +1,23 @@
 #environment:
-eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/
 server.port = 8097
+
 spring.application.name = klaus
+spring.profiles.active = DEV
+
 spring.cloud.discovery.enabled=true
+spring.cloud.config.discovery.enabled = true
 spring.cloud.config.discovery.service-id = klaus-config-service
-#spring.cloud.config.fail-fast=true
+spring.cloud.config.fail-fast=true
+spring.cloud.config.retry.initial-interval = 1500
+spring.cloud.config.retry.multiplier = 1.5
+spring.cloud.config.retry.max-attempts = 10000
+spring.cloud.config.retry.max-intervals = 1000
 #spring.cloud.config.username = SpringConfigUsername
 #spring.cloud.config.password = SpringConfigPassword
+
+eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/
+
+
 #logging:
 spring.output.ansi.enabled = always
 logging.level.root=INFO
diff --git a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java
index 1b2b051..5e7d511 100644
--- a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java
+++ b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2020-10-14T15:19:25+0200",
+    date = "2020-10-15T11:51:20+0200",
     comments = "version: 1.3.1.Final, compiler: javac, environment: Java 14.0.1 (Oracle Corporation)"
 )
 @Component