diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index cbe742a..2ce15a4 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -2,31 +2,78 @@
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
-        </value>
+        <value />
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
+    <SqlCodeStyleSettings version="5">
+      <option name="KEYWORD_CASE" value="1" />
+      <option name="IDENTIFIER_CASE" value="1" />
+      <option name="TYPE_CASE" value="4" />
+      <option name="ALIAS_CASE" value="4" />
+      <option name="BUILT_IN_CASE" value="4" />
+      <option name="QUOTE_IDENTIFIER" value="1" />
+      <option name="QUERY_EL_LINE" value="0" />
+      <option name="QUERY_IN_ONE_STRING" value="3" />
+      <option name="SUBQUERY_CONTENT" value="2" />
+      <option name="SUBQUERY_CLOSING" value="2" />
+      <option name="INSERT_OPENING" value="4" />
+      <option name="INSERT_CLOSING" value="0" />
+      <option name="INSERT_VALUES_EL_LINE" value="101" />
+      <option name="INSERT_COLLAPSE_MULTI_ROW_VALUES" value="true" />
+      <option name="SET_EL_LINE" value="1" />
+      <option name="SET_EL_WRAP" value="0" />
+      <option name="WITH_EL_LINE" value="101" />
+      <option name="WITH_EL_WRAP" value="2" />
+      <option name="SELECT_EL_LINE" value="101" />
+      <option name="SELECT_EL_COMMA" value="2" />
+      <option name="SELECT_NEW_LINE_AFTER_ALL_DISTINCT" value="true" />
+      <option name="SELECT_KEEP_N_ITEMS_IN_LINE" value="4" />
+      <option name="SELECT_USE_AS_WORD" value="1" />
+      <option name="FROM_EL_LINE" value="1" />
+      <option name="FROM_EL_COMMA" value="2" />
+      <option name="FROM_ALIGN_JOIN_TABLES" value="true" />
+      <option name="FROM_INDENT_JOIN" value="false" />
+      <option name="FROM_PLACE_ON" value="10" />
+      <option name="WHERE_EL_LINE" value="1" />
+      <option name="WHERE_EL_WRAP" value="3" />
+      <option name="ORDER_EL_LINE" value="101" />
+      <option name="ORDER_EL_WRAP" value="1" />
+      <option name="ORDER_EL_COMMA" value="2" />
+    </SqlCodeStyleSettings>
+    <codeStyleSettings language="SQL">
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+      <indentOptions>
+        <option name="SMART_TABS" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="LINE_COMMENT_ADD_SPACE" value="true" />
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
-      <option name="LINE_COMMENT_ADD_SPACE" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="5" />
+      <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
       <indentOptions>
-        <option name="INDENT_SIZE" value="4" />
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/All_Tests.xml b/.idea/runConfigurations/All_Tests.xml
index 1f251d0..6a6b371 100644
--- a/.idea/runConfigurations/All_Tests.xml
+++ b/.idea/runConfigurations/All_Tests.xml
@@ -32,7 +32,6 @@
       <option name="Make" enabled="true" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="SQL Fixtures on DEV" run_configuration_type="ShConfigurationType" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="Lint Format" run_configuration_type="GradleRunConfiguration" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Pitest" run_configuration_type="GradleRunConfiguration" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Build_and_start_all_Docker.xml b/.idea/runConfigurations/Build_and_start_all_Docker.xml
index e3012ae..3248709 100644
--- a/.idea/runConfigurations/Build_and_start_all_Docker.xml
+++ b/.idea/runConfigurations/Build_and_start_all_Docker.xml
@@ -2,6 +2,7 @@
   <configuration default="false" name="Build and start all Docker" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
     <deployment type="docker-compose.yml">
       <settings>
+        <option name="envFilePath" value="" />
         <option name="envVars">
           <list>
             <DockerEnvVarImpl>
@@ -11,6 +12,11 @@
           </list>
         </option>
         <option name="commandLineOptions" value="--build" />
+        <option name="secondarySourceFiles">
+          <list>
+            <option value="docker-compose-sonar.yml" />
+          </list>
+        </option>
         <option name="services">
           <list>
             <option value="app" />
@@ -23,6 +29,8 @@
           </list>
         </option>
         <option name="sourceFilePath" value="docker-compose.yml" />
+        <option name="upExitCodeFromService" value="" />
+        <option name="upTimeout" value="" />
       </settings>
     </deployment>
     <method v="2" />
