diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/DemoApplication.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/DemoApplication.java
index 983d9e46babbcac857704ecdccaed7ead472194d..c15a1141b6e0e2468f9d7b09f1a679531fa6c3bc 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/DemoApplication.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/DemoApplication.java
@@ -1,12 +1,18 @@
 package cz.muni.ics.kypo.training.adaptive;
 
 import cz.muni.ics.kypo.commons.startup.config.MicroserviceRegistrationConfiguration;
+import cz.muni.ics.kypo.training.adaptive.config.ObjectMapperConfigElasticsearch;
+import cz.muni.ics.kypo.training.adaptive.config.ValidationMessagesConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Import;
 
 @SpringBootApplication
-@Import(value = {MicroserviceRegistrationConfiguration.class})
+@Import(value = {
+        MicroserviceRegistrationConfiguration.class,
+        ValidationMessagesConfig.class,
+        ObjectMapperConfigElasticsearch.class
+})
 public class DemoApplication {
 
     public static void main(String[] args) {
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/config/ObjectMapperConfigElasticsearch.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/config/ObjectMapperConfigElasticsearch.java
index 0da28da4d11878f9cad3510908b09744b69ddb91..a98bf408c04571a20536766a6abf67ebc665cca6 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/config/ObjectMapperConfigElasticsearch.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/config/ObjectMapperConfigElasticsearch.java
@@ -1,4 +1,4 @@
-package cz.muni.csirt.kypo.elasticsearch.service.config;
+package cz.muni.ics.kypo.training.adaptive.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/exceptions/ElasticsearchTrainingServiceLayerException.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/exceptions/ElasticsearchTrainingServiceLayerException.java
new file mode 100644
index 0000000000000000000000000000000000000000..3c43ee11088d1c41f2141650020d34b2f80954d5
--- /dev/null
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/exceptions/ElasticsearchTrainingServiceLayerException.java
@@ -0,0 +1,41 @@
+package cz.muni.ics.kypo.training.adaptive.exceptions;
+
+/**
+ * The type Elasticsearch training service layer exception.
+ */
+public class ElasticsearchTrainingServiceLayerException extends RuntimeException {
+
+    /**
+     * Instantiates a new Elasticsearch training service layer exception.
+     */
+    public ElasticsearchTrainingServiceLayerException() {
+    }
+
+    /**
+     * Instantiates a new Elasticsearch training service layer exception.
+     *
+     * @param message the message
+     */
+    public ElasticsearchTrainingServiceLayerException(String message) {
+        super(message);
+    }
+
+    /**
+     * Instantiates a new Elasticsearch training service layer exception.
+     *
+     * @param message the message
+     * @param ex      the exception
+     */
+    public ElasticsearchTrainingServiceLayerException(String message, Throwable ex) {
+        super(message, ex);
+    }
+
+    /**
+     * Instantiates a new Elasticsearch training service layer exception.
+     *
+     * @param ex the exception
+     */
+    public ElasticsearchTrainingServiceLayerException(Throwable ex) {
+        super(ex);
+    }
+}