diff --git a/.idea/runConfigurations/Check.xml b/.idea/runConfigurations/Check.xml
deleted file mode 100644
index 78058b2..0000000
--- a/.idea/runConfigurations/Check.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Check" type="CompoundRunConfigurationType">
-    <toRun name="Pitest" type="GradleRunConfiguration" />
-    <toRun name="Lint Format" type="GradleRunConfiguration" />
-    <toRun name="All Tests" type="JUnit" />
-    <toRun name="Test All SQL" type="ShConfigurationType" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Pitest.xml b/.idea/runConfigurations/Down_Docker.xml
similarity index 83%
rename from .idea/runConfigurations/Pitest.xml
rename to .idea/runConfigurations/Down_Docker.xml
index ae05465..895be77 100644
--- a/.idea/runConfigurations/Pitest.xml
+++ b/.idea/runConfigurations/Down_Docker.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Pitest" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Down Docker" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="pitest" />
+          <option value="testComposeDownForced" />
         </list>
       </option>
       <option name="vmOptions" value="" />
diff --git a/.idea/runConfigurations/Run_dependencies.xml b/.idea/runConfigurations/Run_dependencies.xml
index 4f176b6..d920570 100644
--- a/.idea/runConfigurations/Run_dependencies.xml
+++ b/.idea/runConfigurations/Run_dependencies.xml
@@ -12,6 +12,11 @@
           </list>
         </option>
         <option name="commandLineOptions" value="--build" />
+        <option name="secondarySourceFiles">
+          <list>
+            <option value="docker-compose-sonar.yml" />
+          </list>
+        </option>
         <option name="services">
           <list>
             <option value="db" />
diff --git a/.idea/runConfigurations/Run_for_dev.xml b/.idea/runConfigurations/Run_for_dev.xml
deleted file mode 100644
index 6f3d752..0000000
--- a/.idea/runConfigurations/Run_for_dev.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run for dev" type="CompoundRunConfigurationType">
-    <toRun name="Run dependencies" type="docker-deploy" />
-    <toRun name="Run" type="GradleRunConfiguration" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Start_Db.xml b/.idea/runConfigurations/Start_Db.xml
deleted file mode 100644
index 67a8728..0000000
--- a/.idea/runConfigurations/Start_Db.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Start Db" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
-    <deployment type="docker-compose.yml">
-      <settings>
-        <option name="envVars">
-          <list>
-            <DockerEnvVarImpl>
-              <option name="name" value="SEND_GRID_KEY" />
-              <option name="value" value="$SEND_GRID_KEY$" />
-            </DockerEnvVarImpl>
-          </list>
-        </option>
-        <option name="commandLineOptions" value="--build" />
-        <option name="services">
-          <list>
-            <option value="db" />
-          </list>
-        </option>
-        <option name="sourceFilePath" value="docker-compose.yml" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Start_Elasticsearch.xml b/.idea/runConfigurations/Start_Elasticsearch.xml
deleted file mode 100644
index 09a1592..0000000
--- a/.idea/runConfigurations/Start_Elasticsearch.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Start Elasticsearch" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
-    <deployment type="docker-compose.yml">
-      <settings>
-        <option name="commandLineOptions" value="--build" />
-        <option name="services">
-          <list>
-            <option value="elasticsearch" />
-          </list>
-        </option>
-        <option name="sourceFilePath" value="docker-compose.yml" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Start_RabbitMQ.xml b/.idea/runConfigurations/Start_RabbitMQ.xml
deleted file mode 100644
index f3501bf..0000000
--- a/.idea/runConfigurations/Start_RabbitMQ.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Start RabbitMQ" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
-    <deployment type="docker-compose.yml">
-      <settings>
-        <option name="envVars">
-          <list>
-            <DockerEnvVarImpl>
-              <option name="name" value="SEND_GRID_KEY" />
-              <option name="value" value="$SEND_GRID_KEY$" />
-            </DockerEnvVarImpl>
-          </list>
-        </option>
-        <option name="commandLineOptions" value="--build" />
-        <option name="services">
-          <list>
-            <option value="rabbitmq" />
-          </list>
-        </option>
-        <option name="sourceFilePath" value="docker-compose.yml" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Start_Redis.xml b/.idea/runConfigurations/Start_Redis.xml
deleted file mode 100644
index 6504ca9..0000000
--- a/.idea/runConfigurations/Start_Redis.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Start Redis" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
-    <deployment type="docker-compose.yml">
-      <settings>
-        <option name="envVars">
-          <list>
-            <DockerEnvVarImpl>
-              <option name="name" value="SEND_GRID_KEY" />
-              <option name="value" value="$SEND_GRID_KEY$" />
-            </DockerEnvVarImpl>
-          </list>
-        </option>
-        <option name="commandLineOptions" value="--build" />
-        <option name="services">
-          <list>
-            <option value="redis" />
-          </list>
-        </option>
-        <option name="sourceFilePath" value="docker-compose.yml" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file