diff --git a/mappings/info_recruits/citizen_tables/education/russian_diploma/recruitment_five_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/border_crossing/recruitment_five_flow_delta.hpl
similarity index 81%
rename from mappings/info_recruits/citizen_tables/education/russian_diploma/recruitment_five_flow_repeat.hpl
rename to mappings/info_recruits/citizen_tables/border_crossing/recruitment_five_flow_delta.hpl
index fca1560..01ec515 100644
--- a/mappings/info_recruits/citizen_tables/education/russian_diploma/recruitment_five_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/border_crossing/recruitment_five_flow_delta.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>recruitment_five_flow_repeat</name>
+    <name>recruitment_five_flow_delta</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,36 +13,36 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/01 17:02:32.905</created_date>
+    <created_date>2025/08/11 13:16:11.204</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/01 17:02:32.905</modified_date>
+    <modified_date>2025/08/11 13:16:11.204</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
       <from>Table input</from>
-      <to>russian_diploma_flow_repeat.hpl</to>
+      <to>border_crossing_flow_delta.hpl</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>russian_diploma_flow_repeat.hpl 2</to>
+      <to>border_crossing_flow_delta.hpl 2</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>russian_diploma_flow_repeat.hpl 3</to>
+      <to>border_crossing_flow_delta.hpl 3</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>russian_diploma_flow_repeat.hpl 4</to>
+      <to>border_crossing_flow_delta.hpl 4</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>russian_diploma_flow_repeat.hpl 5</to>
+      <to>border_crossing_flow_delta.hpl 5</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -57,25 +57,25 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>ervu-dashboard-test</connection>
+    <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
     <limit>0</limit>
-    <sql>SELECT r.idm_id AS recruitment_id
+    <sql>SELECT
+    r.idm_id as recruitment_id
 FROM ervu_dashboard.recruitment r
          LEFT JOIN etl.job_execution je
                    ON r.idm_id = je.recruitment_id
-                       AND je.job_name = 'russian_diploma_job'
-WHERE je.id IS NULL
-   OR je.status IN ('ERROR', 'PROCESSING');</sql>
+                       and job_name = 'border_crossing_job'
+where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING');</sql>
     <variables_active>N</variables_active>
     <attributes/>
     <GUI>
-      <xloc>368</xloc>
-      <yloc>352</yloc>
+      <xloc>352</xloc>
+      <yloc>288</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>russian_diploma_flow_repeat.hpl</name>
+    <name>border_crossing_flow_delta.hpl</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -86,7 +86,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/border_crossing/parallel/border_crossing_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -94,10 +94,15 @@ WHERE je.id IS NULL
     <group_time/>
     <parameters>
       <variable_mapping>
-        <variable/>
+        <variable>IDM_ID</variable>
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>border_crossing_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -121,12 +126,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>576</xloc>
-      <yloc>192</yloc>
+      <xloc>640</xloc>
+      <yloc>128</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>russian_diploma_flow_repeat.hpl 2</name>
+    <name>border_crossing_flow_delta.hpl 2</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -137,7 +142,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/border_crossing/parallel/border_crossing_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -145,10 +150,15 @@ WHERE je.id IS NULL
     <group_time/>
     <parameters>
       <variable_mapping>
-        <variable/>
+        <variable>IDM_ID</variable>
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>border_crossing_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -172,12 +182,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>576</xloc>
-      <yloc>272</yloc>
+      <xloc>656</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>russian_diploma_flow_repeat.hpl 3</name>
+    <name>border_crossing_flow_delta.hpl 3</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -188,7 +198,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/border_crossing/parallel/border_crossing_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -196,10 +206,15 @@ WHERE je.id IS NULL
     <group_time/>
     <parameters>
       <variable_mapping>
-        <variable/>
+        <variable>IDM_ID</variable>
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>border_crossing_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -223,12 +238,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>576</xloc>
-      <yloc>352</yloc>
+      <xloc>656</xloc>
+      <yloc>304</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>russian_diploma_flow_repeat.hpl 4</name>
+    <name>border_crossing_flow_delta.hpl 4</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -239,7 +254,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/border_crossing/parallel/border_crossing_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -247,10 +262,15 @@ WHERE je.id IS NULL
     <group_time/>
     <parameters>
       <variable_mapping>
-        <variable/>
+        <variable>IDM_ID</variable>
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>border_crossing_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -274,12 +294,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>576</xloc>
-      <yloc>432</yloc>
+      <xloc>656</xloc>
+      <yloc>384</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>russian_diploma_flow_repeat.hpl 5</name>
+    <name>border_crossing_flow_delta.hpl 5</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -290,7 +310,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/border_crossing/parallel/border_crossing_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -298,10 +318,15 @@ WHERE je.id IS NULL
     <group_time/>
     <parameters>
       <variable_mapping>
-        <variable/>
+        <variable>IDM_ID</variable>
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>border_crossing_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -325,8 +350,8 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>576</xloc>
-      <yloc>512</yloc>
+      <xloc>656</xloc>
+      <yloc>480</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
diff --git a/mappings/info_recruits/citizen_tables/education/foreign_diploma/recruitment_five_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/child/recruitment_five_flow_delta.hpl
similarity index 84%
rename from mappings/info_recruits/citizen_tables/education/foreign_diploma/recruitment_five_flow_repeat.hpl
rename to mappings/info_recruits/citizen_tables/child/recruitment_five_flow_delta.hpl
index 818600f..71e650a 100644
--- a/mappings/info_recruits/citizen_tables/education/foreign_diploma/recruitment_five_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/child/recruitment_five_flow_delta.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>recruitment_five_flow_repeat</name>
+    <name>recruitment_five_flow_delta</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,36 +13,36 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/05 08:56:57.814</created_date>
+    <created_date>2025/08/11 13:16:11.204</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/05 08:56:57.814</modified_date>
+    <modified_date>2025/08/11 13:16:11.204</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
       <from>Table input</from>
-      <to>foreign_diploma_flow_repeat.hpl</to>
+      <to>child_flow_delta.hpl</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>foreign_diploma_flow_repeat.hpl 2</to>
+      <to>child_flow_delta.hpl 2</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>foreign_diploma_flow_repeat.hpl 3</to>
+      <to>child_flow_delta.hpl 3</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>foreign_diploma_flow_repeat.hpl 4</to>
+      <to>child_flow_delta.hpl 4</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>foreign_diploma_flow_repeat.hpl 5</to>
+      <to>child_flow_delta.hpl 5</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -57,25 +57,25 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>ervu-dashboard-test</connection>
+    <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
     <limit>0</limit>
-    <sql>SELECT r.idm_id AS recruitment_id
+    <sql>SELECT
+    r.idm_id as recruitment_id
 FROM ervu_dashboard.recruitment r
          LEFT JOIN etl.job_execution je
                    ON r.idm_id = je.recruitment_id
-                       AND je.job_name = 'foreign_diploma_job'
-WHERE je.id IS NULL
-   OR je.status IN ('ERROR', 'PROCESSING');</sql>
+                       and job_name = 'child_job'
+where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING');</sql>
     <variables_active>N</variables_active>
     <attributes/>
     <GUI>
-      <xloc>624</xloc>
-      <yloc>512</yloc>
+      <xloc>352</xloc>
+      <yloc>288</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>foreign_diploma_flow_repeat.hpl</name>
+    <name>child_flow_delta.hpl</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -86,7 +86,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/child/parallel/child_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -98,6 +98,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>child_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -121,12 +126,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>832</xloc>
-      <yloc>352</yloc>
+      <xloc>544</xloc>
+      <yloc>128</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>foreign_diploma_flow_repeat.hpl 2</name>
+    <name>child_flow_delta.hpl 2</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -137,7 +142,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/child/parallel/child_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -149,6 +154,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>child_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -172,12 +182,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>832</xloc>
-      <yloc>432</yloc>
+      <xloc>544</xloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>foreign_diploma_flow_repeat.hpl 3</name>
+    <name>child_flow_delta.hpl 3</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -188,7 +198,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/child/parallel/child_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -200,6 +210,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>child_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -223,12 +238,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>832</xloc>
-      <yloc>512</yloc>
+      <xloc>544</xloc>
+      <yloc>288</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>foreign_diploma_flow_repeat.hpl 4</name>
+    <name>child_flow_delta.hpl 4</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -239,7 +254,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/child/parallel/child_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -251,6 +266,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>child_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -274,12 +294,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>832</xloc>
-      <yloc>592</yloc>
+      <xloc>544</xloc>
+      <yloc>368</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>foreign_diploma_flow_repeat.hpl 5</name>
+    <name>child_flow_delta.hpl 5</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -290,7 +310,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/child/parallel/child_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -302,6 +322,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>child_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -325,8 +350,8 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>832</xloc>
-      <yloc>672</yloc>
+      <xloc>544</xloc>
+      <yloc>448</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
diff --git a/mappings/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow.hpl b/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow.hpl
similarity index 64%
rename from mappings/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow.hpl
rename to mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow.hpl
index 1d1c16f..fbffb7c 100644
--- a/mappings/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow.hpl
+++ b/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>foreign_diploma_flow</name>
+    <name>citizen_address_flow</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,21 +13,36 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/04 20:53:34.643</created_date>
+    <created_date>2025/08/05 14:31:22.799</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/04 20:53:34.643</modified_date>
+    <modified_date>2025/08/05 14:31:22.799</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
+    <hop>
+      <from>Create job execution record</from>
+      <to>Table input</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table output</from>
+      <to>Change job status on error</to>
+      <enabled>Y</enabled>
+    </hop>
     <hop>
       <from>Change job status on error</from>
       <to>Abort</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Create job execution record</from>
-      <to>foerign_diploma_input</to>
+      <from>Table output</from>
+      <to>Detect empty stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Detect empty stream</from>
+      <to>Change job status on success</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
@@ -36,33 +51,18 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>citizen_education_diploma_output</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>citizen_education_diploma_output</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>citizen_education_diploma_output</from>
-      <to>Filter rows</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>foerign_diploma_input</from>
+      <from>Table input</from>
       <to>Identify last row in a stream</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Detect empty stream</from>
-      <to>Change job status on success</to>
+      <from>Identify last row in a stream</from>
+      <to>Table output</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table output</from>
+      <to>Filter rows</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -77,13 +77,13 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <abort_option>ABORT</abort_option>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
     <always_log_rows>Y</always_log_rows>
     <row_threshold>0</row_threshold>
     <attributes/>
     <GUI>
-      <xloc>1248</xloc>
-      <yloc>608</yloc>
+      <xloc>1328</xloc>
+      <yloc>704</yloc>
     </GUI>
   </transform>
   <transform>
@@ -117,8 +117,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1024</xloc>
-      <yloc>608</yloc>
+      <xloc>832</xloc>
+      <yloc>704</yloc>
     </GUI>
   </transform>
   <transform>
@@ -143,13 +143,14 @@ and recruitment_id = '${IDM_ID}';
     <sql>UPDATE etl.job_execution
 SET status = 'SUCCESS'
 WHERE job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';
+and recruitment_id = '${IDM_ID}'
+and status = 'PROCESSING';
 
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1248</xloc>
-      <yloc>256</yloc>
+      <xloc>1328</xloc>
+      <yloc>96</yloc>
     </GUI>
   </transform>
   <transform>
@@ -177,8 +178,8 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
 </sql>
     <attributes/>
     <GUI>
-      <xloc>320</xloc>
-      <yloc>432</yloc>
+      <xloc>240</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
@@ -194,8 +195,8 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     </partitioning>
     <attributes/>
     <GUI>
-      <xloc>736</xloc>
-      <yloc>256</yloc>
+      <xloc>832</xloc>
+      <yloc>96</yloc>
     </GUI>
   </transform>
   <transform>
@@ -230,15 +231,15 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <send_true_to>Change job status on success</send_true_to>
     <attributes/>
     <GUI>
-      <xloc>1248</xloc>
-      <yloc>432</yloc>
+      <xloc>1328</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Identify last row in a stream</name>
     <type>DetectLastRow</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -248,106 +249,12 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <resultfieldname>last_row</resultfieldname>
     <attributes/>
     <GUI>
-      <xloc>736</xloc>
-      <yloc>432</yloc>
+      <xloc>640</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>citizen_education_diploma_output</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <fields>
-      <field>
-        <column_name>recruit_id</column_name>
-        <stream_name>recruit_id</stream_name>
-      </field>
-      <field>
-        <column_name>source_id</column_name>
-        <stream_name>source_id</stream_name>
-      </field>
-      <field>
-        <column_name>source_update_date</column_name>
-        <stream_name>source_update_date</stream_name>
-      </field>
-      <field>
-        <column_name>education_level_code</column_name>
-        <stream_name>education_level_code</stream_name>
-      </field>
-      <field>
-        <column_name>educational_institution_name</column_name>
-        <stream_name>educational_institution_name</stream_name>
-      </field>
-      <field>
-        <column_name>foreign_doc_name</column_name>
-        <stream_name>foreign_doc_name</stream_name>
-      </field>
-      <field>
-        <column_name>ser_num_doc</column_name>
-        <stream_name>ser_num_doc</stream_name>
-      </field>
-      <field>
-        <column_name>reg_num</column_name>
-        <stream_name>reg_num</stream_name>
-      </field>
-      <field>
-        <column_name>recognition_certificate_number</column_name>
-        <stream_name>recognition_certificate_number</stream_name>
-      </field>
-      <field>
-        <column_name>recognition_date</column_name>
-        <stream_name>recognition_date</stream_name>
-      </field>
-      <field>
-        <column_name>speciality_name</column_name>
-        <stream_name>speciality_name</stream_name>
-      </field>
-      <field>
-        <column_name>minobr_speciality_code</column_name>
-        <stream_name>minobr_speciality_code</stream_name>
-      </field>
-      <field>
-        <column_name>minprosv_speciality_code</column_name>
-        <stream_name>minprosv_speciality_code</stream_name>
-      </field>
-      <field>
-        <column_name>oksm_code</column_name>
-        <stream_name>oksm_code</stream_name>
-      </field>
-      <field>
-        <column_name>vus_spec</column_name>
-        <stream_name>vus_spec</stream_name>
-      </field>
-    </fields>
-    <ignore_errors>N</ignore_errors>
-    <only_when_have_rows>N</only_when_have_rows>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <return_keys>N</return_keys>
-    <schema>ervu_dashboard</schema>
-    <specify_fields>Y</specify_fields>
-    <table>foreign_diploma</table>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_in_table>Y</tablename_in_table>
-    <truncate>N</truncate>
-    <use_batch>Y</use_batch>
-    <attributes/>
-    <GUI>
-      <xloc>1024</xloc>
-      <yloc>432</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>foerign_diploma_input</name>
+    <name>Table input</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -360,46 +267,125 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
     <limit/>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             ri.info -> 'svedFL' -> 'svedInObr' -> 'inObr' as diploma_arr
-                      FROM recruits_info ri
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedInObr' -> 'inObr') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-)
-SELECT fd.recruit_id,
-       diploma_elem ->> 'id'                               AS source_id,
-       to_date(diploma_elem ->> 'dataSved', 'YYYY-MM-DD')  as source_update_date,
-       diploma_elem ->> 'kodUrObr'                         as education_level_code,
-       diploma_elem ->> 'naimUchZaved'                     as educational_institution_name,
-       diploma_elem ->> 'naimInoDok'                        as foreign_doc_name,
-       diploma_elem ->> 'serNomDok'                         as ser_num_doc,
-       diploma_elem ->> 'regNomDok'                        as reg_num,
-       diploma_elem ->> 'nomSved'                          as recognition_certificate_number,
-       to_date(diploma_elem ->> 'dataPriz', 'YYYY-MM-DD')  as recognition_date,
-       diploma_elem -> 'svedSpecz' ->> 'naimSpecz'         as speciality_name,
-       diploma_elem -> 'svedSpeczMinobr' ->> 'kodSpecz'    as minobr_speciality_code,
-       diploma_elem -> 'svedSpeczMinprosv' ->> 'kodSpecz'  as minprosv_speciality_code,
-       diploma_elem ->> 'kodOKSM'                          as oksm_code,
-       coalesce(diploma_elem ->> 'prVUSpecz' = '1', false) as vus_spec
-FROM filteredData fd
-         CROSS JOIN LATERAL jsonb_array_elements(diploma_arr) AS diploma_elem;
-</sql>
+    <sql>SELECT
+    ri.recruit_id::uuid,
+    MAX(CASE WHEN addr->>'type' = 'actualAddress' THEN addr->>'reg' END) AS residence_address,
+    MAX(CASE WHEN addr->>'type' = 'actualAddress' THEN (addr->>'regDateStart')::date END) AS residence_registration_date,
+    MAX(CASE WHEN addr->>'type' = 'actualAddress' THEN (addr->>'regDateEnd')::date END) AS residence_deregistration_date,
+
+    MAX(CASE WHEN addr->>'type' = 'residenceAddress' THEN addr->>'reg' END) AS place_stay_address,
+    MAX(CASE WHEN addr->>'type' = 'residenceAddress' THEN (addr->>'regDateStart')::date END) AS place_stay_registration_date,
+    MAX(CASE WHEN addr->>'type' = 'residenceAddress' THEN (addr->>'regDateEnd')::date END) AS place_stay_deregistration_date,
+    CASE
+        WHEN MAX(CASE WHEN addr->>'type' = 'residenceAddress' THEN addr->>'kodTipReg' END) = '1' THEN 'В жилом помещении, не являющимся местом жительства физического лица'
+        WHEN MAX(CASE WHEN addr->>'type' = 'residenceAddress' THEN addr->>'kodTipReg' END) = '2' THEN 'В учреждении уголовно-исполнительной системы'
+        ELSE NULL
+    END AS place_stay_registration_type,
+    MAX(CASE WHEN addr->>'type' = 'residentialAddress' THEN addr->>'reg' END) AS factual_address,
+    MAX(CASE WHEN addr->>'type' = 'residentialAddress' THEN (addr->>'regDateStart')::date END) AS factual_info_received_date,
+    MAX(CASE WHEN addr->>'type' = 'residentialAddress' THEN (addr->>'regDateEnd')::date END) AS factual_info_expiry_date
+FROM ervu_dashboard.recruits_info ri
+    JOIN ervu_dashboard.citizen c ON c.recruit_id = ri.recruit_id
+    CROSS JOIN LATERAL jsonb_array_elements(ri.addresses) AS addr
+WHERE
+ '${IDM_ID}' != ''
+  AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
+  AND'${M_R_CR_DATE}'::timestamp >= c.recruit_create_date
+GROUP BY ri.recruit_id;</sql>
     <variables_active>Y</variables_active>
     <attributes/>
     <GUI>
-      <xloc>544</xloc>
-      <yloc>432</yloc>
+      <xloc>464</xloc>
+      <yloc>320</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Table output</name>
+    <type>TableOutput</type>
+    <description/>
+    <distribute>N</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <commit>1000</commit>
+    <connection>ervu-dashboard</connection>
+    <fields>
+      <field>
+        <column_name>recruit_id</column_name>
+        <stream_name>recruit_id</stream_name>
+      </field>
+      <field>
+        <column_name>residence_address</column_name>
+        <stream_name>residence_address</stream_name>
+      </field>
+      <field>
+        <column_name>residence_registration_date</column_name>
+        <stream_name>residence_registration_date</stream_name>
+      </field>
+      <field>
+        <column_name>residence_deregistration_date</column_name>
+        <stream_name>residence_deregistration_date</stream_name>
+      </field>
+      <field>
+        <column_name>place_stay_address</column_name>
+        <stream_name>place_stay_address</stream_name>
+      </field>
+      <field>
+        <column_name>place_stay_registration_date</column_name>
+        <stream_name>place_stay_registration_date</stream_name>
+      </field>
+      <field>
+        <column_name>place_stay_deregistration_date</column_name>
+        <stream_name>place_stay_deregistration_date</stream_name>
+      </field>
+      <field>
+        <column_name>place_stay_registration_type</column_name>
+        <stream_name>place_stay_registration_type</stream_name>
+      </field>
+      <field>
+        <column_name>factual_address</column_name>
+        <stream_name>factual_address</stream_name>
+      </field>
+      <field>
+        <column_name>factual_info_received_date</column_name>
+        <stream_name>factual_info_received_date</stream_name>
+      </field>
+      <field>
+        <column_name>factual_info_expiry_date</column_name>
+        <stream_name>factual_info_expiry_date</stream_name>
+      </field>
+    </fields>
+    <ignore_errors>N</ignore_errors>
+    <only_when_have_rows>N</only_when_have_rows>
+    <partitioning_daily>N</partitioning_daily>
+    <partitioning_enabled>N</partitioning_enabled>
+    <partitioning_monthly>Y</partitioning_monthly>
+    <return_keys>N</return_keys>
+    <schema>ervu_dashboard</schema>
+    <specify_fields>Y</specify_fields>
+    <table>citizen_address</table>
+    <tablename_in_field>N</tablename_in_field>
+    <tablename_in_table>Y</tablename_in_table>
+    <truncate>N</truncate>
+    <use_batch>Y</use_batch>
+    <attributes/>
+    <GUI>
+      <xloc>832</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
     <error>
-      <source_transform>citizen_education_diploma_output</source_transform>
+      <source_transform>Table output</source_transform>
       <target_transform>Change job status on error</target_transform>
       <is_enabled>Y</is_enabled>
       <nr_valuename/>
       <descriptions_valuename>error_description</descriptions_valuename>
       <fields_valuename/>
-      <codes_valuename/>
+      <codes_valuename>error_code</codes_valuename>
       <max_errors/>
       <max_pct_errors/>
       <min_pct_rows/>
diff --git a/mappings/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow_delta.hpl b/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow_delta.hpl
similarity index 65%
rename from mappings/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow_delta.hpl
rename to mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow_delta.hpl
index 61e43e6..262fee7 100644
--- a/mappings/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow_delta.hpl
+++ b/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow_delta.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>russian_diploma_flow_delta</name>
+    <name>citizen_address_flow_delta</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,41 +13,16 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/01 17:09:06.132</created_date>
+    <created_date>2025/08/11 13:22:56.048</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/01 17:09:06.132</modified_date>
+    <modified_date>2025/08/11 13:22:56.048</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
-    <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
-      <enabled>Y</enabled>
-    </hop>
     <hop>
       <from>Create job execution record</from>
-      <to>education_input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Filter rows</from>
-      <to>Change job status on success</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Insert / update</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>education_input</from>
-      <to>Identify last row in a stream</to>
+      <to>Table input</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
@@ -55,14 +30,39 @@
       <to>Change job status on error</to>
       <enabled>Y</enabled>
     </hop>
+    <hop>
+      <from>Detect empty stream</from>
+      <to>Change job status on success</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Filter rows</from>
+      <to>Change job status on success</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Change job status on error</from>
+      <to>Abort</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>Insert / update</to>
+      <enabled>Y</enabled>
+    </hop>
     <hop>
       <from>Insert / update</from>
+      <to>Identify last row in a stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Identify last row in a stream</from>
       <to>Filter rows</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Detect empty stream</from>
-      <to>Change job status on success</to>
+      <from>Insert / update</from>
+      <to>Detect empty stream</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -77,13 +77,13 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <abort_option>ABORT</abort_option>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
     <always_log_rows>Y</always_log_rows>
     <row_threshold>0</row_threshold>
     <attributes/>
     <GUI>
-      <xloc>1392</xloc>
-      <yloc>656</yloc>
+      <xloc>1008</xloc>
+      <yloc>464</yloc>
     </GUI>
   </transform>
   <transform>
@@ -117,8 +117,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1168</xloc>
-      <yloc>656</yloc>
+      <xloc>752</xloc>
+      <yloc>464</yloc>
     </GUI>
   </transform>
   <transform>
@@ -143,13 +143,14 @@ and recruitment_id = '${IDM_ID}';
     <sql>UPDATE etl.job_execution
 SET status = 'DELTA_SUCCESS'
 WHERE job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';
+and recruitment_id = '${IDM_ID}'
+and status = 'DELTA_PROCESSING';
 
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1392</xloc>
-      <yloc>288</yloc>
+      <xloc>1120</xloc>
+      <yloc>16</yloc>
     </GUI>
   </transform>
   <transform>
@@ -174,14 +175,14 @@ and recruitment_id = '${IDM_ID}';
     <sql>UPDATE etl.job_execution  
 SET
     status = 'DELTA_PROCESSING',
-    execution_datetime = current_timestamp,
+    execution_datetime = DEFAULT,
     error_description = NULL
 where job_name = '${JOB_NAME}'
 and recruitment_id = '${IDM_ID}';</sql>
     <attributes/>
     <GUI>
-      <xloc>464</xloc>
-      <yloc>464</yloc>
+      <xloc>128</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
@@ -197,8 +198,8 @@ and recruitment_id = '${IDM_ID}';</sql>
     </partitioning>
     <attributes/>
     <GUI>
-      <xloc>880</xloc>
-      <yloc>288</yloc>
+      <xloc>752</xloc>
+      <yloc>16</yloc>
     </GUI>
   </transform>
   <transform>
@@ -233,15 +234,15 @@ and recruitment_id = '${IDM_ID}';</sql>
     <send_true_to>Change job status on success</send_true_to>
     <attributes/>
     <GUI>
-      <xloc>1392</xloc>
-      <yloc>464</yloc>
+      <xloc>1120</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Identify last row in a stream</name>
     <type>DetectLastRow</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -251,121 +252,96 @@ and recruitment_id = '${IDM_ID}';</sql>
     <resultfieldname>last_row</resultfieldname>
     <attributes/>
     <GUI>
-      <xloc>880</xloc>
-      <yloc>464</yloc>
+      <xloc>944</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Insert / update</name>
     <type>InsertUpdate</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <commit>10000</commit>
+    <commit>1000</commit>
     <connection>ervu-dashboard</connection>
     <lookup>
       <key>
         <condition>=</condition>
-        <field>source_id</field>
-        <name>source_id</name>
+        <field>recruit_id</field>
+        <name>recruit_id</name>
       </key>
       <schema>ervu_dashboard</schema>
-      <table>russian_diploma</table>
+      <table>citizen_address</table>
       <value>
         <name>recruit_id</name>
         <rename>recruit_id</rename>
         <update>N</update>
       </value>
       <value>
-        <name>source_id</name>
-        <rename>source_id</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>source_update_date</name>
-        <rename>source_update_date</rename>
+        <name>residence_address</name>
+        <rename>residence_address</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>education_level_code</name>
-        <rename>education_level_code</rename>
+        <name>residence_registration_date</name>
+        <rename>residence_registration_date</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>document_type</name>
-        <rename>document_type</rename>
+        <name>residence_deregistration_date</name>
+        <rename>residence_deregistration_date</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>minobr_document_type_code</name>
-        <rename>minobr_document_type_code</rename>
+        <name>place_stay_address</name>
+        <rename>place_stay_address</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>minprosv_document_type_code</name>
-        <rename>minprosv_document_type_code</rename>
+        <name>place_stay_registration_date</name>
+        <rename>place_stay_registration_date</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>seria</name>
-        <rename>seria</rename>
+        <name>place_stay_deregistration_date</name>
+        <rename>place_stay_deregistration_date</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>number</name>
-        <rename>number</rename>
+        <name>place_stay_registration_type</name>
+        <rename>place_stay_registration_type</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>reg_number</name>
-        <rename>reg_number</rename>
+        <name>factual_address</name>
+        <rename>factual_address</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>issue_date</name>
-        <rename>issue_date</rename>
+        <name>factual_info_received_date</name>
+        <rename>factual_info_received_date</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>educational_institution_name</name>
-        <rename>educational_institution_name</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>speciality_name</name>
-        <rename>speciality_name</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>minobr_speciality_code</name>
-        <rename>minobr_speciality_code</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>minprosv_speciality_code</name>
-        <rename>minprosv_speciality_code</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>vus_spec</name>
-        <rename>vus_spec</rename>
+        <name>factual_info_expiry_date</name>
+        <rename>factual_info_expiry_date</rename>
         <update>Y</update>
       </value>
     </lookup>
     <update_bypassed>N</update_bypassed>
     <attributes/>
     <GUI>
-      <xloc>1168</xloc>
-      <yloc>464</yloc>
+      <xloc>752</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>education_input</name>
+    <name>Table input</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -378,35 +354,37 @@ and recruitment_id = '${IDM_ID}';</sql>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
     <limit/>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             ri.info -> 'svedFL' -> 'svedRObr' -> 'robr' AS diploma_arr
-                      FROM recruits_info ri
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedRObr' -> 'robr') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}')
-SELECT fd.recruit_id,
-       diploma_elem ->> 'id'                               AS source_id,
-       to_date(diploma_elem ->> 'dataSved', 'YYYY-MM-DD')  as source_update_date,
-       diploma_elem ->> 'kodUrObr'                         as education_level_code,
-       diploma_elem -> 'vidDok' ->> 'naimVidDok'           as document_type,
-       diploma_elem -> 'vidDokMinobr' ->> 'kodVidDok'      as minobr_document_type_code,
-       diploma_elem -> 'vidDokMinprosv' ->> 'kodVidDok'    as minprosv_document_type_code,
-       diploma_elem ->> 'seriyaBlank'                      as seria,
-       diploma_elem ->> 'nomerBlank'                       as number,
-       diploma_elem ->> 'regNomer'                         as reg_number,
-       to_date(diploma_elem ->> 'dataVyd', 'YYYY-MM-DD')   as issue_date,
-       diploma_elem ->> 'naimOrg'                          as educational_institution_name,
-       diploma_elem -> 'svedSpecz' ->> 'naimSpecz'         as speciality_name,
-       diploma_elem -> 'svedSpeczMinobr' ->> 'kodSpecz'    as minobr_speciality_code,
-       diploma_elem -> 'svedSpeczMinprosv' ->> 'kodSpecz'  as minprosv_speciality_code,
-       coalesce(diploma_elem ->> 'prVUSpecz' = '1', false) as vus_spec
-FROM filteredData fd
-         CROSS JOIN LATERAL jsonb_array_elements(diploma_arr) AS diploma_elem
-where to_date(diploma_elem ->> 'dataSved', 'YYYY-MM-DD') > '${MAX_SOURCE_UPDATE_DATE}';</sql>
+    <sql>SELECT
+    ri.recruit_id::uuid,
+    MAX(CASE WHEN addr->>'type' = 'actualAddress' THEN addr->>'reg' END) AS residence_address,
+    MAX(CASE WHEN addr->>'type' = 'actualAddress' THEN (addr->>'regDateStart')::date END) AS residence_registration_date,
+    MAX(CASE WHEN addr->>'type' = 'actualAddress' THEN (addr->>'regDateEnd')::date END) AS residence_deregistration_date,
+
+    MAX(CASE WHEN addr->>'type' = 'residenceAddress' THEN addr->>'reg' END) AS place_stay_address,
+    MAX(CASE WHEN addr->>'type' = 'residenceAddress' THEN (addr->>'regDateStart')::date END) AS place_stay_registration_date,
+    MAX(CASE WHEN addr->>'type' = 'residenceAddress' THEN (addr->>'regDateEnd')::date END) AS place_stay_deregistration_date,
+    CASE
+        WHEN MAX(CASE WHEN addr->>'type' = 'residenceAddress' THEN addr->>'kodTipReg' END) = '1' THEN 'В жилом помещении, не являющимся местом жительства физического лица'
+        WHEN MAX(CASE WHEN addr->>'type' = 'residenceAddress' THEN addr->>'kodTipReg' END) = '2' THEN 'В учреждении уголовно-исполнительной системы'
+        ELSE NULL
+    END AS place_stay_registration_type,
+    MAX(CASE WHEN addr->>'type' = 'residentialAddress' THEN addr->>'reg' END) AS factual_address,
+    MAX(CASE WHEN addr->>'type' = 'residentialAddress' THEN (addr->>'regDateStart')::date END) AS factual_info_received_date,
+    MAX(CASE WHEN addr->>'type' = 'residentialAddress' THEN (addr->>'regDateEnd')::date END) AS factual_info_expiry_date
+FROM ervu_dashboard.recruits_info ri
+    JOIN ervu_dashboard.citizen c ON c.recruit_id = ri.recruit_id
+    CROSS JOIN LATERAL jsonb_array_elements(ri.addresses) AS addr
+WHERE
+ '${IDM_ID}' != ''
+  AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
+  AND'${M_R_CR_DATE}'::timestamp >= c.recruit_create_date
+  AND c.update_date >= '${M_R_UP_DATE}'::timestamp
+GROUP BY ri.recruit_id;</sql>
     <variables_active>Y</variables_active>
     <attributes/>
     <GUI>
-      <xloc>688</xloc>
-      <yloc>464</yloc>
+      <xloc>400</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
@@ -417,7 +395,7 @@ where to_date(diploma_elem ->> 'dataSved', 'YYYY-MM-DD') > '${MAX_SOURCE_UPDATE_
       <nr_valuename/>
       <descriptions_valuename>error_description</descriptions_valuename>
       <fields_valuename/>
-      <codes_valuename/>
+      <codes_valuename>error_code</codes_valuename>
       <max_errors/>
       <max_pct_errors/>
       <min_pct_rows/>
diff --git a/mappings/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow_repeat.hpl
similarity index 64%
rename from mappings/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow_repeat.hpl
rename to mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow_repeat.hpl
index 0dbeced..6722b66 100644
--- a/mappings/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow_repeat.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>russian_diploma_flow_repeat</name>
+    <name>citizen_address_flow_repeat</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,41 +13,16 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/01 17:03:13.520</created_date>
+    <created_date>2025/08/08 13:25:52.319</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/01 17:03:13.520</modified_date>
+    <modified_date>2025/08/08 13:25:52.319</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
-    <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
-      <enabled>Y</enabled>
-    </hop>
     <hop>
       <from>Create job execution record</from>
-      <to>education_input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Filter rows</from>
-      <to>Change job status on success</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>education_input</from>
-      <to>Identify last row in a stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Insert / update</to>
+      <to>Table input</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
@@ -57,7 +32,7 @@
     </hop>
     <hop>
       <from>Insert / update</from>
-      <to>Filter rows</to>
+      <to>Detect empty stream</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
@@ -65,6 +40,31 @@
       <to>Change job status on success</to>
       <enabled>Y</enabled>
     </hop>
+    <hop>
+      <from>Filter rows</from>
+      <to>Change job status on success</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Change job status on error</from>
+      <to>Abort</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Insert / update</from>
+      <to>Identify last row in a stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Identify last row in a stream</from>
+      <to>Filter rows</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>Insert / update</to>
+      <enabled>Y</enabled>
+    </hop>
   </order>
   <transform>
     <name>Abort</name>
@@ -77,12 +77,12 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <abort_option>ABORT</abort_option>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
     <always_log_rows>Y</always_log_rows>
     <row_threshold>0</row_threshold>
     <attributes/>
     <GUI>
-      <xloc>1136</xloc>
+      <xloc>1232</xloc>
       <yloc>544</yloc>
     </GUI>
   </transform>
@@ -117,7 +117,7 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>912</xloc>
+      <xloc>768</xloc>
       <yloc>544</yloc>
     </GUI>
   </transform>
@@ -143,13 +143,14 @@ and recruitment_id = '${IDM_ID}';
     <sql>UPDATE etl.job_execution
 SET status = 'SUCCESS'
 WHERE job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';
+and recruitment_id = '${IDM_ID}'
+and status = 'PROCESSING';
 
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1136</xloc>
-      <yloc>208</yloc>
+      <xloc>1120</xloc>
+      <yloc>16</yloc>
     </GUI>
   </transform>
   <transform>
@@ -171,17 +172,31 @@ and recruitment_id = '${IDM_ID}';
     <replace_variables>Y</replace_variables>
     <set_params>N</set_params>
     <single_statement>N</single_statement>
-    <sql>INSERT INTO etl.job_execution (id, job_name, status, execution_datetime, error_description, recruitment_id)
-VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}')
+    <sql>INSERT INTO etl.job_execution (
+    id,
+    job_name,
+    status,
+    execution_datetime,
+    error_description,
+    recruitment_id
+)
+VALUES (
+    DEFAULT,
+    '${JOB_NAME}',
+    'PROCESSING',
+    DEFAULT,
+    NULL,
+    '${IDM_ID}'
+)
 ON CONFLICT (job_name, recruitment_id)
-DO UPDATE
-SET status = 'PROCESSING',
-    error_description = null,
-    execution_datetime = current_timestamp;</sql>
+DO UPDATE SET
+    status = 'PROCESSING',
+    execution_datetime = DEFAULT,
+    error_description = NULL;</sql>
     <attributes/>
     <GUI>
-      <xloc>208</xloc>
-      <yloc>384</yloc>
+      <xloc>176</xloc>
+      <yloc>272</yloc>
     </GUI>
   </transform>
   <transform>
@@ -197,8 +212,8 @@ SET status = 'PROCESSING',
     </partitioning>
     <attributes/>
     <GUI>
-      <xloc>624</xloc>
-      <yloc>208</yloc>
+      <xloc>768</xloc>
+      <yloc>16</yloc>
     </GUI>
   </transform>
   <transform>
@@ -233,15 +248,15 @@ SET status = 'PROCESSING',
     <send_true_to>Change job status on success</send_true_to>
     <attributes/>
     <GUI>
-      <xloc>1136</xloc>
-      <yloc>384</yloc>
+      <xloc>1120</xloc>
+      <yloc>272</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Identify last row in a stream</name>
     <type>DetectLastRow</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -251,121 +266,96 @@ SET status = 'PROCESSING',
     <resultfieldname>last_row</resultfieldname>
     <attributes/>
     <GUI>
-      <xloc>624</xloc>
-      <yloc>384</yloc>
+      <xloc>960</xloc>
+      <yloc>272</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Insert / update</name>
     <type>InsertUpdate</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <commit>10000</commit>
+    <commit>1000</commit>
     <connection>ervu-dashboard</connection>
     <lookup>
       <key>
         <condition>=</condition>
-        <field>source_id</field>
-        <name>source_id</name>
+        <field>recruit_id</field>
+        <name>recruit_id</name>
       </key>
       <schema>ervu_dashboard</schema>
-      <table>russian_diploma</table>
+      <table>citizen_address</table>
       <value>
         <name>recruit_id</name>
         <rename>recruit_id</rename>
         <update>N</update>
       </value>
       <value>
-        <name>source_id</name>
-        <rename>source_id</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>source_update_date</name>
-        <rename>source_update_date</rename>
+        <name>residence_address</name>
+        <rename>residence_address</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>education_level_code</name>
-        <rename>education_level_code</rename>
+        <name>residence_registration_date</name>
+        <rename>residence_registration_date</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>document_type</name>
-        <rename>document_type</rename>
+        <name>residence_deregistration_date</name>
+        <rename>residence_deregistration_date</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>minobr_document_type_code</name>
-        <rename>minobr_document_type_code</rename>
+        <name>place_stay_address</name>
+        <rename>place_stay_address</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>minprosv_document_type_code</name>
-        <rename>minprosv_document_type_code</rename>
+        <name>place_stay_registration_date</name>
+        <rename>place_stay_registration_date</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>seria</name>
-        <rename>seria</rename>
+        <name>place_stay_deregistration_date</name>
+        <rename>place_stay_deregistration_date</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>number</name>
-        <rename>number</rename>
+        <name>place_stay_registration_type</name>
+        <rename>place_stay_registration_type</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>reg_number</name>
-        <rename>reg_number</rename>
+        <name>factual_address</name>
+        <rename>factual_address</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>issue_date</name>
-        <rename>issue_date</rename>
+        <name>factual_info_received_date</name>
+        <rename>factual_info_received_date</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>educational_institution_name</name>
-        <rename>educational_institution_name</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>speciality_name</name>
-        <rename>speciality_name</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>minobr_speciality_code</name>
-        <rename>minobr_speciality_code</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>minprosv_speciality_code</name>
-        <rename>minprosv_speciality_code</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>vus_spec</name>
-        <rename>vus_spec</rename>
+        <name>factual_info_expiry_date</name>
+        <rename>factual_info_expiry_date</rename>
         <update>Y</update>
       </value>
     </lookup>
     <update_bypassed>N</update_bypassed>
     <attributes/>
     <GUI>
-      <xloc>912</xloc>
-      <yloc>384</yloc>
+      <xloc>768</xloc>
+      <yloc>272</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>education_input</name>
+    <name>Table input</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -378,35 +368,36 @@ SET status = 'PROCESSING',
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
     <limit/>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             ri.info -> 'svedFL' -> 'svedRObr' -> 'robr' AS diploma_arr
-                      FROM recruits_info ri
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedRObr' -> 'robr') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-)
-SELECT fd.recruit_id,
-       diploma_elem ->> 'id'                               AS source_id,
-       to_date(diploma_elem ->> 'dataSved', 'YYYY-MM-DD')  as source_update_date,
-       diploma_elem ->> 'kodUrObr'                         as education_level_code,
-       diploma_elem -> 'vidDok' ->> 'naimVidDok'           as document_type,
-       diploma_elem -> 'vidDokMinobr' ->> 'kodVidDok'      as minobr_document_type_code,
-       diploma_elem -> 'vidDokMinprosv' ->> 'kodVidDok'    as minprosv_document_type_code,
-       diploma_elem ->> 'seriyaBlank'                      as seria,
-       diploma_elem ->> 'nomerBlank'                       as number,
-       diploma_elem ->> 'regNomer'                         as reg_number,
-       to_date(diploma_elem ->> 'dataVyd', 'YYYY-MM-DD')   as issue_date,
-       diploma_elem ->> 'naimOrg'                          as educational_institution_name,
-       diploma_elem -> 'svedSpecz' ->> 'naimSpecz'         as speciality_name,
-       diploma_elem -> 'svedSpeczMinobr' ->> 'kodSpecz'    as minobr_speciality_code,
-       diploma_elem -> 'svedSpeczMinprosv' ->> 'kodSpecz'  as minprosv_speciality_code,
-       coalesce(diploma_elem ->> 'prVUSpecz' = '1', false) as vus_spec
-FROM filteredData fd
-         CROSS JOIN LATERAL jsonb_array_elements(diploma_arr) AS diploma_elem;</sql>
+    <sql>SELECT
+    ri.recruit_id::uuid,
+    MAX(CASE WHEN addr->>'type' = 'actualAddress' THEN addr->>'reg' END) AS residence_address,
+    MAX(CASE WHEN addr->>'type' = 'actualAddress' THEN (addr->>'regDateStart')::date END) AS residence_registration_date,
+    MAX(CASE WHEN addr->>'type' = 'actualAddress' THEN (addr->>'regDateEnd')::date END) AS residence_deregistration_date,
+
+    MAX(CASE WHEN addr->>'type' = 'residenceAddress' THEN addr->>'reg' END) AS place_stay_address,
+    MAX(CASE WHEN addr->>'type' = 'residenceAddress' THEN (addr->>'regDateStart')::date END) AS place_stay_registration_date,
+    MAX(CASE WHEN addr->>'type' = 'residenceAddress' THEN (addr->>'regDateEnd')::date END) AS place_stay_deregistration_date,
+    CASE
+        WHEN MAX(CASE WHEN addr->>'type' = 'residenceAddress' THEN addr->>'kodTipReg' END) = '1' THEN 'В жилом помещении, не являющимся местом жительства физического лица'
+        WHEN MAX(CASE WHEN addr->>'type' = 'residenceAddress' THEN addr->>'kodTipReg' END) = '2' THEN 'В учреждении уголовно-исполнительной системы'
+        ELSE NULL
+    END AS place_stay_registration_type,
+    MAX(CASE WHEN addr->>'type' = 'residentialAddress' THEN addr->>'reg' END) AS factual_address,
+    MAX(CASE WHEN addr->>'type' = 'residentialAddress' THEN (addr->>'regDateStart')::date END) AS factual_info_received_date,
+    MAX(CASE WHEN addr->>'type' = 'residentialAddress' THEN (addr->>'regDateEnd')::date END) AS factual_info_expiry_date
+FROM ervu_dashboard.recruits_info ri
+    JOIN ervu_dashboard.citizen c ON c.recruit_id = ri.recruit_id
+    CROSS JOIN LATERAL jsonb_array_elements(ri.addresses) AS addr
+WHERE
+ '${IDM_ID}' != ''
+  AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
+  AND'${M_R_CR_DATE}'::timestamp >= c.recruit_create_date
+GROUP BY ri.recruit_id;</sql>
     <variables_active>Y</variables_active>
     <attributes/>
     <GUI>
-      <xloc>432</xloc>
-      <yloc>384</yloc>
+      <xloc>480</xloc>
+      <yloc>272</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
@@ -417,7 +408,7 @@ FROM filteredData fd
       <nr_valuename/>
       <descriptions_valuename>error_description</descriptions_valuename>
       <fields_valuename/>
-      <codes_valuename/>
+      <codes_valuename>error_code</codes_valuename>
       <max_errors/>
       <max_pct_errors/>
       <min_pct_rows/>
diff --git a/mappings/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow.hpl b/mappings/info_recruits/citizen_tables/citizen_spouse/parallel/citizen_spouse_flow.hpl
similarity index 64%
rename from mappings/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow.hpl
rename to mappings/info_recruits/citizen_tables/citizen_spouse/parallel/citizen_spouse_flow.hpl
index fda88dd..ebfe4cd 100644
--- a/mappings/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow.hpl
+++ b/mappings/info_recruits/citizen_tables/citizen_spouse/parallel/citizen_spouse_flow.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>russian_diploma_flow</name>
+    <name>citizen_spouse_flow</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,21 +13,21 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/01 16:13:06.345</created_date>
+    <created_date>2025/08/05 14:31:22.799</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/01 16:13:06.345</modified_date>
+    <modified_date>2025/08/05 14:31:22.799</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
+      <from>Create job execution record</from>
+      <to>Table input</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Create job execution record</from>
-      <to>education_input</to>
+      <from>Table output</from>
+      <to>Change job status on error</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
@@ -36,35 +36,35 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Identify last row in a stream</from>
+      <from>Table output</from>
       <to>Detect empty stream</to>
       <enabled>Y</enabled>
     </hop>
-    <hop>
-      <from>citizen_education_diploma_output</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>education_input</from>
-      <to>Identify last row in a stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>citizen_education_diploma_output</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>citizen_education_diploma_output</from>
-      <to>Filter rows</to>
-      <enabled>Y</enabled>
-    </hop>
     <hop>
       <from>Detect empty stream</from>
       <to>Change job status on success</to>
       <enabled>Y</enabled>
     </hop>
+    <hop>
+      <from>Change job status on error</from>
+      <to>Abort</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>Identify last row in a stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Identify last row in a stream</from>
+      <to>Table output</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table output</from>
+      <to>Filter rows</to>
+      <enabled>Y</enabled>
+    </hop>
   </order>
   <transform>
     <name>Abort</name>
@@ -77,13 +77,13 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <abort_option>ABORT</abort_option>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
     <always_log_rows>Y</always_log_rows>
     <row_threshold>0</row_threshold>
     <attributes/>
     <GUI>
-      <xloc>1152</xloc>
-      <yloc>560</yloc>
+      <xloc>1136</xloc>
+      <yloc>528</yloc>
     </GUI>
   </transform>
   <transform>
@@ -117,8 +117,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>928</xloc>
-      <yloc>560</yloc>
+      <xloc>720</xloc>
+      <yloc>528</yloc>
     </GUI>
   </transform>
   <transform>
@@ -143,13 +143,14 @@ and recruitment_id = '${IDM_ID}';
     <sql>UPDATE etl.job_execution
 SET status = 'SUCCESS'
 WHERE job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';
+and recruitment_id = '${IDM_ID}'
+and status = 'PROCESSING';
 
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1152</xloc>
-      <yloc>224</yloc>
+      <xloc>1120</xloc>
+      <yloc>64</yloc>
     </GUI>
   </transform>
   <transform>
@@ -177,8 +178,8 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
 </sql>
     <attributes/>
     <GUI>
-      <xloc>224</xloc>
-      <yloc>400</yloc>
+      <xloc>80</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
@@ -194,8 +195,8 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     </partitioning>
     <attributes/>
     <GUI>
-      <xloc>640</xloc>
-      <yloc>224</yloc>
+      <xloc>1120</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
@@ -230,15 +231,15 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <send_true_to>Change job status on success</send_true_to>
     <attributes/>
     <GUI>
-      <xloc>1152</xloc>
-      <yloc>400</yloc>
+      <xloc>720</xloc>
+      <yloc>64</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Identify last row in a stream</name>
     <type>DetectLastRow</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -248,113 +249,12 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <resultfieldname>last_row</resultfieldname>
     <attributes/>
     <GUI>
-      <xloc>640</xloc>
-      <yloc>400</yloc>
+      <xloc>576</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>citizen_education_diploma_output</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <fields>
-      <field>
-        <column_name>recruit_id</column_name>
-        <stream_name>recruit_id</stream_name>
-      </field>
-      <field>
-        <column_name>source_id</column_name>
-        <stream_name>source_id</stream_name>
-      </field>
-      <field>
-        <column_name>source_update_date</column_name>
-        <stream_name>source_update_date</stream_name>
-      </field>
-      <field>
-        <column_name>education_level_code</column_name>
-        <stream_name>education_level_code</stream_name>
-      </field>
-      <field>
-        <column_name>document_type</column_name>
-        <stream_name>document_type</stream_name>
-      </field>
-      <field>
-        <column_name>minobr_document_type_code</column_name>
-        <stream_name>minobr_document_type_code</stream_name>
-      </field>
-      <field>
-        <column_name>minprosv_document_type_code</column_name>
-        <stream_name>minprosv_document_type_code</stream_name>
-      </field>
-      <field>
-        <column_name>seria</column_name>
-        <stream_name>seria</stream_name>
-      </field>
-      <field>
-        <column_name>number</column_name>
-        <stream_name>number</stream_name>
-      </field>
-      <field>
-        <column_name>reg_number</column_name>
-        <stream_name>reg_number</stream_name>
-      </field>
-      <field>
-        <column_name>issue_date</column_name>
-        <stream_name>issue_date</stream_name>
-      </field>
-      <field>
-        <column_name>educational_institution_name</column_name>
-        <stream_name>educational_institution_name</stream_name>
-      </field>
-      <field>
-        <column_name>speciality_name</column_name>
-        <stream_name>speciality_name</stream_name>
-      </field>
-      <field>
-        <column_name>minobr_speciality_code</column_name>
-        <stream_name>minobr_speciality_code</stream_name>
-      </field>
-      <field>
-        <column_name>minprosv_speciality_code</column_name>
-        <stream_name>minprosv_speciality_code</stream_name>
-      </field>
-      <field>
-        <column_name>vus_spec</column_name>
-        <stream_name>vus_spec</stream_name>
-      </field>
-    </fields>
-    <ignore_errors>N</ignore_errors>
-    <only_when_have_rows>N</only_when_have_rows>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_field/>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <return_field/>
-    <return_keys>N</return_keys>
-    <schema>ervu_dashboard</schema>
-    <specify_fields>Y</specify_fields>
-    <table>russian_diploma</table>
-    <tablename_field/>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_in_table>Y</tablename_in_table>
-    <truncate>N</truncate>
-    <use_batch>Y</use_batch>
-    <attributes/>
-    <GUI>
-      <xloc>928</xloc>
-      <yloc>400</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>education_input</name>
+    <name>Table input</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -367,46 +267,159 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
     <limit/>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             ri.info -> 'svedFL' -> 'svedRObr' -> 'robr' AS diploma_arr
-                      FROM recruits_info ri
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedRObr' -> 'robr') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-)
-SELECT fd.recruit_id,
-       diploma_elem ->> 'id'                               AS source_id,
-       to_date(diploma_elem ->> 'dataSved', 'YYYY-MM-DD')  as source_update_date,
-       diploma_elem ->> 'kodUrObr'                         as education_level_code,
-       diploma_elem -> 'vidDok' ->> 'naimVidDok'           as document_type,
-       diploma_elem -> 'vidDokMinobr' ->> 'kodVidDok'      as minobr_document_type_code,
-       diploma_elem -> 'vidDokMinprosv' ->> 'kodVidDok'    as minprosv_document_type_code,
-       diploma_elem ->> 'seriyaBlank'                      as seria,
-       diploma_elem ->> 'nomerBlank'                       as number,
-       diploma_elem ->> 'regNomer'                         as reg_number,
-       to_date(diploma_elem ->> 'dataVyd', 'YYYY-MM-DD')   as issue_date,
-       diploma_elem ->> 'naimOrg'                          as educational_institution_name,
-       diploma_elem -> 'svedSpecz' ->> 'naimSpecz'         as speciality_name,
-       diploma_elem -> 'svedSpeczMinobr' ->> 'kodSpecz'    as minobr_speciality_code,
-       diploma_elem -> 'svedSpeczMinprosv' ->> 'kodSpecz'  as minprosv_speciality_code,
-       coalesce(diploma_elem ->> 'prVUSpecz' = '1', false) as vus_spec
-FROM filteredData fd
-         CROSS JOIN LATERAL jsonb_array_elements(diploma_arr) AS diploma_elem;</sql>
+    <sql>SELECT
+    ri.recruit_id AS recruit_id,
+    (supr->>'id')::uuid AS spouse_external_id,
+    NULLIF(supr->>'idERN', '') AS spouse_id_ern,
+    NULLIF(supr->>'rodstvSvyazSuprug', '')::int AS kinship_type,
+    supr->'svedFLBS'->'fio'->>'familiya' AS last_name,
+    supr->'svedFLBS'->'fio'->>'imya' AS first_name,
+    supr->'svedFLBS'->'fio'->>'otchestvo' AS middle_name,
+    CONCAT_WS(' ',
+        supr->'svedFLBS'->'fio'->>'familiya',
+        supr->'svedFLBS'->'fio'->>'imya',
+        supr->'svedFLBS'->'fio'->>'otchestvo'
+    ) AS full_name,
+    MAKE_DATE(
+        NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'god', '')::int,
+        NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'mesyacz', '')::int,
+        NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'den', '')::int
+    ) AS birth_date,
+    (supr->'svedSmert'->'extend'->>'dataSmert')::date AS death_date,
+    supr->'svedSmert'->>'nomerZapis' AS death_az_number,
+    ri.info->'svedFL'->'svedSemPolozh'->'svedAZBrak'->>'nomerZapis' AS marriage_az_number,
+    (ri.info->'svedFL'->'svedSemPolozh'->'svedAZBrak'->>'dataBrakKalend')::date AS marriage_date,
+    ri.info->'svedFL'->'svedSemPolozh'->'svedAZRazvod'->>'nomerZapis' AS divorce_az_number,
+    (ri.info->'svedFL'->'svedSemPolozh'->'svedAZRazvod'->>'dataRastBrakKalend')::date AS divorce_date,
+    CASE
+        WHEN ri.info->'svedFL'->'svedSemPolozh'->>'svedSuprIskl' = '1' THEN true
+        ELSE false
+    END AS information_excluded
+FROM ervu_dashboard.recruits_info ri
+JOIN ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id
+CROSS JOIN LATERAL (
+    SELECT supri
+    FROM jsonb_array_elements(ri.info->'svedFL'->'svedSemPolozh'->'suprugi') AS supri
+    WHERE jsonb_typeof(ri.info->'svedFL'->'svedSemPolozh'->'suprugi') = 'array'
+) AS supr(supr)
+WHERE
+    '${IDM_ID}' != ''
+    AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
+    AND '${M_R_CR_DATE}'::timestamp >= r.recruit_create_date;</sql>
     <variables_active>Y</variables_active>
     <attributes/>
     <GUI>
-      <xloc>448</xloc>
-      <yloc>400</yloc>
+      <xloc>368</xloc>
+      <yloc>320</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Table output</name>
+    <type>TableOutput</type>
+    <description/>
+    <distribute>N</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <commit>1000</commit>
+    <connection>ervu-dashboard</connection>
+    <fields>
+      <field>
+        <column_name>recruit_id</column_name>
+        <stream_name>recruit_id</stream_name>
+      </field>
+      <field>
+        <column_name>spouse_external_id</column_name>
+        <stream_name>spouse_external_id</stream_name>
+      </field>
+      <field>
+        <column_name>spouse_id_ern</column_name>
+        <stream_name>spouse_id_ern</stream_name>
+      </field>
+      <field>
+        <column_name>kinship_type</column_name>
+        <stream_name>kinship_type</stream_name>
+      </field>
+      <field>
+        <column_name>last_name</column_name>
+        <stream_name>last_name</stream_name>
+      </field>
+      <field>
+        <column_name>first_name</column_name>
+        <stream_name>first_name</stream_name>
+      </field>
+      <field>
+        <column_name>middle_name</column_name>
+        <stream_name>middle_name</stream_name>
+      </field>
+      <field>
+        <column_name>full_name</column_name>
+        <stream_name>full_name</stream_name>
+      </field>
+      <field>
+        <column_name>birth_date</column_name>
+        <stream_name>birth_date</stream_name>
+      </field>
+      <field>
+        <column_name>death_date</column_name>
+        <stream_name>death_date</stream_name>
+      </field>
+      <field>
+        <column_name>death_az_number</column_name>
+        <stream_name>death_az_number</stream_name>
+      </field>
+      <field>
+        <column_name>marriage_az_number</column_name>
+        <stream_name>marriage_az_number</stream_name>
+      </field>
+      <field>
+        <column_name>marriage_date</column_name>
+        <stream_name>marriage_date</stream_name>
+      </field>
+      <field>
+        <column_name>divorce_az_number</column_name>
+        <stream_name>divorce_az_number</stream_name>
+      </field>
+      <field>
+        <column_name>divorce_date</column_name>
+        <stream_name>divorce_date</stream_name>
+      </field>
+      <field>
+        <column_name>information_excluded</column_name>
+        <stream_name>information_excluded</stream_name>
+      </field>
+    </fields>
+    <ignore_errors>N</ignore_errors>
+    <only_when_have_rows>N</only_when_have_rows>
+    <partitioning_daily>N</partitioning_daily>
+    <partitioning_enabled>N</partitioning_enabled>
+    <partitioning_monthly>Y</partitioning_monthly>
+    <return_keys>N</return_keys>
+    <schema>ervu_dashboard</schema>
+    <specify_fields>Y</specify_fields>
+    <table>citizen_spouse</table>
+    <tablename_in_field>N</tablename_in_field>
+    <tablename_in_table>Y</tablename_in_table>
+    <truncate>N</truncate>
+    <use_batch>Y</use_batch>
+    <attributes/>
+    <GUI>
+      <xloc>720</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
     <error>
-      <source_transform>citizen_education_diploma_output</source_transform>
+      <source_transform>Table output</source_transform>
       <target_transform>Change job status on error</target_transform>
       <is_enabled>Y</is_enabled>
       <nr_valuename/>
       <descriptions_valuename>error_description</descriptions_valuename>
       <fields_valuename/>
-      <codes_valuename/>
+      <codes_valuename>error_code</codes_valuename>
       <max_errors/>
       <max_pct_errors/>
       <min_pct_rows/>
diff --git a/mappings/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow_delta.hpl b/mappings/info_recruits/citizen_tables/citizen_spouse/parallel/citizen_spouse_flow_delta.hpl
similarity index 63%
rename from mappings/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow_delta.hpl
rename to mappings/info_recruits/citizen_tables/citizen_spouse/parallel/citizen_spouse_flow_delta.hpl
index 9095203..99e9f11 100644
--- a/mappings/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow_delta.hpl
+++ b/mappings/info_recruits/citizen_tables/citizen_spouse/parallel/citizen_spouse_flow_delta.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>foreign_diploma_flow_delta</name>
+    <name>citizen_spouse_flow_delta</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,21 +13,31 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/05 08:36:17.176</created_date>
+    <created_date>2025/08/11 13:22:56.048</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/05 08:36:17.176</modified_date>
+    <modified_date>2025/08/11 13:22:56.048</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
+    <hop>
+      <from>Create job execution record</from>
+      <to>Table input</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Insert / update</from>
+      <to>Change job status on error</to>
+      <enabled>Y</enabled>
+    </hop>
     <hop>
       <from>Change job status on error</from>
       <to>Abort</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Create job execution record</from>
-      <to>foerign_diploma_input</to>
+      <from>Insert / update</from>
+      <to>Filter rows</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
@@ -36,35 +46,25 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Identify last row in a stream</from>
+      <from>Insert / update</from>
       <to>Detect empty stream</to>
       <enabled>Y</enabled>
     </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>foreign_diploma_upsert</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>foerign_diploma_input</from>
-      <to>Identify last row in a stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>foreign_diploma_upsert</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>foreign_diploma_upsert</from>
-      <to>Filter rows</to>
-      <enabled>Y</enabled>
-    </hop>
     <hop>
       <from>Detect empty stream</from>
       <to>Change job status on success</to>
       <enabled>Y</enabled>
     </hop>
+    <hop>
+      <from>Table input</from>
+      <to>Identify last row in a stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Identify last row in a stream</from>
+      <to>Insert / update</to>
+      <enabled>Y</enabled>
+    </hop>
   </order>
   <transform>
     <name>Abort</name>
@@ -77,13 +77,13 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <abort_option>ABORT</abort_option>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
     <always_log_rows>Y</always_log_rows>
     <row_threshold>0</row_threshold>
     <attributes/>
     <GUI>
-      <xloc>1280</xloc>
-      <yloc>688</yloc>
+      <xloc>976</xloc>
+      <yloc>480</yloc>
     </GUI>
   </transform>
   <transform>
@@ -101,6 +101,9 @@
       <argument>
         <name>error_description</name>
       </argument>
+      <argument>
+        <name>error_code</name>
+      </argument>
     </arguments>
     <connection>ervu-dashboard</connection>
     <execute_each_row>Y</execute_each_row>
@@ -117,8 +120,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1056</xloc>
-      <yloc>688</yloc>
+      <xloc>736</xloc>
+      <yloc>480</yloc>
     </GUI>
   </transform>
   <transform>
@@ -141,15 +144,16 @@ and recruitment_id = '${IDM_ID}';
     <set_params>N</set_params>
     <single_statement>N</single_statement>
     <sql>UPDATE etl.job_execution
-SET status = 'DELTA_SUCCESS'
+SET status = 'DELTA_SUCCESS',
+    error_description = null
 WHERE job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';
-
+  and recruitment_id = '${IDM_ID}'
+  and status = 'DELTA_PROCESSING';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1280</xloc>
-      <yloc>320</yloc>
+      <xloc>1200</xloc>
+      <yloc>80</yloc>
     </GUI>
   </transform>
   <transform>
@@ -174,14 +178,13 @@ and recruitment_id = '${IDM_ID}';
     <sql>UPDATE etl.job_execution  
 SET
     status = 'DELTA_PROCESSING',
-    execution_datetime = current_timestamp,
-    error_description = NULL
+    execution_datetime = DEFAULT
 where job_name = '${JOB_NAME}'
 and recruitment_id = '${IDM_ID}';</sql>
     <attributes/>
     <GUI>
-      <xloc>352</xloc>
-      <yloc>496</yloc>
+      <xloc>96</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
@@ -197,8 +200,8 @@ and recruitment_id = '${IDM_ID}';</sql>
     </partitioning>
     <attributes/>
     <GUI>
-      <xloc>768</xloc>
-      <yloc>320</yloc>
+      <xloc>1200</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
@@ -233,15 +236,15 @@ and recruitment_id = '${IDM_ID}';</sql>
     <send_true_to>Change job status on success</send_true_to>
     <attributes/>
     <GUI>
-      <xloc>1280</xloc>
-      <yloc>496</yloc>
+      <xloc>736</xloc>
+      <yloc>80</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Identify last row in a stream</name>
     <type>DetectLastRow</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -251,15 +254,129 @@ and recruitment_id = '${IDM_ID}';</sql>
     <resultfieldname>last_row</resultfieldname>
     <attributes/>
     <GUI>
-      <xloc>768</xloc>
-      <yloc>496</yloc>
+      <xloc>576</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>foerign_diploma_input</name>
+    <name>Insert / update</name>
+    <type>InsertUpdate</type>
+    <description/>
+    <distribute>N</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <commit>100</commit>
+    <connection>ervu-dashboard</connection>
+    <lookup>
+      <key>
+        <condition>=</condition>
+        <field>recruit_id</field>
+        <name>recruit_id</name>
+      </key>
+      <key>
+        <condition>=</condition>
+        <field>spouse_external_id</field>
+        <name>spouse_external_id</name>
+      </key>
+      <schema>ervu_dashboard</schema>
+      <table>citizen_spouse</table>
+      <value>
+        <name>recruit_id</name>
+        <rename>recruit_id</rename>
+        <update>N</update>
+      </value>
+      <value>
+        <name>spouse_external_id</name>
+        <rename>spouse_external_id</rename>
+        <update>N</update>
+      </value>
+      <value>
+        <name>spouse_id_ern</name>
+        <rename>spouse_id_ern</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>kinship_type</name>
+        <rename>kinship_type</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>last_name</name>
+        <rename>last_name</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>first_name</name>
+        <rename>first_name</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>middle_name</name>
+        <rename>middle_name</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>full_name</name>
+        <rename>full_name</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>birth_date</name>
+        <rename>birth_date</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>death_date</name>
+        <rename>death_date</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>death_az_number</name>
+        <rename>death_az_number</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>marriage_az_number</name>
+        <rename>marriage_az_number</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>marriage_date</name>
+        <rename>marriage_date</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>divorce_az_number</name>
+        <rename>divorce_az_number</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>divorce_date</name>
+        <rename>divorce_date</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>information_excluded</name>
+        <rename>information_excluded</rename>
+        <update>Y</update>
+      </value>
+    </lookup>
+    <update_bypassed>N</update_bypassed>
+    <attributes/>
+    <GUI>
+      <xloc>736</xloc>
+      <yloc>224</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Table input</name>
     <type>TableInput</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -269,151 +386,63 @@ and recruitment_id = '${IDM_ID}';</sql>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
     <limit/>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             diploma_elem
-                      FROM recruits_info ri
-                               CROSS JOIN LATERAL jsonb_array_elements(
-                              ri.info -> 'svedFL' -> 'svedInObr' -> 'inObr') AS diploma_elem
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedInObr' -> 'inObr') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-                        and to_date(diploma_elem ->> 'dataSved', 'YYYY-MM-DD') > '${MAX_SOURCE_UPDATE_DATE}'
-)
-SELECT fd.recruit_id,
-       diploma_elem ->> 'id'                               AS source_id,
-       to_date(diploma_elem ->> 'dataSved', 'YYYY-MM-DD')  as source_update_date,
-       diploma_elem ->> 'kodUrObr'                         as education_level_code,
-       diploma_elem ->> 'naimUchZaved'                     as educational_institution_name,
-       diploma_elem ->> 'naimInoDok'                        as foreign_doc_name,
-       diploma_elem ->> 'serNomDok'                         as ser_num_doc,
-       diploma_elem ->> 'regNomDok'                        as reg_num,
-       diploma_elem ->> 'nomSved'                          as recognition_certificate_number,
-       to_date(diploma_elem ->> 'dataPriz', 'YYYY-MM-DD')  as recognition_date,
-       diploma_elem -> 'svedSpecz' ->> 'naimSpecz'         as speciality_name,
-       diploma_elem -> 'svedSpeczMinobr' ->> 'kodSpecz'    as minobr_speciality_code,
-       diploma_elem -> 'svedSpeczMinprosv' ->> 'kodSpecz'  as minprosv_speciality_code,
-       diploma_elem ->> 'kodOKSM'                          as oksm_code,
-       coalesce(diploma_elem ->> 'prVUSpecz' = '1', false) as vus_spec
-FROM filteredData fd;</sql>
+    <sql>SELECT
+    ri.recruit_id AS recruit_id,
+    (supr->>'id')::uuid AS spouse_external_id,
+    NULLIF(supr->>'idERN', '') AS spouse_id_ern,
+    NULLIF(supr->>'rodstvSvyazSuprug', '')::int AS kinship_type,
+    supr->'svedFLBS'->'fio'->>'familiya' AS last_name,
+    supr->'svedFLBS'->'fio'->>'imya' AS first_name,
+    supr->'svedFLBS'->'fio'->>'otchestvo' AS middle_name,
+    CONCAT_WS(' ',
+        supr->'svedFLBS'->'fio'->>'familiya',
+        supr->'svedFLBS'->'fio'->>'imya',
+        supr->'svedFLBS'->'fio'->>'otchestvo'
+    ) AS full_name,
+    MAKE_DATE(
+        NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'god', '')::int,
+        NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'mesyacz', '')::int,
+        NULLIF(supr->'svedFLBS'->'dataRozhdDok'->>'den', '')::int
+    ) AS birth_date,
+    (supr->'svedSmert'->'extend'->>'dataSmert')::date AS death_date,
+    supr->'svedSmert'->>'nomerZapis' AS death_az_number,
+    ri.info->'svedFL'->'svedSemPolozh'->'svedAZBrak'->>'nomerZapis' AS marriage_az_number,
+    (ri.info->'svedFL'->'svedSemPolozh'->'svedAZBrak'->>'dataBrakKalend')::date AS marriage_date,
+    ri.info->'svedFL'->'svedSemPolozh'->'svedAZRazvod'->>'nomerZapis' AS divorce_az_number,
+    (ri.info->'svedFL'->'svedSemPolozh'->'svedAZRazvod'->>'dataRastBrakKalend')::date AS divorce_date,
+    CASE
+        WHEN ri.info->'svedFL'->'svedSemPolozh'->>'svedSuprIskl' = '1' THEN true
+        ELSE false
+    END AS information_excluded
+FROM ervu_dashboard.recruits_info ri
+JOIN ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id
+CROSS JOIN LATERAL (
+    SELECT supri
+    FROM jsonb_array_elements(ri.info->'svedFL'->'svedSemPolozh'->'suprugi') AS supri
+    WHERE jsonb_typeof(ri.info->'svedFL'->'svedSemPolozh'->'suprugi') = 'array'
+) AS supr(supr)
+WHERE
+    '${IDM_ID}' != ''
+    AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
+    AND '${M_R_CR_DATE}'::timestamp >= r.recruit_create_date
+    AND c.update_date >= '${M_R_UP_DATE}'::timestamp;
+</sql>
     <variables_active>Y</variables_active>
     <attributes/>
     <GUI>
-      <xloc>576</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>foreign_diploma_upsert</name>
-    <type>InsertUpdate</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <lookup>
-      <key>
-        <condition>=</condition>
-        <field>source_id</field>
-        <name>source_id</name>
-      </key>
-      <schema>ervu_dashboard</schema>
-      <table>foreign_diploma</table>
-      <value>
-        <name>recruit_id</name>
-        <rename>recruit_id</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>source_id</name>
-        <rename>source_id</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>source_update_date</name>
-        <rename>source_update_date</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>education_level_code</name>
-        <rename>education_level_code</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>educational_institution_name</name>
-        <rename>educational_institution_name</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>foreign_doc_name</name>
-        <rename>foreign_doc_name</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>ser_num_doc</name>
-        <rename>ser_num_doc</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>reg_num</name>
-        <rename>reg_num</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>recognition_certificate_number</name>
-        <rename>recognition_certificate_number</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>recognition_date</name>
-        <rename>recognition_date</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>speciality_name</name>
-        <rename>speciality_name</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>minobr_speciality_code</name>
-        <rename>minobr_speciality_code</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>minprosv_speciality_code</name>
-        <rename>minprosv_speciality_code</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>oksm_code</name>
-        <rename>oksm_code</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>vus_spec</name>
-        <rename>vus_spec</rename>
-        <update>Y</update>
-      </value>
-    </lookup>
-    <update_bypassed>N</update_bypassed>
-    <attributes/>
-    <GUI>
-      <xloc>1056</xloc>
-      <yloc>496</yloc>
+      <xloc>368</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
     <error>
-      <source_transform>foreign_diploma_upsert</source_transform>
+      <source_transform>Insert / update</source_transform>
       <target_transform>Change job status on error</target_transform>
       <is_enabled>Y</is_enabled>
       <nr_valuename/>
       <descriptions_valuename>error_description</descriptions_valuename>
       <fields_valuename/>
-      <codes_valuename/>
+      <codes_valuename>error_code</codes_valuename>
       <max_errors/>
       <max_pct_errors/>
       <min_pct_rows/>
diff --git a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/recruitment_five_flow.hpl b/mappings/info_recruits/citizen_tables/citizenship_foreign/recruitment_five_flow_delta.hpl
similarity index 78%
rename from mappings/info_recruits/citizen_tables/education/educational_institution_learning/recruitment_five_flow.hpl
rename to mappings/info_recruits/citizen_tables/citizenship_foreign/recruitment_five_flow_delta.hpl
index 47fa430..864793c 100644
--- a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/recruitment_five_flow.hpl
+++ b/mappings/info_recruits/citizen_tables/citizenship_foreign/recruitment_five_flow_delta.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>recruitment_five_flow</name>
+    <name>recruitment_five_flow_delta</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,41 +13,41 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/08/28 08:16:44.450</created_date>
+    <created_date>2025/08/11 13:16:11.204</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/08/28 08:16:44.450</modified_date>
+    <modified_date>2025/08/11 13:16:11.204</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
-      <from>Get all recruitments</from>
-      <to>citizen_education_flow.hpl</to>
+      <from>Table input</from>
+      <to>citizenship_foreign_flow_delta.hpl</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Get all recruitments</from>
-      <to>citizen_education_flow.hpl 2</to>
+      <from>Table input</from>
+      <to>citizenship_foreign_flow_delta.hpl 2</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Get all recruitments</from>
-      <to>citizen_education_flow.hpl 3</to>
+      <from>Table input</from>
+      <to>citizenship_foreign_flow_delta.hpl 3</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Get all recruitments</from>
-      <to>citizen_education_flow.hpl 4</to>
+      <from>Table input</from>
+      <to>citizenship_foreign_flow_delta.hpl 4</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Get all recruitments</from>
-      <to>citizen_education_flow.hpl 5</to>
+      <from>Table input</from>
+      <to>citizenship_foreign_flow_delta.hpl 5</to>
       <enabled>Y</enabled>
     </hop>
   </order>
   <transform>
-    <name>Get all recruitments</name>
+    <name>Table input</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -57,20 +57,25 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>ervu-dashboard-test</connection>
+    <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
-    <sql>SELECT 
-idm_id
-FROM ervu_dashboard.recruitment;</sql>
+    <limit>0</limit>
+    <sql>SELECT
+    r.idm_id as recruitment_id
+FROM ervu_dashboard.recruitment r
+         LEFT JOIN etl.job_execution je
+                   ON r.idm_id = je.recruitment_id
+                       and job_name = 'citizenship_foreign_job'
+where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING');</sql>
     <variables_active>N</variables_active>
     <attributes/>
     <GUI>
       <xloc>352</xloc>
-      <yloc>352</yloc>
+      <yloc>288</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>citizen_education_flow.hpl</name>
+    <name>citizenship_foreign_flow_delta.hpl</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -81,7 +86,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizenship_foreign/parallel/citizenship_foreign_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -90,9 +95,14 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizenship_foreign_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -116,12 +126,12 @@ FROM ervu_dashboard.recruitment;</sql>
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>624</xloc>
-      <yloc>192</yloc>
+      <xloc>640</xloc>
+      <yloc>128</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>citizen_education_flow.hpl 2</name>
+    <name>citizenship_foreign_flow_delta.hpl 2</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -132,7 +142,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizenship_foreign/parallel/citizenship_foreign_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -141,9 +151,14 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizenship_foreign_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -167,12 +182,12 @@ FROM ervu_dashboard.recruitment;</sql>
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>624</xloc>
-      <yloc>272</yloc>
+      <xloc>656</xloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>citizen_education_flow.hpl 3</name>
+    <name>citizenship_foreign_flow_delta.hpl 3</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -183,7 +198,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizenship_foreign/parallel/citizenship_foreign_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -192,9 +207,14 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizenship_foreign_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -218,12 +238,12 @@ FROM ervu_dashboard.recruitment;</sql>
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>624</xloc>
-      <yloc>352</yloc>
+      <xloc>656</xloc>
+      <yloc>288</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>citizen_education_flow.hpl 4</name>
+    <name>citizenship_foreign_flow_delta.hpl 4</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -234,7 +254,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizenship_foreign/parallel/citizenship_foreign_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -243,9 +263,14 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizenship_foreign_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -269,12 +294,12 @@ FROM ervu_dashboard.recruitment;</sql>
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>624</xloc>
-      <yloc>432</yloc>
+      <xloc>656</xloc>
+      <yloc>368</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>citizen_education_flow.hpl 5</name>
+    <name>citizenship_foreign_flow_delta.hpl 5</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -285,7 +310,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizenship_foreign/parallel/citizenship_foreign_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -294,9 +319,14 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizenship_foreign_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -320,8 +350,8 @@ FROM ervu_dashboard.recruitment;</sql>
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>624</xloc>
-      <yloc>512</yloc>
+      <xloc>656</xloc>
+      <yloc>448</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
diff --git a/mappings/info_recruits/citizen_tables/education/foreign_diploma/recruitment_five_flow_delta.hpl b/mappings/info_recruits/citizen_tables/deferment_liberation_permission/recruitment_five_flow_delta.hpl
similarity index 77%
rename from mappings/info_recruits/citizen_tables/education/foreign_diploma/recruitment_five_flow_delta.hpl
rename to mappings/info_recruits/citizen_tables/deferment_liberation_permission/recruitment_five_flow_delta.hpl
index ea8c53a..e55fa8d 100644
--- a/mappings/info_recruits/citizen_tables/education/foreign_diploma/recruitment_five_flow_delta.hpl
+++ b/mappings/info_recruits/citizen_tables/deferment_liberation_permission/recruitment_five_flow_delta.hpl
@@ -13,41 +13,36 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/08/28 21:23:43.331</created_date>
+    <created_date>2025/08/11 13:16:11.204</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/08/28 21:23:43.331</modified_date>
+    <modified_date>2025/08/11 13:16:11.204</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
       <from>Table input</from>
-      <to>foreign_diploma_flow_delta.hpl</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>get_max_source_update_date</from>
-      <to>Table input</to>
+      <to>deferment_liberation_permission_flow_delta.hpl</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>foreign_diploma_flow_delta.hpl 2</to>
+      <to>deferment_liberation_permission_flow_delta.hpl 2</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>foreign_diploma_flow_delta.hpl 3</to>
+      <to>deferment_liberation_permission_flow_delta.hpl 3</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>foreign_diploma_flow_delta.hpl 4</to>
+      <to>deferment_liberation_permission_flow_delta.hpl 4</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>foreign_diploma_flow_delta.hpl 5</to>
+      <to>deferment_liberation_permission_flow_delta.hpl 5</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -62,35 +57,249 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>ervu-dashboard-test</connection>
+    <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
     <limit>0</limit>
-    <lookup>get_max_source_update_date</lookup>
     <sql>SELECT
-    r.idm_id,
-    ? max_source_update_date
+    r.idm_id as recruitment_id
 FROM ervu_dashboard.recruitment r
          LEFT JOIN etl.job_execution je
                    ON r.idm_id = je.recruitment_id
-                       and job_name = '${JOB_NAME}'
- JOIN recruits_info ri
-              ON COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = r.idm_id
-                  AND ri.updated_at > (
-                      SELECT MAX(execution_datetime)
-                      FROM etl.job_execution
-                      WHERE job_name = '${JOB_NAME}'
-                        AND recruitment_id = r.idm_id
-                  )
+                       and job_name = 'deferment_liberation_permission_job'
 where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING');</sql>
     <variables_active>N</variables_active>
     <attributes/>
     <GUI>
-      <xloc>608</xloc>
+      <xloc>352</xloc>
+      <yloc>288</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>deferment_liberation_permission_flow_delta.hpl</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/deferment_liberation_permission/parallel/deferment_liberation_permission_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>deferment_liberation_permission_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>640</xloc>
+      <yloc>128</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>deferment_liberation_permission_flow_delta.hpl 2</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/deferment_liberation_permission/parallel/deferment_liberation_permission_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>deferment_liberation_permission_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>640</xloc>
+      <yloc>208</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>deferment_liberation_permission_flow_delta.hpl 3</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/deferment_liberation_permission/parallel/deferment_liberation_permission_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>deferment_liberation_permission_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>640</xloc>
+      <yloc>288</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>deferment_liberation_permission_flow_delta.hpl 4</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/deferment_liberation_permission/parallel/deferment_liberation_permission_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>deferment_liberation_permission_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>640</xloc>
       <yloc>384</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>foreign_diploma_flow_delta.hpl</name>
+    <name>deferment_liberation_permission_flow_delta.hpl 5</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -101,7 +310,7 @@ where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow_delta.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/deferment_liberation_permission/parallel/deferment_liberation_permission_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -110,13 +319,13 @@ where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment_id</field>
         <input/>
       </variable_mapping>
       <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>deferment_liberation_permission_job</input>
       </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
@@ -141,255 +350,8 @@ where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>800</xloc>
-      <yloc>224</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>foreign_diploma_flow_delta.hpl 2</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>800</xloc>
-      <yloc>304</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>foreign_diploma_flow_delta.hpl 3</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>800</xloc>
-      <yloc>384</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>foreign_diploma_flow_delta.hpl 4</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>800</xloc>
-      <yloc>464</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>foreign_diploma_flow_delta.hpl 5</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>800</xloc>
-      <yloc>544</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>get_max_source_update_date</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>select max(source_update_date)
-from foreign_diploma;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>432</xloc>
-      <yloc>384</yloc>
+      <xloc>640</xloc>
+      <yloc>480</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
diff --git a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/constants/education_constants_flow.hpl b/mappings/info_recruits/citizen_tables/education/educational_institution_learning/constants/education_constants_flow.hpl
deleted file mode 100644
index cd730ef..0000000
--- a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/constants/education_constants_flow.hpl
+++ /dev/null
@@ -1,362 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>education_constants_flow</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/21 20:19:05.913</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/21 20:19:05.913</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>education_level_input</from>
-      <to>education_level_output</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>minprosv_speciality_input</from>
-      <to>minprosv_speciality_output</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>minobr_speciality_input</from>
-      <to>minobr_speciality_output</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>educational_institution_status_input</from>
-      <to>educational_institution_status_output</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>education_level_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>nsi</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT 
-	key as code,
-	value ->> 'value' as value,
-	NOT hidden as actual,
-	updated_at as update_date
-FROM classifier_records 
-WHERE code = 'educationLevel';</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>368</xloc>
-      <yloc>208</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>education_level_output</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <fields>
-      <field>
-        <column_name>code</column_name>
-        <stream_name>code</stream_name>
-      </field>
-      <field>
-        <column_name>value</column_name>
-        <stream_name>value</stream_name>
-      </field>
-      <field>
-        <column_name>actual</column_name>
-        <stream_name>actual</stream_name>
-      </field>
-      <field>
-        <column_name>update_date</column_name>
-        <stream_name>update_date</stream_name>
-      </field>
-    </fields>
-    <ignore_errors>N</ignore_errors>
-    <only_when_have_rows>N</only_when_have_rows>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <return_keys>N</return_keys>
-    <schema>ervu_dashboard</schema>
-    <specify_fields>Y</specify_fields>
-    <table>education_level</table>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_in_table>Y</tablename_in_table>
-    <truncate>N</truncate>
-    <use_batch>Y</use_batch>
-    <attributes/>
-    <GUI>
-      <xloc>624</xloc>
-      <yloc>208</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>educational_institution_status_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>nsi</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT 
-	key,
-	value ->> 'value' as value,
-	NOT hidden as actual,
-	updated_at as update_date
-FROM classifier_records 
-WHERE code = 'organizationStatus';</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>368</xloc>
-      <yloc>304</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>educational_institution_status_output</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <fields>
-      <field>
-        <column_name>code</column_name>
-        <stream_name>code</stream_name>
-      </field>
-      <field>
-        <column_name>value</column_name>
-        <stream_name>value</stream_name>
-      </field>
-      <field>
-        <column_name>actual</column_name>
-        <stream_name>actual</stream_name>
-      </field>
-      <field>
-        <column_name>update_date</column_name>
-        <stream_name>update_date</stream_name>
-      </field>
-    </fields>
-    <ignore_errors>N</ignore_errors>
-    <only_when_have_rows>N</only_when_have_rows>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <return_keys>N</return_keys>
-    <schema>ervu_dashboard</schema>
-    <specify_fields>Y</specify_fields>
-    <table>educational_institution_status</table>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_in_table>Y</tablename_in_table>
-    <truncate>N</truncate>
-    <use_batch>Y</use_batch>
-    <attributes/>
-    <GUI>
-      <xloc>624</xloc>
-      <yloc>304</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>minobr_speciality_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>nsi</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT
-    value -> 'extraInfo' ->> 'kodSpecz' as code,
-    value -> 'extraInfo' ->> 'naimSpecz' as value,
-    NOT hidden as actual,
-    updated_at as update_date
-FROM classifier_records
-WHERE code = 'educationSpecialityMinobr'
-  AND value -> 'extraInfo' ->> 'kodSpecz' != 'null';</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>368</xloc>
-      <yloc>400</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>minobr_speciality_output</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <fields>
-      <field>
-        <column_name>code</column_name>
-        <stream_name>code</stream_name>
-      </field>
-      <field>
-        <column_name>value</column_name>
-        <stream_name>value</stream_name>
-      </field>
-      <field>
-        <column_name>actual</column_name>
-        <stream_name>actual</stream_name>
-      </field>
-      <field>
-        <column_name>update_date</column_name>
-        <stream_name>update_date</stream_name>
-      </field>
-    </fields>
-    <ignore_errors>N</ignore_errors>
-    <only_when_have_rows>N</only_when_have_rows>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <return_keys>N</return_keys>
-    <schema>ervu_dashboard</schema>
-    <specify_fields>Y</specify_fields>
-    <table>minobr_education_speciality</table>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_in_table>Y</tablename_in_table>
-    <truncate>N</truncate>
-    <use_batch>Y</use_batch>
-    <attributes/>
-    <GUI>
-      <xloc>624</xloc>
-      <yloc>400</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>minprosv_speciality_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>nsi</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT
-    key,
-    value -> 'extraInfo' ->> 'kodSpecz' as code,
-    value -> 'extraInfo' ->> 'naimSpecz' as value,
-    NOT hidden as actual,
-    updated_at as update_date
-FROM classifier_records
-WHERE code = 'educationSpecialityMinprosv' 
-  AND value -> 'extraInfo' ->> 'kodSpecz' != 'null';</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>368</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>minprosv_speciality_output</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <fields>
-      <field>
-        <column_name>code</column_name>
-        <stream_name>code</stream_name>
-      </field>
-      <field>
-        <column_name>value</column_name>
-        <stream_name>value</stream_name>
-      </field>
-      <field>
-        <column_name>actual</column_name>
-        <stream_name>actual</stream_name>
-      </field>
-      <field>
-        <column_name>update_date</column_name>
-        <stream_name>update_date</stream_name>
-      </field>
-    </fields>
-    <ignore_errors>N</ignore_errors>
-    <only_when_have_rows>N</only_when_have_rows>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <return_keys>N</return_keys>
-    <schema>ervu_dashboard</schema>
-    <specify_fields>Y</specify_fields>
-    <table>minprosv_education_speciality</table>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_in_table>Y</tablename_in_table>
-    <truncate>N</truncate>
-    <use_batch>Y</use_batch>
-    <attributes/>
-    <GUI>
-      <xloc>624</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/constants/education_constants_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/education/educational_institution_learning/constants/education_constants_flow_repeat.hpl
deleted file mode 100644
index ebffbdf..0000000
--- a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/constants/education_constants_flow_repeat.hpl
+++ /dev/null
@@ -1,508 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>education_constants_flow_repeat</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/21 20:33:27.321</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/21 20:33:27.321</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>get_max_education_level_update_date</from>
-      <to>education_level_input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>get_max_educational_institution_status_update_date</from>
-      <to>educational_institution_status_input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>get_max_minobr_speciality_update_date</from>
-      <to>minobr_speciality_input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>get_max_minprosv_speciality_update_date</from>
-      <to>minprosv_speciality_input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>education_level_input</from>
-      <to>education_level_upsert</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>educational_institution_status_input</from>
-      <to>educational_institution_status_upsert</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>minobr_speciality_input</from>
-      <to>minobr_speciality_upsert</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>minprosv_speciality_input</from>
-      <to>minprosv_speciality_upsert</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>education_level_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>nsi</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <lookup>get_max_education_level_update_date</lookup>
-    <sql>SELECT 
-	key as code,
-	value ->> 'value' as value,
-	NOT hidden as actual,
-	updated_at as update_date
-FROM classifier_records 
-WHERE code = 'educationLevel'
-AND updated_at > ?;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>480</xloc>
-      <yloc>256</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>education_level_upsert</name>
-    <type>InsertUpdate</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <lookup>
-      <key>
-        <condition>=</condition>
-        <field>code</field>
-        <name>code</name>
-        <name2/>
-      </key>
-      <key>
-        <condition>&lt;></condition>
-        <field>actual</field>
-        <name>actual</name>
-        <name2/>
-      </key>
-      <schema>ervu_dashboard</schema>
-      <table>education_level</table>
-      <value>
-        <name>code</name>
-        <rename>code</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>value</name>
-        <rename>value</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>actual</name>
-        <rename>actual</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>update_date</name>
-        <rename>update_date</rename>
-        <update>Y</update>
-      </value>
-    </lookup>
-    <update_bypassed>N</update_bypassed>
-    <attributes/>
-    <GUI>
-      <xloc>768</xloc>
-      <yloc>256</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>educational_institution_status_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>nsi</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <lookup>get_max_educational_institution_status_update_date</lookup>
-    <sql>SELECT 
-	key,
-	value ->> 'value' as value,
-	NOT hidden as actual,
-	updated_at as update_date
-FROM classifier_records 
-WHERE code = 'organizationStatus'
-AND updated_at > ?;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>480</xloc>
-      <yloc>352</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>educational_institution_status_upsert</name>
-    <type>InsertUpdate</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <lookup>
-      <key>
-        <condition>=</condition>
-        <field>code</field>
-        <name>code</name>
-      </key>
-      <key>
-        <condition>&lt;></condition>
-        <field>actual</field>
-        <name>actual</name>
-      </key>
-      <schema>ervu_dashboard</schema>
-      <table>educational_institution_status</table>
-      <value>
-        <name>code</name>
-        <rename>code</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>value</name>
-        <rename>value</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>actual</name>
-        <rename>actual</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>update_date</name>
-        <rename>update_date</rename>
-        <update>Y</update>
-      </value>
-    </lookup>
-    <update_bypassed>N</update_bypassed>
-    <attributes/>
-    <GUI>
-      <xloc>768</xloc>
-      <yloc>352</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>get_max_education_level_update_date</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT
-       max(update_date) as max_update_date
-FROM education_level;
-</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>128</xloc>
-      <yloc>256</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>get_max_educational_institution_status_update_date</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT
-       max(update_date) as max_update_date
-FROM educational_institution_status;
-</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>128</xloc>
-      <yloc>352</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>get_max_minobr_speciality_update_date</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT
-       max(update_date) as max_update_date
-FROM minobr_education_speciality;
-</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>128</xloc>
-      <yloc>448</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>get_max_minprosv_speciality_update_date</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT
-       max(update_date) as max_update_date
-FROM minprosv_education_speciality
-</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>128</xloc>
-      <yloc>544</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>minobr_speciality_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>nsi</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <lookup>get_max_minobr_speciality_update_date</lookup>
-    <sql>SELECT
-    value -> 'extraInfo' ->> 'kodSpecz' as code,
-    value -> 'extraInfo' ->> 'naimSpecz' as value,
-    NOT hidden as actual,
-    updated_at as update_date
-FROM classifier_records
-WHERE code = 'educationSpecialityMinobr'
-  AND value -> 'extraInfo' ->> 'kodSpecz' != 'null'
-AND updated_at > ?;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>480</xloc>
-      <yloc>448</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>minobr_speciality_upsert</name>
-    <type>InsertUpdate</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <lookup>
-      <key>
-        <condition>=</condition>
-        <field>code</field>
-        <name>code</name>
-      </key>
-      <key>
-        <condition>&lt;></condition>
-        <field>actual</field>
-        <name>actual</name>
-      </key>
-      <schema>ervu_dashboard</schema>
-      <table>minobr_education_speciality</table>
-      <value>
-        <name>code</name>
-        <rename>code</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>value</name>
-        <rename>value</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>actual</name>
-        <rename>actual</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>update_date</name>
-        <rename>update_date</rename>
-        <update>Y</update>
-      </value>
-    </lookup>
-    <update_bypassed>N</update_bypassed>
-    <attributes/>
-    <GUI>
-      <xloc>768</xloc>
-      <yloc>448</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>minprosv_speciality_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>nsi</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <lookup>get_max_minprosv_speciality_update_date</lookup>
-    <sql>SELECT
-    key,
-    value -> 'extraInfo' ->> 'kodSpecz' as code,
-    value -> 'extraInfo' ->> 'naimSpecz' as value,
-    NOT hidden as actual,
-    updated_at as update_date
-FROM classifier_records
-WHERE code = 'educationSpecialityMinprosv' 
-  AND value -> 'extraInfo' ->> 'kodSpecz' != 'null'
-AND updated_at > ?;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>480</xloc>
-      <yloc>544</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>minprosv_speciality_upsert</name>
-    <type>InsertUpdate</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <lookup>
-      <key>
-        <condition>=</condition>
-        <field>code</field>
-        <name>code</name>
-      </key>
-      <key>
-        <condition>&lt;></condition>
-        <field>actual</field>
-        <name>actual</name>
-      </key>
-      <schema>ervu_dashboard</schema>
-      <table>minprosv_education_speciality</table>
-      <value>
-        <name>code</name>
-        <rename>code</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>value</name>
-        <rename>value</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>actual</name>
-        <rename>actual</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>update_date</name>
-        <rename>update_date</rename>
-        <update>Y</update>
-      </value>
-    </lookup>
-    <update_bypassed>N</update_bypassed>
-    <attributes/>
-    <GUI>
-      <xloc>768</xloc>
-      <yloc>544</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/constants/support/check_if_constants_exists.hpl b/mappings/info_recruits/citizen_tables/education/educational_institution_learning/constants/support/check_if_constants_exists.hpl
deleted file mode 100644
index 906090d..0000000
--- a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/constants/support/check_if_constants_exists.hpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>check_if_constants_exists</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/21 20:58:53.188</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/21 20:58:53.188</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>Table input</from>
-      <to>Set variables</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>Set variables</name>
-    <type>SetVariable</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <fields>
-      <field>
-        <default_value/>
-        <field_name>constasnts_exists</field_name>
-        <variable_name>CONSTANTS_EXISTS</variable_name>
-        <variable_type>PARENT_WORKFLOW</variable_type>
-      </field>
-    </fields>
-    <use_formatting>Y</use_formatting>
-    <attributes/>
-    <GUI>
-      <xloc>608</xloc>
-      <yloc>304</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Table input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT EXISTS (
-    SELECT 1 FROM education_level
-    UNION ALL
-    SELECT 1 FROM educational_institution_status
-    UNION ALL
-    SELECT 1 FROM minobr_education_speciality
-    UNION ALL
-    SELECT 1 FROM minprosv_education_speciality
-) AS constasnts_exists</sql>
-    <variables_active>Y</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>320</xloc>
-      <yloc>304</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/educational_institution_learning_job.hwf b/mappings/info_recruits/citizen_tables/education/educational_institution_learning/educational_institution_learning_job.hwf
deleted file mode 100644
index 405c135..0000000
--- a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/educational_institution_learning_job.hwf
+++ /dev/null
@@ -1,410 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<workflow>
-  <name>educational_institution_learning_job</name>
-  <name_sync_with_filename>Y</name_sync_with_filename>
-  <description/>
-  <extended_description/>
-  <workflow_version/>
-  <created_user>-</created_user>
-  <created_date>2025/08/27 21:14:40.330</created_date>
-  <modified_user>-</modified_user>
-  <modified_date>2025/08/27 21:14:40.330</modified_date>
-  <parameters>
-    </parameters>
-  <actions>
-    <action>
-      <name>Start</name>
-      <description/>
-      <type>SPECIAL</type>
-      <attributes/>
-      <DayOfMonth>1</DayOfMonth>
-      <hour>12</hour>
-      <intervalMinutes>60</intervalMinutes>
-      <intervalSeconds>0</intervalSeconds>
-      <minutes>0</minutes>
-      <repeat>N</repeat>
-      <schedulerType>0</schedulerType>
-      <weekDay>1</weekDay>
-      <parallel>N</parallel>
-      <xloc>384</xloc>
-      <yloc>288</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>check_if_job_execution_exists.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/support/check_if_job_execution_exists.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>1392</xloc>
-      <yloc>304</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>employer_job_execution_exists_check</name>
-      <description/>
-      <type>SIMPLE_EVAL</type>
-      <attributes/>
-      <fieldtype>boolean</fieldtype>
-      <successbooleancondition>false</successbooleancondition>
-      <successcondition>equal</successcondition>
-      <successnumbercondition>equal</successnumbercondition>
-      <successwhenvarset>N</successwhenvarset>
-      <valuetype>variable</valuetype>
-      <variablename>JOB_EXECUTED_FLAG</variablename>
-      <parallel>N</parallel>
-      <xloc>1696</xloc>
-      <yloc>304</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>recruitment_five_flow.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/recruitment_five_flow.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>Y</parallel>
-      <xloc>1968</xloc>
-      <yloc>304</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>recruitment_five_flow_repeat.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/recruitment_five_flow_repeat.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>1968</xloc>
-      <yloc>608</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>check_if_need_to_repeat.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/support/check_if_need_to_repeat.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>1696</xloc>
-      <yloc>448</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>Simple evaluation</name>
-      <description/>
-      <type>SIMPLE_EVAL</type>
-      <attributes/>
-      <fieldtype>boolean</fieldtype>
-      <successbooleancondition>true</successbooleancondition>
-      <successcondition>equal</successcondition>
-      <successnumbercondition>equal</successnumbercondition>
-      <successwhenvarset>N</successwhenvarset>
-      <valuetype>variable</valuetype>
-      <variablename>NEED_TO_REPEAT_JOB</variablename>
-      <parallel>N</parallel>
-      <xloc>1696</xloc>
-      <yloc>608</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>recruitment_five_flow_delta.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/recruitment_five_flow_delta.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>1696</xloc>
-      <yloc>800</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>check_if_constants_exists.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/constants/support/check_if_constants_exists.hpl</filename>
-      <logext/>
-      <logfile/>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>576</xloc>
-      <yloc>288</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>constants_exists</name>
-      <description/>
-      <type>SIMPLE_EVAL</type>
-      <attributes/>
-      <fieldtype>boolean</fieldtype>
-      <successbooleancondition>true</successbooleancondition>
-      <successcondition>equal</successcondition>
-      <successnumbercondition>equal</successnumbercondition>
-      <successwhenvarset>N</successwhenvarset>
-      <valuetype>variable</valuetype>
-      <variablename>CONSTANTS_EXISTS</variablename>
-      <parallel>N</parallel>
-      <xloc>752</xloc>
-      <yloc>288</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>education_constants_flow.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/constants/education_constants_flow.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>944</xloc>
-      <yloc>208</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>education_constants_flow_repeat.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/constants/education_constants_flow_repeat.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>944</xloc>
-      <yloc>384</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>init_job_name</name>
-      <description/>
-      <type>SET_VARIABLES</type>
-      <attributes/>
-      <fields>
-        <field>
-          <variable_name>JOB_NAME</variable_name>
-          <variable_type>CURRENT_WORKFLOW</variable_type>
-          <variable_value>educational_institution_learning_job</variable_value>
-        </field>
-      </fields>
-      <file_variable_type>CURRENT_WORKFLOW</file_variable_type>
-      <replacevars>N</replacevars>
-      <parallel>N</parallel>
-      <xloc>1184</xloc>
-      <yloc>304</yloc>
-      <attributes_hac/>
-    </action>
-  </actions>
-  <hops>
-    <hop>
-      <from>check_if_job_execution_exists.hpl</from>
-      <to>employer_job_execution_exists_check</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>employer_job_execution_exists_check</from>
-      <to>check_if_need_to_repeat.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>N</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>check_if_need_to_repeat.hpl</from>
-      <to>Simple evaluation</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>check_if_constants_exists.hpl</from>
-      <to>constants_exists</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>constants_exists</from>
-      <to>education_constants_flow.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>N</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>constants_exists</from>
-      <to>education_constants_flow_repeat.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>Start</from>
-      <to>check_if_constants_exists.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
-    </hop>
-    <hop>
-      <from>education_constants_flow.hpl</from>
-      <to>init_job_name</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>education_constants_flow_repeat.hpl</from>
-      <to>init_job_name</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>init_job_name</from>
-      <to>check_if_job_execution_exists.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>employer_job_execution_exists_check</from>
-      <to>recruitment_five_flow.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>Simple evaluation</from>
-      <to>recruitment_five_flow_repeat.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>Simple evaluation</from>
-      <to>recruitment_five_flow_delta.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>N</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-  </hops>
-  <notepads>
-  </notepads>
-  <attributes/>
-</workflow>
diff --git a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow.hpl b/mappings/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow.hpl
deleted file mode 100644
index 8bc8c1b..0000000
--- a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow.hpl
+++ /dev/null
@@ -1,1022 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>citizen_education_flow</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/08/28 08:20:00.808</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/08/28 08:20:00.808</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Create job execution record</from>
-      <to>education_input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Filter rows</from>
-      <to>Change job status on success</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Filter_null_parental_leave_dates</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>education_input</from>
-      <to>Identify last row in a stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>citizen_education_output</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>citizen_education_output</from>
-      <to>Filter rows</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>education_leave_output</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Filter_null_parental_leave_dates</from>
-      <to>Block until transforms finish</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Block until transforms finish</from>
-      <to>education_leave_output</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Group by</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Group by</from>
-      <to>citizen_education_output</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Detect empty stream</from>
-      <to>Change job status on success</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>Abort</name>
-    <type>Abort</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <abort_option>ABORT</abort_option>
-    <always_log_rows>Y</always_log_rows>
-    <row_threshold>0</row_threshold>
-    <attributes/>
-    <GUI>
-      <xloc>1488</xloc>
-      <yloc>640</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Block until transforms finish</name>
-    <type>BlockUntilTransformsFinish</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <transforms>
-      <transform>
-        <name>citizen_education_output</name>
-      </transform>
-    </transforms>
-    <attributes/>
-    <GUI>
-      <xloc>880</xloc>
-      <yloc>640</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Change job status on error</name>
-    <type>ExecSql</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <arguments>
-      <argument>
-        <name>error_description</name>
-      </argument>
-    </arguments>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>Y</execute_each_row>
-    <quoteString>N</quoteString>
-    <replace_variables>Y</replace_variables>
-    <set_params>Y</set_params>
-    <single_statement>N</single_statement>
-    <sql>UPDATE etl.job_execution
-SET status = 'ERROR',
-    error_description = ?
-WHERE job_name = '${JOB_NAME}' 
-and recruitment_id = '${IDM_ID}';
-
-</sql>
-    <attributes/>
-    <GUI>
-      <xloc>1264</xloc>
-      <yloc>640</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Change job status on success</name>
-    <type>ExecSql</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <arguments>
-</arguments>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>Y</execute_each_row>
-    <quoteString>N</quoteString>
-    <replace_variables>Y</replace_variables>
-    <set_params>N</set_params>
-    <single_statement>N</single_statement>
-    <sql>UPDATE etl.job_execution
-SET status = 'SUCCESS'
-WHERE job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';
-
-</sql>
-    <attributes/>
-    <GUI>
-      <xloc>1488</xloc>
-      <yloc>256</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Create job execution record</name>
-    <type>ExecSql</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <arguments>
-</arguments>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <quoteString>N</quoteString>
-    <replace_variables>Y</replace_variables>
-    <set_params>N</set_params>
-    <single_statement>N</single_statement>
-    <sql>INSERT INTO etl.job_execution (id, job_name, status, execution_datetime, error_description, recruitment_id)
-VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
-
-</sql>
-    <attributes/>
-    <GUI>
-      <xloc>208</xloc>
-      <yloc>432</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Detect empty stream</name>
-    <type>DetectEmptyStream</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <attributes/>
-    <GUI>
-      <xloc>624</xloc>
-      <yloc>256</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Filter rows</name>
-    <type>FilterRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <compare>
-      <condition>
-        <conditions>
-</conditions>
-        <function>=</function>
-        <leftvalue>last_row</leftvalue>
-        <negated>N</negated>
-        <operator>-</operator>
-        <value>
-          <isnull>N</isnull>
-          <length>-1</length>
-          <name>constant</name>
-          <precision>-1</precision>
-          <text>Y</text>
-          <type>Boolean</type>
-        </value>
-      </condition>
-    </compare>
-    <send_true_to>Change job status on success</send_true_to>
-    <attributes/>
-    <GUI>
-      <xloc>1488</xloc>
-      <yloc>432</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Filter_null_parental_leave_dates</name>
-    <type>FilterRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <compare>
-      <condition>
-        <conditions>
-</conditions>
-        <function>IS NOT NULL</function>
-        <leftvalue>academ_reason</leftvalue>
-        <negated>N</negated>
-        <operator>-</operator>
-      </condition>
-    </compare>
-    <send_true_to>Block until transforms finish</send_true_to>
-    <attributes/>
-    <GUI>
-      <xloc>624</xloc>
-      <yloc>640</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Group by</name>
-    <type>GroupBy</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <add_linenr>N</add_linenr>
-    <all_rows>N</all_rows>
-    <directory>${java.io.tmpdir}</directory>
-    <fields>
-      <field>
-        <aggregate>recruit_id</aggregate>
-        <subject>recruit_id</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>source_update_date</aggregate>
-        <subject>source_update_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>educational_institution_type</aggregate>
-        <subject>educational_institution_type</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>org_type</aggregate>
-        <subject>org_type</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>inn</aggregate>
-        <subject>inn</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>kpp</aggregate>
-        <subject>kpp</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>ogrn</aggregate>
-        <subject>ogrn</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>educational_institution_address</aggregate>
-        <subject>educational_institution_address</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>educational_organization_separate_unit_type</aggregate>
-        <subject>educational_organization_separate_unit_type</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>educational_organization_separate_unit_address</aggregate>
-        <subject>educational_organization_separate_unit_address</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>student_status</aggregate>
-        <subject>student_status</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>grade_number</aggregate>
-        <subject>grade_number</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>education_level_code</aggregate>
-        <subject>education_level_code</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>admission_date</aggregate>
-        <subject>admission_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>enrollment_date</aggregate>
-        <subject>enrollment_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>enrollment_order_number</aggregate>
-        <subject>enrollment_order_number</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>enrollment_order_date</aggregate>
-        <subject>enrollment_order_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>completion_date</aggregate>
-        <subject>completion_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>education_form</aggregate>
-        <subject>education_form</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>education_program_start_date</aggregate>
-        <subject>education_program_start_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>education_start_date</aggregate>
-        <subject>education_start_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>planned_completion_date</aggregate>
-        <subject>planned_completion_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>minobr_speciality_code</aggregate>
-        <subject>minobr_speciality_code</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>minprosv_speciality_code</aggregate>
-        <subject>minprosv_speciality_code</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>recovery_info</aggregate>
-        <subject>recovery_info</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>recovery_date</aggregate>
-        <subject>recovery_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>recovery_order_date</aggregate>
-        <subject>recovery_order_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>recovery_order_number</aggregate>
-        <subject>recovery_order_number</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>expulsion_info</aggregate>
-        <subject>expulsion_info</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>expulsion_date</aggregate>
-        <subject>expulsion_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>expulsion_order_date</aggregate>
-        <subject>expulsion_order_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>expulsion_order_number</aggregate>
-        <subject>expulsion_order_number</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>academical_leave_info</aggregate>
-        <subject>academical_leave_info</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>first_education</aggregate>
-        <subject>first_education</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>vus_spec</aggregate>
-        <subject>vus_spec</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_center_education_info</aggregate>
-        <subject>military_center_education_info</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_center_education_start_date</aggregate>
-        <subject>military_center_education_start_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_center_education_end_date</aggregate>
-        <subject>military_center_education_end_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_center_education_period</aggregate>
-        <subject>military_center_education_period</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_center_completion</aggregate>
-        <subject>military_center_completion</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_department_education_info</aggregate>
-        <subject>military_department_education_info</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_department_start_date</aggregate>
-        <subject>military_department_start_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_department_end_date</aggregate>
-        <subject>military_department_end_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>last_row</aggregate>
-        <subject>last_row</subject>
-        <type>LAST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>academ_start_date</aggregate>
-        <subject>academ_start_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>academ_end_date</aggregate>
-        <subject>academ_end_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>academ_reason</aggregate>
-        <subject>academ_reason</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-    </fields>
-    <give_back_row>N</give_back_row>
-    <group>
-      <field>
-        <name>source_id</name>
-      </field>
-    </group>
-    <ignore_aggregate>N</ignore_aggregate>
-    <prefix>grp</prefix>
-    <attributes/>
-    <GUI>
-      <xloc>944</xloc>
-      <yloc>432</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Identify last row in a stream</name>
-    <type>DetectLastRow</type>
-    <description/>
-    <distribute>N</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <resultfieldname>last_row</resultfieldname>
-    <attributes/>
-    <GUI>
-      <xloc>624</xloc>
-      <yloc>432</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>citizen_education_output</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <fields>
-      <field>
-        <column_name>source_id</column_name>
-        <stream_name>source_id</stream_name>
-      </field>
-      <field>
-        <column_name>recruit_id</column_name>
-        <stream_name>recruit_id</stream_name>
-      </field>
-      <field>
-        <column_name>source_update_date</column_name>
-        <stream_name>source_update_date</stream_name>
-      </field>
-      <field>
-        <column_name>educational_institution_type</column_name>
-        <stream_name>educational_institution_type</stream_name>
-      </field>
-      <field>
-        <column_name>org_type</column_name>
-        <stream_name>org_type</stream_name>
-      </field>
-      <field>
-        <column_name>inn</column_name>
-        <stream_name>inn</stream_name>
-      </field>
-      <field>
-        <column_name>kpp</column_name>
-        <stream_name>kpp</stream_name>
-      </field>
-      <field>
-        <column_name>ogrn</column_name>
-        <stream_name>ogrn</stream_name>
-      </field>
-      <field>
-        <column_name>educational_institution_address</column_name>
-        <stream_name>educational_institution_address</stream_name>
-      </field>
-      <field>
-        <column_name>educational_organization_separate_unit_type</column_name>
-        <stream_name>educational_organization_separate_unit_type</stream_name>
-      </field>
-      <field>
-        <column_name>educational_organization_separate_unit_address</column_name>
-        <stream_name>educational_organization_separate_unit_address</stream_name>
-      </field>
-      <field>
-        <column_name>student_status</column_name>
-        <stream_name>student_status</stream_name>
-      </field>
-      <field>
-        <column_name>grade_number</column_name>
-        <stream_name>grade_number</stream_name>
-      </field>
-      <field>
-        <column_name>education_level_code</column_name>
-        <stream_name>education_level_code</stream_name>
-      </field>
-      <field>
-        <column_name>admission_date</column_name>
-        <stream_name>admission_date</stream_name>
-      </field>
-      <field>
-        <column_name>enrollment_date</column_name>
-        <stream_name>enrollment_date</stream_name>
-      </field>
-      <field>
-        <column_name>enrollment_order_number</column_name>
-        <stream_name>enrollment_order_number</stream_name>
-      </field>
-      <field>
-        <column_name>enrollment_order_date</column_name>
-        <stream_name>enrollment_order_date</stream_name>
-      </field>
-      <field>
-        <column_name>completion_date</column_name>
-        <stream_name>completion_date</stream_name>
-      </field>
-      <field>
-        <column_name>education_form</column_name>
-        <stream_name>education_form</stream_name>
-      </field>
-      <field>
-        <column_name>education_program_start_date</column_name>
-        <stream_name>education_program_start_date</stream_name>
-      </field>
-      <field>
-        <column_name>education_start_date</column_name>
-        <stream_name>education_start_date</stream_name>
-      </field>
-      <field>
-        <column_name>planned_completion_date</column_name>
-        <stream_name>planned_completion_date</stream_name>
-      </field>
-      <field>
-        <column_name>minobr_speciality_code</column_name>
-        <stream_name>minobr_speciality_code</stream_name>
-      </field>
-      <field>
-        <column_name>minprosv_speciality_code</column_name>
-        <stream_name>minprosv_speciality_code</stream_name>
-      </field>
-      <field>
-        <column_name>recovery_info</column_name>
-        <stream_name>recovery_info</stream_name>
-      </field>
-      <field>
-        <column_name>recovery_date</column_name>
-        <stream_name>recovery_date</stream_name>
-      </field>
-      <field>
-        <column_name>recovery_order_date</column_name>
-        <stream_name>recovery_order_date</stream_name>
-      </field>
-      <field>
-        <column_name>recovery_order_number</column_name>
-        <stream_name>recovery_order_number</stream_name>
-      </field>
-      <field>
-        <column_name>expulsion_info</column_name>
-        <stream_name>expulsion_info</stream_name>
-      </field>
-      <field>
-        <column_name>expulsion_date</column_name>
-        <stream_name>expulsion_date</stream_name>
-      </field>
-      <field>
-        <column_name>expulsion_order_date</column_name>
-        <stream_name>expulsion_order_date</stream_name>
-      </field>
-      <field>
-        <column_name>expulsion_order_number</column_name>
-        <stream_name>expulsion_order_number</stream_name>
-      </field>
-      <field>
-        <column_name>academical_leave_info</column_name>
-        <stream_name>academical_leave_info</stream_name>
-      </field>
-      <field>
-        <column_name>first_education</column_name>
-        <stream_name>first_education</stream_name>
-      </field>
-      <field>
-        <column_name>vus_spec</column_name>
-        <stream_name>vus_spec</stream_name>
-      </field>
-      <field>
-        <column_name>military_center_education_info</column_name>
-        <stream_name>military_center_education_info</stream_name>
-      </field>
-      <field>
-        <column_name>military_center_education_start_date</column_name>
-        <stream_name>military_center_education_start_date</stream_name>
-      </field>
-      <field>
-        <column_name>military_center_education_end_date</column_name>
-        <stream_name>military_center_education_end_date</stream_name>
-      </field>
-      <field>
-        <column_name>military_center_education_period</column_name>
-        <stream_name>military_center_education_period</stream_name>
-      </field>
-      <field>
-        <column_name>military_center_completion</column_name>
-        <stream_name>military_center_completion</stream_name>
-      </field>
-      <field>
-        <column_name>military_department_education_info</column_name>
-        <stream_name>military_department_education_info</stream_name>
-      </field>
-      <field>
-        <column_name>military_department_start_date</column_name>
-        <stream_name>military_department_start_date</stream_name>
-      </field>
-      <field>
-        <column_name>military_department_end_date</column_name>
-        <stream_name>military_department_end_date</stream_name>
-      </field>
-    </fields>
-    <ignore_errors>N</ignore_errors>
-    <only_when_have_rows>N</only_when_have_rows>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <return_keys>N</return_keys>
-    <schema>ervu_dashboard</schema>
-    <specify_fields>Y</specify_fields>
-    <table>educational_institution_learning</table>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_in_table>Y</tablename_in_table>
-    <truncate>N</truncate>
-    <use_batch>Y</use_batch>
-    <attributes/>
-    <GUI>
-      <xloc>1264</xloc>
-      <yloc>432</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>education_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             education_elem,
-                             academ_elem,
-                             'Образовательная организация высшего образования' as educational_institution_type
-                      FROM recruits_info ri
-                               CROSS JOIN LATERAL jsonb_array_elements(
-                              ri.info -> 'svedFL' -> 'svedVUZ' -> 'vuz') AS education_elem
-                               LEFT JOIN LATERAL jsonb_array_elements(
-                              CASE
-                                  WHEN jsonb_typeof(education_elem -> 'svedOtpusk') = 'array'
-                                      THEN education_elem -> 'svedOtpusk'
-                                  ELSE '[]'::jsonb
-                                  END
-                                                 ) AS academ_elem ON true
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedVUZ' -> 'vuz') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-
-                      union all
-
-                      SELECT ri.recruit_id,
-                             education_elem,
-                             academ_elem,
-                             'Профессиональная образовательная организация' as educational_institution_type
-                      FROM recruits_info ri
-                               CROSS JOIN LATERAL jsonb_array_elements(
-                              ri.info -> 'svedFL' -> 'svedKolledzh' -> 'kolledzh') AS education_elem
-                               LEFT JOIN LATERAL jsonb_array_elements(
-                              CASE
-                                  WHEN jsonb_typeof(education_elem -> 'svedOtpusk') = 'array'
-                                      THEN education_elem -> 'svedOtpusk'
-                                  ELSE '[]'::jsonb
-                                  END
-                                                 ) AS academ_elem ON true
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedKolledzh' -> 'kolledzh') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-
-                      union all
-
-                      SELECT ri.recruit_id,
-                             education_elem,
-                             academ_elem,
-                             'Общеобразовательная организация' as educational_institution_type
-                      FROM recruits_info ri
-                               CROSS JOIN LATERAL jsonb_array_elements(
-                              ri.info -> 'svedFL' -> 'svedSHkola' -> 'shkola') AS education_elem
-                               LEFT JOIN LATERAL jsonb_array_elements(
-                              CASE
-                                  WHEN jsonb_typeof(education_elem -> 'svedOtpusk') = 'array'
-                                      THEN education_elem -> 'svedOtpusk'
-                                  ELSE '[]'::jsonb
-                                  END
-                                                 ) AS academ_elem ON true
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedSHkola' -> 'shkola') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}')
-SELECT fd.recruit_id,
-       education_elem ->> 'id'                                                                                       AS source_id,
-       to_date(education_elem ->> 'dataSved', 'YYYY-MM-DD')                                                          as source_update_date,
-       educational_institution_type,
-       education_elem -> 'svedOrg' ->> 'naimTipOrg'                                                                  as org_type,
-       education_elem -> 'svedOrg' ->> 'inn'                                                                         as inn,
-       education_elem -> 'svedOrg' ->> 'kpp'                                                                         as kpp,
-       coalesce(education_elem -> 'svedOrg' ->> 'ogrn', education_elem -> 'svedOrg' ->>
-                                                        'ogrnip')                                                    as ogrn,
-       education_elem -> 'svedOrg' ->> 'adresOrg'                                                                    as educational_institution_address,
-       education_elem -> 'svedOrg' -> 'extend' ->> 'statusOrg'                                                       as educational_institution_address,
-       education_elem -> 'svedOrg' -> 'extend' ->> 'vidPodrazdOrg'                                                   as educational_organization_separate_unit_type,
-       education_elem -> 'svedOrg' -> 'extend' ->> 'adresPodrazdOrg'                                                 as educational_organization_separate_unit_address,
-       education_elem ->> 'naimStatus'                                                                               as student_status,
-       case
-           when educational_institution_type = 'Образовательная организация высшего образования'
-               then education_elem ->> 'nomerKursa'
-           when educational_institution_type = 'Профессиональная образовательная организация'
-               then education_elem -> 'extend' ->> 'klass'
-           when educational_institution_type = 'Общеобразовательная организация' then education_elem ->> 'klass'
-           end                                                                                                       as grade_number,
-       education_elem ->> 'kodUrovObr'                                                                               as education_level_code,
-       to_date(coalesce(education_elem -> 'extend' ->> 'dataPostup', education_elem ->> 'dataPostup'),
-               'YYYY-MM-DD')                                                                                         as admission_date,
-       to_date(education_elem ->> 'dataZachisl', 'YYYY-MM-DD')                                                       as enrollment_date,
-       education_elem ->> 'nomPrikazZachisl'                                                                         as enrollment_order_number,
-       to_date(education_elem ->> 'dataPrikazZachisl', 'YYYY-MM-DD')                                                 as enrollment_order_date,
-       to_date(coalesce(education_elem -> 'extend' ->> 'dataZavershObuch', education_elem ->> 'dataOkonch'),
-               'YYYY-MM-DD')                                                                                         as completion_date,
-       education_elem -> 'svedObrProg' ->> 'naimFormaObuch'                                                          as education_form,
-       education_elem -> 'svedObrProg' ->> 'dataNachObuch'                                                           as education_program_start_date,
-       to_date(education_elem -> 'extend' ->> 'dataNachObuch', 'YYYY-MM-DD')                                         as education_start_date,
-       to_date(coalesce(education_elem -> 'svedObrProg' ->> 'planDataOkonch', education_elem -&gt;&gt; 'dataOzhid'),
-               'YYYY-MM-DD')                                                                                         as planned_completion_date,
-       education_elem -> 'svedObrProg' -> 'svedSpeczMinobr' ->> 'kodSpecz'                                           as minobr_speciality_code,
-       education_elem -> 'svedObrProg' -> 'svedSpeczMinprosv' ->> 'kodSpecz'                                         as minprosv_speciality_code,
-       coalesce(education_elem ->> 'svedVosst' &lt;&gt; 'null', false)                                                     as recovery_info,
-       to_date(education_elem -> 'svedVosst' ->> 'dataVosst', 'YYYY-MM-DD')                                          as recovery_date,
-       to_date(education_elem -> 'svedVosst' ->> 'dataPrikazVosst',
-               'YYYY-MM-DD')                                                                                         as recovery_order_date,
-       education_elem -> 'svedVosst' ->> 'nomPrikazVosst'                                                            as recovery_order_number,
-       coalesce(education_elem ->> 'svedOtchisl' &lt;&gt; 'null', false)                                                   as expulsion_info,
-       to_date(education_elem -> 'svedOtchisl' ->> 'dataOtchisl', 'YYYY-MM-DD')                                      as expulsion_date,
-       to_date(education_elem -> 'svedOtchisl' ->> 'dataPrikazOtchisl',
-               'YYYY-MM-DD')                                                                                         as expulsion_order_date,
-       education_elem -> 'svedOtchisl' ->> 'nomPrikazOtchisl'                                                        as expulsion_order_number,
-       coalesce(education_elem ->> 'svedOtpusk' &lt;&gt; 'null', false)                                                    as academical_leave_info,
-       coalesce(education_elem ->> 'prPervObuch' = '1', false)                                                       as first_education,
-       coalesce(education_elem -> 'svedObrProg' ->> 'prVUSpecz' = '1', false)                                        as vus_spec,
-       coalesce(education_elem ->> 'svedVoenObuch' &lt;&gt; 'null', false)                                                 as military_center_education_info,
-       to_date(education_elem -> 'svedVoenObuch' ->> 'dataNach', 'YYYY-MM-DD')                                       as military_center_education_start_date,
-       to_date(education_elem -> 'svedVoenObuch' ->> 'dataOkonch',
-               'YYYY-MM-DD')                                                                                         as military_center_education_end_date,
-       education_elem -> 'svedVoenObuch' -> 'extend' ->> 'srokObuch'                                                 as military_center_education_period,
-       coalesce(education_elem -> 'svedVoenObuch' -> 'extend' ->> 'svedUspeshZaverObuch' = '1',
-                false)                                                                                               as military_center_completion,
-       coalesce(education_elem -> 'extend' ->> 'svedVoenKaf' &lt;&gt; 'null', false)                                       as military_department_education_info,
-       to_date(education_elem -> 'extend' -> 'svedVoenKaf' ->> 'dataNach',
-               'YYYY-MM-DD')                                                                                         as military_department_start_date,
-       to_date(education_elem -> 'extend' -> 'svedVoenKaf' ->> 'dataOkonch',
-               'YYYY-MM-DD')                                                                                         as military_department_end_date,
-       to_date(academ_elem ->> 'dataNach', 'YYYY-MM-DD')                                                              as academ_start_date,
-       to_date(academ_elem ->> 'dataOkonch', 'YYYY-MM-DD')                                                            as academ_end_date,
-       academ_elem -> 'naimPrichOtpusk'                                                                              as academ_reason
-FROM filteredData fd
-ORDER BY source_id;</sql>
-    <variables_active>Y</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>432</xloc>
-      <yloc>432</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>education_leave_output</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <fields>
-      <field>
-        <column_name>start_date</column_name>
-        <stream_name>academ_start_date</stream_name>
-      </field>
-      <field>
-        <column_name>end_date</column_name>
-        <stream_name>academ_end_date</stream_name>
-      </field>
-      <field>
-        <column_name>reason</column_name>
-        <stream_name>academ_reason</stream_name>
-      </field>
-      <field>
-        <column_name>citizen_education_source_id</column_name>
-        <stream_name>source_id</stream_name>
-      </field>
-    </fields>
-    <ignore_errors>N</ignore_errors>
-    <only_when_have_rows>N</only_when_have_rows>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <return_keys>N</return_keys>
-    <schema>ervu_dashboard</schema>
-    <specify_fields>Y</specify_fields>
-    <table>educational_leave</table>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_in_table>Y</tablename_in_table>
-    <truncate>N</truncate>
-    <use_batch>Y</use_batch>
-    <attributes/>
-    <GUI>
-      <xloc>1088</xloc>
-      <yloc>640</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-    <error>
-      <source_transform>citizen_education_output</source_transform>
-      <target_transform>Change job status on error</target_transform>
-      <is_enabled>Y</is_enabled>
-      <nr_valuename/>
-      <descriptions_valuename>error_description</descriptions_valuename>
-      <fields_valuename/>
-      <codes_valuename/>
-      <max_errors/>
-      <max_pct_errors/>
-      <min_pct_rows/>
-    </error>
-    <error>
-      <source_transform>education_leave_output</source_transform>
-      <target_transform>Change job status on error</target_transform>
-      <is_enabled>Y</is_enabled>
-      <nr_valuename/>
-      <descriptions_valuename>error_description</descriptions_valuename>
-      <fields_valuename/>
-      <codes_valuename/>
-      <max_errors/>
-      <max_pct_errors/>
-      <min_pct_rows/>
-    </error>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow_delta.hpl b/mappings/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow_delta.hpl
deleted file mode 100644
index cb2ca00..0000000
--- a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow_delta.hpl
+++ /dev/null
@@ -1,1028 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>citizen_education_flow_delta</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/08/28 21:27:15.946</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/08/28 21:27:15.946</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>Block until transforms finish</from>
-      <to>education_leave_output</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Create job execution record</from>
-      <to>education_input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Filter rows</from>
-      <to>Change job status on success</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Filter_null_parental_leave_dates</from>
-      <to>Block until transforms finish</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Group by</from>
-      <to>citizen_education_output</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Filter_null_parental_leave_dates</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Group by</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>citizen_education_output</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>citizen_education_output</from>
-      <to>Filter rows</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>education_input</from>
-      <to>Identify last row in a stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>education_leave_output</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Detect empty stream</from>
-      <to>Change job status on success</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>Abort</name>
-    <type>Abort</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <abort_option>ABORT</abort_option>
-    <always_log_rows>Y</always_log_rows>
-    <row_threshold>0</row_threshold>
-    <attributes/>
-    <GUI>
-      <xloc>1696</xloc>
-      <yloc>672</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Block until transforms finish</name>
-    <type>BlockUntilTransformsFinish</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <transforms>
-      <transform>
-        <name>citizen_education_output</name>
-      </transform>
-    </transforms>
-    <attributes/>
-    <GUI>
-      <xloc>1088</xloc>
-      <yloc>672</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Change job status on error</name>
-    <type>ExecSql</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <arguments>
-      <argument>
-        <name>error_description</name>
-      </argument>
-    </arguments>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>Y</execute_each_row>
-    <quoteString>N</quoteString>
-    <replace_variables>Y</replace_variables>
-    <set_params>Y</set_params>
-    <single_statement>N</single_statement>
-    <sql>UPDATE etl.job_execution
-SET status = 'ERROR',
-    error_description = ?
-WHERE job_name = '${JOB_NAME}' 
-and recruitment_id = '${IDM_ID}';
-
-</sql>
-    <attributes/>
-    <GUI>
-      <xloc>1472</xloc>
-      <yloc>672</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Change job status on success</name>
-    <type>ExecSql</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <arguments>
-</arguments>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>Y</execute_each_row>
-    <quoteString>N</quoteString>
-    <replace_variables>Y</replace_variables>
-    <set_params>N</set_params>
-    <single_statement>N</single_statement>
-    <sql>UPDATE etl.job_execution
-SET status = 'DELTA_SUCCESS'
-WHERE job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';
-
-</sql>
-    <attributes/>
-    <GUI>
-      <xloc>1696</xloc>
-      <yloc>288</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Create job execution record</name>
-    <type>ExecSql</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <arguments>
-</arguments>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <quoteString>N</quoteString>
-    <replace_variables>Y</replace_variables>
-    <set_params>N</set_params>
-    <single_statement>N</single_statement>
-    <sql>UPDATE etl.job_execution  
-SET
-    status = 'DELTA_PROCESSING',
-    execution_datetime = current_timestamp,
-    error_description = NULL
-where job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';</sql>
-    <attributes/>
-    <GUI>
-      <xloc>416</xloc>
-      <yloc>464</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Detect empty stream</name>
-    <type>DetectEmptyStream</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <attributes/>
-    <GUI>
-      <xloc>832</xloc>
-      <yloc>288</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Filter rows</name>
-    <type>FilterRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <compare>
-      <condition>
-        <conditions>
-</conditions>
-        <function>=</function>
-        <leftvalue>last_row</leftvalue>
-        <negated>N</negated>
-        <operator>-</operator>
-        <value>
-          <isnull>N</isnull>
-          <length>-1</length>
-          <name>constant</name>
-          <precision>-1</precision>
-          <text>Y</text>
-          <type>Boolean</type>
-        </value>
-      </condition>
-    </compare>
-    <send_true_to>Change job status on success</send_true_to>
-    <attributes/>
-    <GUI>
-      <xloc>1696</xloc>
-      <yloc>464</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Filter_null_parental_leave_dates</name>
-    <type>FilterRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <compare>
-      <condition>
-        <conditions>
-</conditions>
-        <function>IS NOT NULL</function>
-        <leftvalue>academ_reason</leftvalue>
-        <negated>N</negated>
-        <operator>-</operator>
-      </condition>
-    </compare>
-    <send_true_to>Block until transforms finish</send_true_to>
-    <attributes/>
-    <GUI>
-      <xloc>832</xloc>
-      <yloc>672</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Group by</name>
-    <type>GroupBy</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <add_linenr>N</add_linenr>
-    <all_rows>N</all_rows>
-    <directory>${java.io.tmpdir}</directory>
-    <fields>
-      <field>
-        <aggregate>recruit_id</aggregate>
-        <subject>recruit_id</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>source_update_date</aggregate>
-        <subject>source_update_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>educational_institution_type</aggregate>
-        <subject>educational_institution_type</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>org_type</aggregate>
-        <subject>org_type</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>inn</aggregate>
-        <subject>inn</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>kpp</aggregate>
-        <subject>kpp</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>ogrn</aggregate>
-        <subject>ogrn</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>educational_institution_address</aggregate>
-        <subject>educational_institution_address</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>educational_institution_address_1</aggregate>
-        <subject>educational_institution_address_1</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>educational_organization_separate_unit_type</aggregate>
-        <subject>educational_organization_separate_unit_type</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>educational_organization_separate_unit_address</aggregate>
-        <subject>educational_organization_separate_unit_address</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>student_status</aggregate>
-        <subject>student_status</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>grade_number</aggregate>
-        <subject>grade_number</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>education_level_code</aggregate>
-        <subject>education_level_code</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>admission_date</aggregate>
-        <subject>admission_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>enrollment_date</aggregate>
-        <subject>enrollment_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>enrollment_order_number</aggregate>
-        <subject>enrollment_order_number</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>enrollment_order_date</aggregate>
-        <subject>enrollment_order_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>completion_date</aggregate>
-        <subject>completion_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>education_form</aggregate>
-        <subject>education_form</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>education_program_start_date</aggregate>
-        <subject>education_program_start_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>education_start_date</aggregate>
-        <subject>education_start_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>planned_completion_date</aggregate>
-        <subject>planned_completion_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>minobr_speciality_code</aggregate>
-        <subject>minobr_speciality_code</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>minprosv_speciality_code</aggregate>
-        <subject>minprosv_speciality_code</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>recovery_info</aggregate>
-        <subject>recovery_info</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>recovery_date</aggregate>
-        <subject>recovery_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>recovery_order_date</aggregate>
-        <subject>recovery_order_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>recovery_order_number</aggregate>
-        <subject>recovery_order_number</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>expulsion_info</aggregate>
-        <subject>expulsion_info</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>expulsion_date</aggregate>
-        <subject>expulsion_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>expulsion_order_date</aggregate>
-        <subject>expulsion_order_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>expulsion_order_number</aggregate>
-        <subject>expulsion_order_number</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>academical_leave_info</aggregate>
-        <subject>academical_leave_info</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>first_education</aggregate>
-        <subject>first_education</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>vus_spec</aggregate>
-        <subject>vus_spec</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_center_education_info</aggregate>
-        <subject>military_center_education_info</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_center_education_start_date</aggregate>
-        <subject>military_center_education_start_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_center_education_end_date</aggregate>
-        <subject>military_center_education_end_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_center_education_period</aggregate>
-        <subject>military_center_education_period</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_center_completion</aggregate>
-        <subject>military_center_completion</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_department_education_info</aggregate>
-        <subject>military_department_education_info</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_department_start_date</aggregate>
-        <subject>military_department_start_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_department_end_date</aggregate>
-        <subject>military_department_end_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>last_row</aggregate>
-        <subject>last_row</subject>
-        <type>LAST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>academ_start_date</aggregate>
-        <subject>academ_start_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>academ_end_date</aggregate>
-        <subject>academ_end_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>academ_reason</aggregate>
-        <subject>academ_reason</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-    </fields>
-    <give_back_row>N</give_back_row>
-    <group>
-      <field>
-        <name>source_id</name>
-      </field>
-    </group>
-    <ignore_aggregate>N</ignore_aggregate>
-    <prefix>grp</prefix>
-    <attributes/>
-    <GUI>
-      <xloc>1152</xloc>
-      <yloc>464</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Identify last row in a stream</name>
-    <type>DetectLastRow</type>
-    <description/>
-    <distribute>N</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <resultfieldname>last_row</resultfieldname>
-    <attributes/>
-    <GUI>
-      <xloc>832</xloc>
-      <yloc>464</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>citizen_education_output</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <fields>
-      <field>
-        <column_name>source_id</column_name>
-        <stream_name>source_id</stream_name>
-      </field>
-      <field>
-        <column_name>recruit_id</column_name>
-        <stream_name>recruit_id</stream_name>
-      </field>
-      <field>
-        <column_name>source_update_date</column_name>
-        <stream_name>source_update_date</stream_name>
-      </field>
-      <field>
-        <column_name>educational_institution_type</column_name>
-        <stream_name>educational_institution_type</stream_name>
-      </field>
-      <field>
-        <column_name>org_type</column_name>
-        <stream_name>org_type</stream_name>
-      </field>
-      <field>
-        <column_name>inn</column_name>
-        <stream_name>inn</stream_name>
-      </field>
-      <field>
-        <column_name>kpp</column_name>
-        <stream_name>kpp</stream_name>
-      </field>
-      <field>
-        <column_name>ogrn</column_name>
-        <stream_name>ogrn</stream_name>
-      </field>
-      <field>
-        <column_name>educational_institution_address</column_name>
-        <stream_name>educational_institution_address</stream_name>
-      </field>
-      <field>
-        <column_name>educational_institution_address_1</column_name>
-        <stream_name>educational_institution_address_1</stream_name>
-      </field>
-      <field>
-        <column_name>educational_organization_separate_unit_type</column_name>
-        <stream_name>educational_organization_separate_unit_type</stream_name>
-      </field>
-      <field>
-        <column_name>educational_organization_separate_unit_address</column_name>
-        <stream_name>educational_organization_separate_unit_address</stream_name>
-      </field>
-      <field>
-        <column_name>student_status</column_name>
-        <stream_name>student_status</stream_name>
-      </field>
-      <field>
-        <column_name>grade_number</column_name>
-        <stream_name>grade_number</stream_name>
-      </field>
-      <field>
-        <column_name>education_level_code</column_name>
-        <stream_name>education_level_code</stream_name>
-      </field>
-      <field>
-        <column_name>admission_date</column_name>
-        <stream_name>admission_date</stream_name>
-      </field>
-      <field>
-        <column_name>enrollment_date</column_name>
-        <stream_name>enrollment_date</stream_name>
-      </field>
-      <field>
-        <column_name>enrollment_order_number</column_name>
-        <stream_name>enrollment_order_number</stream_name>
-      </field>
-      <field>
-        <column_name>enrollment_order_date</column_name>
-        <stream_name>enrollment_order_date</stream_name>
-      </field>
-      <field>
-        <column_name>completion_date</column_name>
-        <stream_name>completion_date</stream_name>
-      </field>
-      <field>
-        <column_name>education_form</column_name>
-        <stream_name>education_form</stream_name>
-      </field>
-      <field>
-        <column_name>education_program_start_date</column_name>
-        <stream_name>education_program_start_date</stream_name>
-      </field>
-      <field>
-        <column_name>education_start_date</column_name>
-        <stream_name>education_start_date</stream_name>
-      </field>
-      <field>
-        <column_name>planned_completion_date</column_name>
-        <stream_name>planned_completion_date</stream_name>
-      </field>
-      <field>
-        <column_name>minobr_speciality_code</column_name>
-        <stream_name>minobr_speciality_code</stream_name>
-      </field>
-      <field>
-        <column_name>minprosv_speciality_code</column_name>
-        <stream_name>minprosv_speciality_code</stream_name>
-      </field>
-      <field>
-        <column_name>recovery_info</column_name>
-        <stream_name>recovery_info</stream_name>
-      </field>
-      <field>
-        <column_name>recovery_date</column_name>
-        <stream_name>recovery_date</stream_name>
-      </field>
-      <field>
-        <column_name>recovery_order_date</column_name>
-        <stream_name>recovery_order_date</stream_name>
-      </field>
-      <field>
-        <column_name>recovery_order_number</column_name>
-        <stream_name>recovery_order_number</stream_name>
-      </field>
-      <field>
-        <column_name>expulsion_info</column_name>
-        <stream_name>expulsion_info</stream_name>
-      </field>
-      <field>
-        <column_name>expulsion_date</column_name>
-        <stream_name>expulsion_date</stream_name>
-      </field>
-      <field>
-        <column_name>expulsion_order_date</column_name>
-        <stream_name>expulsion_order_date</stream_name>
-      </field>
-      <field>
-        <column_name>expulsion_order_number</column_name>
-        <stream_name>expulsion_order_number</stream_name>
-      </field>
-      <field>
-        <column_name>academical_leave_info</column_name>
-        <stream_name>academical_leave_info</stream_name>
-      </field>
-      <field>
-        <column_name>first_education</column_name>
-        <stream_name>first_education</stream_name>
-      </field>
-      <field>
-        <column_name>vus_spec</column_name>
-        <stream_name>vus_spec</stream_name>
-      </field>
-      <field>
-        <column_name>military_center_education_info</column_name>
-        <stream_name>military_center_education_info</stream_name>
-      </field>
-      <field>
-        <column_name>military_center_education_start_date</column_name>
-        <stream_name>military_center_education_start_date</stream_name>
-      </field>
-      <field>
-        <column_name>military_center_education_end_date</column_name>
-        <stream_name>military_center_education_end_date</stream_name>
-      </field>
-      <field>
-        <column_name>military_center_education_period</column_name>
-        <stream_name>military_center_education_period</stream_name>
-      </field>
-      <field>
-        <column_name>military_center_completion</column_name>
-        <stream_name>military_center_completion</stream_name>
-      </field>
-      <field>
-        <column_name>military_department_education_info</column_name>
-        <stream_name>military_department_education_info</stream_name>
-      </field>
-      <field>
-        <column_name>military_department_start_date</column_name>
-        <stream_name>military_department_start_date</stream_name>
-      </field>
-      <field>
-        <column_name>military_department_end_date</column_name>
-        <stream_name>military_department_end_date</stream_name>
-      </field>
-    </fields>
-    <ignore_errors>N</ignore_errors>
-    <only_when_have_rows>N</only_when_have_rows>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <return_keys>N</return_keys>
-    <schema>ervu_dashboard</schema>
-    <specify_fields>Y</specify_fields>
-    <table>educational_institution_learning</table>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_in_table>Y</tablename_in_table>
-    <truncate>N</truncate>
-    <use_batch>Y</use_batch>
-    <attributes/>
-    <GUI>
-      <xloc>1472</xloc>
-      <yloc>464</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>education_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             education_elem,
-                             academ_elem,
-                             'Образовательная организация высшего образования' as educational_institution_type
-                      FROM recruits_info ri
-                               CROSS JOIN LATERAL jsonb_array_elements(
-                              ri.info -> 'svedFL' -> 'svedVUZ' -> 'vuz') AS education_elem
-                               LEFT JOIN LATERAL jsonb_array_elements(
-                              CASE
-                                  WHEN jsonb_typeof(education_elem -> 'svedOtpusk') = 'array'
-                                      THEN education_elem -> 'svedOtpusk'
-                                  ELSE '[]'::jsonb
-                                  END
-                                                 ) AS academ_elem ON true
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedVUZ' -> 'vuz') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-                        AND to_date(education_elem ->> 'dataSved', 'YYYY-MM-DD') > '${MAX_SOURCE_UPDATE_DATE}'
-
-                      union all
-
-                      SELECT ri.recruit_id,
-                             education_elem,
-                             academ_elem,
-                             'Профессиональная образовательная организация' as educational_institution_type
-                      FROM recruits_info ri
-                               CROSS JOIN LATERAL jsonb_array_elements(
-                              ri.info -> 'svedFL' -> 'svedKolledzh' -> 'kolledzh') AS education_elem
-                               LEFT JOIN LATERAL jsonb_array_elements(
-                              CASE
-                                  WHEN jsonb_typeof(education_elem -> 'svedOtpusk') = 'array'
-                                      THEN education_elem -> 'svedOtpusk'
-                                  ELSE '[]'::jsonb
-                                  END
-                                                 ) AS academ_elem ON true
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedKolledzh' -> 'kolledzh') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-                        AND to_date(education_elem ->> 'dataSved', 'YYYY-MM-DD') > '${MAX_SOURCE_UPDATE_DATE}'
-
-                      union all
-
-                      SELECT ri.recruit_id,
-                             education_elem,
-                             academ_elem,
-                             'Общеобразовательная организация' as educational_institution_type
-                      FROM recruits_info ri
-                               CROSS JOIN LATERAL jsonb_array_elements(
-                              ri.info -> 'svedFL' -> 'svedSHkola' -> 'shkola') AS education_elem
-                               LEFT JOIN LATERAL jsonb_array_elements(
-                              CASE
-                                  WHEN jsonb_typeof(education_elem -> 'svedOtpusk') = 'array'
-                                      THEN education_elem -> 'svedOtpusk'
-                                  ELSE '[]'::jsonb
-                                  END
-                                                 ) AS academ_elem ON true
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedSHkola' -> 'shkola') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-                        AND to_date(education_elem ->> 'dataSved', 'YYYY-MM-DD') > '${MAX_SOURCE_UPDATE_DATE}'
-)
-SELECT fd.recruit_id,
-       education_elem ->> 'id'                                                                        AS source_id,
-       education_elem ->> 'dataSved'                                                                  as source_update_date,
-       educational_institution_type,
-       education_elem -> 'svedOrg' ->> 'naimTipOrg'                                                   as org_type,
-       education_elem -> 'svedOrg' ->> 'inn'                                                          as inn,
-       education_elem -> 'svedOrg' ->> 'kpp'                                                          as kpp,
-       coalesce(education_elem -> 'svedOrg' ->> 'ogrn', education_elem -> 'svedOrg' ->> 'ogrnip')     as ogrn,
-       education_elem -> 'svedOrg' ->> 'adresOrg'                                                     as educational_institution_address,
-       education_elem -> 'svedOrg' -> 'extend' ->> 'statusOrg'                                        as educational_institution_address,
-       education_elem -> 'svedOrg' -> 'extend' ->> 'vidPodrazdOrg'                                    as educational_organization_separate_unit_type,
-       education_elem -> 'svedOrg' -> 'extend' ->> 'adresPodrazdOrg'                                  as educational_organization_separate_unit_address,
-       education_elem ->> 'naimStatus'                                                                as student_status,
-       case
-           when educational_institution_type = 'Образовательная организация высшего образования'
-               then education_elem ->> 'nomerKursa'
-           when educational_institution_type = 'Профессиональная образовательная организация'
-               then education_elem -> 'extend' ->> 'klass'
-           when educational_institution_type = 'Общеобразовательная организация' then education_elem ->> 'klass'
-           end                                                                                        as grade_number,
-       education_elem ->> 'kodUrovObr'                                                                as education_level_code,
-       coalesce(education_elem -> 'extend' ->> 'dataPostup', education_elem ->> 'dataPostup')         as admission_date,
-       education_elem ->> 'dataZachisl'                                                               as enrollment_date,
-       education_elem ->> 'nomPrikazZachisl'                                                          as enrollment_order_number,
-       education_elem ->> 'dataPrikazZachisl'                                                         as enrollment_order_date,
-       coalesce(education_elem -> 'extend' ->> 'dataZavershObuch', education_elem ->> 'dataOkonch')   as completion_date,
-       education_elem -> 'svedObrProg' ->> 'naimFormaObuch'                                           as education_form,
-       education_elem -> 'svedObrProg' ->> 'dataNachObuch'                                            as education_program_start_date,
-       education_elem -> 'extend' ->> 'dataNachObuch'                                                 as education_start_date,
-       coalesce(education_elem -> 'svedObrProg' ->> 'planDataOkonch', education_elem ->>'dataOzhid')  as planned_completion_date,
-       education_elem -> 'svedObrProg' -> 'svedSpeczMinobr' ->> 'kodSpecz'                            as minobr_speciality_code,
-       education_elem -> 'svedObrProg' -> 'svedSpeczMinprosv' ->> 'kodSpecz'                          as minprosv_speciality_code,
-       education_elem ->> 'svedVosst' != 'null'                                                       as recovery_info,
-       education_elem -> 'svedVosst' ->> 'dataVosst'                                                  as recovery_date,
-       education_elem -> 'svedVosst' ->> 'dataPrikazVosst'                                            as recovery_order_date,
-       education_elem -> 'svedVosst' ->> 'nomPrikazVosst'                                             as recovery_order_number,
-       education_elem ->> 'svedOtchisl' != 'null'                                                     as expulsion_info,
-       education_elem -> 'svedOtchisl' ->> 'dataOtchisl'                                              as expulsion_date,
-       education_elem -> 'svedOtchisl' ->> 'dataPrikazOtchisl'                                        as expulsion_order_date,
-       education_elem -> 'svedOtchisl' ->> 'nomPrikazOtchisl'                                         as expulsion_order_number,
-       education_elem ->> 'svedOtpusk' != 'null'                                                      as academical_leave_info,
-       education_elem ->> 'prPervObuch' = '1'                                                         as first_education,
-       education_elem -> 'svedObrProg' ->> 'prVUSpecz' = '1'                                          as vus_spec,
-       education_elem -> 'svedVoenObuch' != 'null'                                                    as military_center_education_info,
-       education_elem -> 'svedVoenObuch' ->> 'dataNach'                                               as military_center_education_start_date,
-       education_elem -> 'svedVoenObuch' ->> 'dataOkonch'                                             as military_center_education_end_date,
-       education_elem -> 'svedVoenObuch' -> 'extend' ->> 'srokObuch'                                  as military_center_education_period,
-       education_elem -> 'svedVoenObuch' -> 'extend' ->> 'svedUspeshZaverObuch' ='1'                  as military_center_completion,
-       education_elem -> 'extend' ->> 'svedVoenKaf' != 'null'                                         as military_department_education_info,
-       education_elem -> 'extend' -> 'svedVoenKaf' ->> 'dataNach'                                     as military_department_start_date,
-       education_elem -> 'extend' -> 'svedVoenKaf' ->> 'dataOkonch'                                   as military_department_end_date,
-       academ_elem -> 'dataNach'                                                                      as academ_start_date,
-       academ_elem -> 'dataOkonch'                                                                    as academ_end_date,
-       academ_elem -> 'naimPrichOtpusk'                                                               as academ_reason
-FROM filteredData fd
-ORDER BY source_id;</sql>
-    <variables_active>Y</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>640</xloc>
-      <yloc>464</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>education_leave_output</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <fields>
-      <field>
-        <column_name>start_date</column_name>
-        <stream_name>academ_start_date</stream_name>
-      </field>
-      <field>
-        <column_name>end_date</column_name>
-        <stream_name>academ_end_date</stream_name>
-      </field>
-      <field>
-        <column_name>reason</column_name>
-        <stream_name>academ_reason</stream_name>
-      </field>
-      <field>
-        <column_name>citizen_education_source_id</column_name>
-        <stream_name>source_id</stream_name>
-      </field>
-    </fields>
-    <ignore_errors>N</ignore_errors>
-    <only_when_have_rows>N</only_when_have_rows>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <return_keys>N</return_keys>
-    <schema>ervu_dashboard</schema>
-    <specify_fields>Y</specify_fields>
-    <table>educational_leave</table>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_in_table>Y</tablename_in_table>
-    <truncate>N</truncate>
-    <use_batch>Y</use_batch>
-    <attributes/>
-    <GUI>
-      <xloc>1296</xloc>
-      <yloc>672</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-    <error>
-      <source_transform>citizen_education_output</source_transform>
-      <target_transform>Change job status on error</target_transform>
-      <is_enabled>Y</is_enabled>
-      <nr_valuename/>
-      <descriptions_valuename>error_description</descriptions_valuename>
-      <fields_valuename/>
-      <codes_valuename/>
-      <max_errors/>
-      <max_pct_errors/>
-      <min_pct_rows/>
-    </error>
-    <error>
-      <source_transform>education_leave_output</source_transform>
-      <target_transform>Change job status on error</target_transform>
-      <is_enabled>Y</is_enabled>
-      <nr_valuename/>
-      <descriptions_valuename>error_description</descriptions_valuename>
-      <fields_valuename/>
-      <codes_valuename/>
-      <max_errors/>
-      <max_pct_errors/>
-      <min_pct_rows/>
-    </error>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow_repeat.hpl
deleted file mode 100644
index 4dff655..0000000
--- a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow_repeat.hpl
+++ /dev/null
@@ -1,1025 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>citizen_education_flow_repeat</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/08/28 21:16:35.770</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/08/28 21:16:35.770</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>Block until transforms finish</from>
-      <to>education_leave_output</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Create job execution record</from>
-      <to>education_input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Filter rows</from>
-      <to>Change job status on success</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Filter_null_parental_leave_dates</from>
-      <to>Block until transforms finish</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Group by</from>
-      <to>citizen_education_output</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Filter_null_parental_leave_dates</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Group by</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>citizen_education_output</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>citizen_education_output</from>
-      <to>Filter rows</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>education_input</from>
-      <to>Identify last row in a stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>education_leave_output</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Detect empty stream</from>
-      <to>Change job status on success</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>Abort</name>
-    <type>Abort</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <abort_option>ABORT</abort_option>
-    <always_log_rows>Y</always_log_rows>
-    <row_threshold>0</row_threshold>
-    <attributes/>
-    <GUI>
-      <xloc>1536</xloc>
-      <yloc>704</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Block until transforms finish</name>
-    <type>BlockUntilTransformsFinish</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <transforms>
-      <transform>
-        <name>citizen_education_output</name>
-      </transform>
-    </transforms>
-    <attributes/>
-    <GUI>
-      <xloc>928</xloc>
-      <yloc>704</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Change job status on error</name>
-    <type>ExecSql</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <arguments>
-      <argument>
-        <name>error_description</name>
-      </argument>
-    </arguments>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>Y</execute_each_row>
-    <quoteString>N</quoteString>
-    <replace_variables>Y</replace_variables>
-    <set_params>Y</set_params>
-    <single_statement>N</single_statement>
-    <sql>UPDATE etl.job_execution
-SET status = 'ERROR',
-    error_description = ?
-WHERE job_name = '${JOB_NAME}' 
-and recruitment_id = '${IDM_ID}';
-
-</sql>
-    <attributes/>
-    <GUI>
-      <xloc>1312</xloc>
-      <yloc>704</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Change job status on success</name>
-    <type>ExecSql</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <arguments>
-</arguments>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>Y</execute_each_row>
-    <quoteString>N</quoteString>
-    <replace_variables>Y</replace_variables>
-    <set_params>N</set_params>
-    <single_statement>N</single_statement>
-    <sql>UPDATE etl.job_execution
-SET status = 'SUCCESS'
-WHERE job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';
-
-</sql>
-    <attributes/>
-    <GUI>
-      <xloc>1552</xloc>
-      <yloc>320</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Create job execution record</name>
-    <type>ExecSql</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <arguments>
-</arguments>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <quoteString>N</quoteString>
-    <replace_variables>Y</replace_variables>
-    <set_params>N</set_params>
-    <single_statement>N</single_statement>
-    <sql>INSERT INTO etl.job_execution (id, job_name, status, execution_datetime, error_description, recruitment_id)
-VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}')
-ON CONFLICT (job_name, recruitment_id)
-DO UPDATE
-SET status = 'PROCESSING',
-    error_description = null,
-    execution_datetime = current_timestamp;</sql>
-    <attributes/>
-    <GUI>
-      <xloc>256</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Detect empty stream</name>
-    <type>DetectEmptyStream</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <attributes/>
-    <GUI>
-      <xloc>672</xloc>
-      <yloc>320</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Filter rows</name>
-    <type>FilterRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <compare>
-      <condition>
-        <conditions>
-</conditions>
-        <function>=</function>
-        <leftvalue>last_row</leftvalue>
-        <negated>N</negated>
-        <operator>-</operator>
-        <value>
-          <isnull>N</isnull>
-          <length>-1</length>
-          <name>constant</name>
-          <precision>-1</precision>
-          <text>Y</text>
-          <type>Boolean</type>
-        </value>
-      </condition>
-    </compare>
-    <send_true_to>Change job status on success</send_true_to>
-    <attributes/>
-    <GUI>
-      <xloc>1552</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Filter_null_parental_leave_dates</name>
-    <type>FilterRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <compare>
-      <condition>
-        <conditions>
-</conditions>
-        <function>IS NOT NULL</function>
-        <leftvalue>academ_reason</leftvalue>
-        <negated>N</negated>
-        <operator>-</operator>
-      </condition>
-    </compare>
-    <send_true_to>Block until transforms finish</send_true_to>
-    <attributes/>
-    <GUI>
-      <xloc>672</xloc>
-      <yloc>704</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Group by</name>
-    <type>GroupBy</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <add_linenr>N</add_linenr>
-    <all_rows>N</all_rows>
-    <directory>${java.io.tmpdir}</directory>
-    <fields>
-      <field>
-        <aggregate>recruit_id</aggregate>
-        <subject>recruit_id</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>source_update_date</aggregate>
-        <subject>source_update_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>educational_institution_type</aggregate>
-        <subject>educational_institution_type</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>org_type</aggregate>
-        <subject>org_type</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>inn</aggregate>
-        <subject>inn</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>kpp</aggregate>
-        <subject>kpp</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>ogrn</aggregate>
-        <subject>ogrn</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>educational_institution_address</aggregate>
-        <subject>educational_institution_address</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>educational_institution_address_1</aggregate>
-        <subject>educational_institution_address_1</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>educational_organization_separate_unit_type</aggregate>
-        <subject>educational_organization_separate_unit_type</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>educational_organization_separate_unit_address</aggregate>
-        <subject>educational_organization_separate_unit_address</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>student_status</aggregate>
-        <subject>student_status</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>grade_number</aggregate>
-        <subject>grade_number</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>education_level_code</aggregate>
-        <subject>education_level_code</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>admission_date</aggregate>
-        <subject>admission_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>enrollment_date</aggregate>
-        <subject>enrollment_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>enrollment_order_number</aggregate>
-        <subject>enrollment_order_number</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>enrollment_order_date</aggregate>
-        <subject>enrollment_order_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>completion_date</aggregate>
-        <subject>completion_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>education_form</aggregate>
-        <subject>education_form</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>education_program_start_date</aggregate>
-        <subject>education_program_start_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>education_start_date</aggregate>
-        <subject>education_start_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>planned_completion_date</aggregate>
-        <subject>planned_completion_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>minobr_speciality_code</aggregate>
-        <subject>minobr_speciality_code</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>minprosv_speciality_code</aggregate>
-        <subject>minprosv_speciality_code</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>recovery_info</aggregate>
-        <subject>recovery_info</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>recovery_date</aggregate>
-        <subject>recovery_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>recovery_order_date</aggregate>
-        <subject>recovery_order_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>recovery_order_number</aggregate>
-        <subject>recovery_order_number</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>expulsion_info</aggregate>
-        <subject>expulsion_info</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>expulsion_date</aggregate>
-        <subject>expulsion_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>expulsion_order_date</aggregate>
-        <subject>expulsion_order_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>expulsion_order_number</aggregate>
-        <subject>expulsion_order_number</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>academical_leave_info</aggregate>
-        <subject>academical_leave_info</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>first_education</aggregate>
-        <subject>first_education</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>vus_spec</aggregate>
-        <subject>vus_spec</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_center_education_info</aggregate>
-        <subject>military_center_education_info</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_center_education_start_date</aggregate>
-        <subject>military_center_education_start_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_center_education_end_date</aggregate>
-        <subject>military_center_education_end_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_center_education_period</aggregate>
-        <subject>military_center_education_period</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_center_completion</aggregate>
-        <subject>military_center_completion</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_department_education_info</aggregate>
-        <subject>military_department_education_info</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_department_start_date</aggregate>
-        <subject>military_department_start_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>military_department_end_date</aggregate>
-        <subject>military_department_end_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>last_row</aggregate>
-        <subject>last_row</subject>
-        <type>LAST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>academ_start_date</aggregate>
-        <subject>academ_start_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>academ_end_date</aggregate>
-        <subject>academ_end_date</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-      <field>
-        <aggregate>academ_reason</aggregate>
-        <subject>academ_reason</subject>
-        <type>FIRST_INCL_NULL</type>
-      </field>
-    </fields>
-    <give_back_row>N</give_back_row>
-    <group>
-      <field>
-        <name>source_id</name>
-      </field>
-    </group>
-    <ignore_aggregate>N</ignore_aggregate>
-    <prefix>grp</prefix>
-    <attributes/>
-    <GUI>
-      <xloc>992</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Identify last row in a stream</name>
-    <type>DetectLastRow</type>
-    <description/>
-    <distribute>N</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <resultfieldname>last_row</resultfieldname>
-    <attributes/>
-    <GUI>
-      <xloc>672</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>citizen_education_output</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <fields>
-      <field>
-        <column_name>source_id</column_name>
-        <stream_name>source_id</stream_name>
-      </field>
-      <field>
-        <column_name>recruit_id</column_name>
-        <stream_name>recruit_id</stream_name>
-      </field>
-      <field>
-        <column_name>source_update_date</column_name>
-        <stream_name>source_update_date</stream_name>
-      </field>
-      <field>
-        <column_name>educational_institution_type</column_name>
-        <stream_name>educational_institution_type</stream_name>
-      </field>
-      <field>
-        <column_name>org_type</column_name>
-        <stream_name>org_type</stream_name>
-      </field>
-      <field>
-        <column_name>inn</column_name>
-        <stream_name>inn</stream_name>
-      </field>
-      <field>
-        <column_name>kpp</column_name>
-        <stream_name>kpp</stream_name>
-      </field>
-      <field>
-        <column_name>ogrn</column_name>
-        <stream_name>ogrn</stream_name>
-      </field>
-      <field>
-        <column_name>educational_institution_address</column_name>
-        <stream_name>educational_institution_address</stream_name>
-      </field>
-      <field>
-        <column_name>educational_institution_address_1</column_name>
-        <stream_name>educational_institution_address_1</stream_name>
-      </field>
-      <field>
-        <column_name>educational_organization_separate_unit_type</column_name>
-        <stream_name>educational_organization_separate_unit_type</stream_name>
-      </field>
-      <field>
-        <column_name>educational_organization_separate_unit_address</column_name>
-        <stream_name>educational_organization_separate_unit_address</stream_name>
-      </field>
-      <field>
-        <column_name>student_status</column_name>
-        <stream_name>student_status</stream_name>
-      </field>
-      <field>
-        <column_name>grade_number</column_name>
-        <stream_name>grade_number</stream_name>
-      </field>
-      <field>
-        <column_name>education_level_code</column_name>
-        <stream_name>education_level_code</stream_name>
-      </field>
-      <field>
-        <column_name>admission_date</column_name>
-        <stream_name>admission_date</stream_name>
-      </field>
-      <field>
-        <column_name>enrollment_date</column_name>
-        <stream_name>enrollment_date</stream_name>
-      </field>
-      <field>
-        <column_name>enrollment_order_number</column_name>
-        <stream_name>enrollment_order_number</stream_name>
-      </field>
-      <field>
-        <column_name>enrollment_order_date</column_name>
-        <stream_name>enrollment_order_date</stream_name>
-      </field>
-      <field>
-        <column_name>completion_date</column_name>
-        <stream_name>completion_date</stream_name>
-      </field>
-      <field>
-        <column_name>education_form</column_name>
-        <stream_name>education_form</stream_name>
-      </field>
-      <field>
-        <column_name>education_program_start_date</column_name>
-        <stream_name>education_program_start_date</stream_name>
-      </field>
-      <field>
-        <column_name>education_start_date</column_name>
-        <stream_name>education_start_date</stream_name>
-      </field>
-      <field>
-        <column_name>planned_completion_date</column_name>
-        <stream_name>planned_completion_date</stream_name>
-      </field>
-      <field>
-        <column_name>minobr_speciality_code</column_name>
-        <stream_name>minobr_speciality_code</stream_name>
-      </field>
-      <field>
-        <column_name>minprosv_speciality_code</column_name>
-        <stream_name>minprosv_speciality_code</stream_name>
-      </field>
-      <field>
-        <column_name>recovery_info</column_name>
-        <stream_name>recovery_info</stream_name>
-      </field>
-      <field>
-        <column_name>recovery_date</column_name>
-        <stream_name>recovery_date</stream_name>
-      </field>
-      <field>
-        <column_name>recovery_order_date</column_name>
-        <stream_name>recovery_order_date</stream_name>
-      </field>
-      <field>
-        <column_name>recovery_order_number</column_name>
-        <stream_name>recovery_order_number</stream_name>
-      </field>
-      <field>
-        <column_name>expulsion_info</column_name>
-        <stream_name>expulsion_info</stream_name>
-      </field>
-      <field>
-        <column_name>expulsion_date</column_name>
-        <stream_name>expulsion_date</stream_name>
-      </field>
-      <field>
-        <column_name>expulsion_order_date</column_name>
-        <stream_name>expulsion_order_date</stream_name>
-      </field>
-      <field>
-        <column_name>expulsion_order_number</column_name>
-        <stream_name>expulsion_order_number</stream_name>
-      </field>
-      <field>
-        <column_name>academical_leave_info</column_name>
-        <stream_name>academical_leave_info</stream_name>
-      </field>
-      <field>
-        <column_name>first_education</column_name>
-        <stream_name>first_education</stream_name>
-      </field>
-      <field>
-        <column_name>vus_spec</column_name>
-        <stream_name>vus_spec</stream_name>
-      </field>
-      <field>
-        <column_name>military_center_education_info</column_name>
-        <stream_name>military_center_education_info</stream_name>
-      </field>
-      <field>
-        <column_name>military_center_education_start_date</column_name>
-        <stream_name>military_center_education_start_date</stream_name>
-      </field>
-      <field>
-        <column_name>military_center_education_end_date</column_name>
-        <stream_name>military_center_education_end_date</stream_name>
-      </field>
-      <field>
-        <column_name>military_center_education_period</column_name>
-        <stream_name>military_center_education_period</stream_name>
-      </field>
-      <field>
-        <column_name>military_center_completion</column_name>
-        <stream_name>military_center_completion</stream_name>
-      </field>
-      <field>
-        <column_name>military_department_education_info</column_name>
-        <stream_name>military_department_education_info</stream_name>
-      </field>
-      <field>
-        <column_name>military_department_start_date</column_name>
-        <stream_name>military_department_start_date</stream_name>
-      </field>
-      <field>
-        <column_name>military_department_end_date</column_name>
-        <stream_name>military_department_end_date</stream_name>
-      </field>
-    </fields>
-    <ignore_errors>N</ignore_errors>
-    <only_when_have_rows>N</only_when_have_rows>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <return_keys>N</return_keys>
-    <schema>ervu_dashboard</schema>
-    <specify_fields>Y</specify_fields>
-    <table>educational_institution_learning</table>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_in_table>Y</tablename_in_table>
-    <truncate>N</truncate>
-    <use_batch>Y</use_batch>
-    <attributes/>
-    <GUI>
-      <xloc>1312</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>education_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             education_elem,
-                             academ_elem,
-                             'Образовательная организация высшего образования' as educational_institution_type
-                      FROM recruits_info ri
-                               CROSS JOIN LATERAL jsonb_array_elements(
-                              ri.info -> 'svedFL' -> 'svedVUZ' -> 'vuz') AS education_elem
-                               LEFT JOIN LATERAL jsonb_array_elements(
-                              CASE
-                                  WHEN jsonb_typeof(education_elem -> 'svedOtpusk') = 'array'
-                                      THEN education_elem -> 'svedOtpusk'
-                                  ELSE '[]'::jsonb
-                                  END
-                                                 ) AS academ_elem ON true
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedVUZ' -> 'vuz') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-
-                      union all
-
-                      SELECT ri.recruit_id,
-                             education_elem,
-                             academ_elem,
-                             'Профессиональная образовательная организация' as educational_institution_type
-                      FROM recruits_info ri
-                               CROSS JOIN LATERAL jsonb_array_elements(
-                              ri.info -> 'svedFL' -> 'svedKolledzh' -> 'kolledzh') AS education_elem
-                               LEFT JOIN LATERAL jsonb_array_elements(
-                              CASE
-                                  WHEN jsonb_typeof(education_elem -> 'svedOtpusk') = 'array'
-                                      THEN education_elem -> 'svedOtpusk'
-                                  ELSE '[]'::jsonb
-                                  END
-                                                 ) AS academ_elem ON true
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedKolledzh' -> 'kolledzh') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-
-                      union all
-
-                      SELECT ri.recruit_id,
-                             education_elem,
-                             academ_elem,
-                             'Общеобразовательная организация' as educational_institution_type
-                      FROM recruits_info ri
-                               CROSS JOIN LATERAL jsonb_array_elements(
-                              ri.info -> 'svedFL' -> 'svedSHkola' -> 'shkola') AS education_elem
-                               LEFT JOIN LATERAL jsonb_array_elements(
-                              CASE
-                                  WHEN jsonb_typeof(education_elem -> 'svedOtpusk') = 'array'
-                                      THEN education_elem -> 'svedOtpusk'
-                                  ELSE '[]'::jsonb
-                                  END
-                                                 ) AS academ_elem ON true
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedSHkola' -> 'shkola') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-                      )
-SELECT fd.recruit_id,
-       education_elem ->> 'id'                                                                        AS source_id,
-       education_elem ->> 'dataSved'                                                                  as source_update_date,
-       educational_institution_type,
-       education_elem -> 'svedOrg' ->> 'naimTipOrg'                                                   as org_type,
-       education_elem -> 'svedOrg' ->> 'inn'                                                          as inn,
-       education_elem -> 'svedOrg' ->> 'kpp'                                                          as kpp,
-       coalesce(education_elem -> 'svedOrg' ->> 'ogrn', education_elem -> 'svedOrg' ->> 'ogrnip')     as ogrn,
-       education_elem -> 'svedOrg' ->> 'adresOrg'                                                     as educational_institution_address,
-       education_elem -> 'svedOrg' -> 'extend' ->> 'statusOrg'                                        as educational_institution_address,
-       education_elem -> 'svedOrg' -> 'extend' ->> 'vidPodrazdOrg'                                    as educational_organization_separate_unit_type,
-       education_elem -> 'svedOrg' -> 'extend' ->> 'adresPodrazdOrg'                                  as educational_organization_separate_unit_address,
-       education_elem ->> 'naimStatus'                                                                as student_status,
-       case
-           when educational_institution_type = 'Образовательная организация высшего образования'
-               then education_elem ->> 'nomerKursa'
-           when educational_institution_type = 'Профессиональная образовательная организация'
-               then education_elem -> 'extend' ->> 'klass'
-           when educational_institution_type = 'Общеобразовательная организация' then education_elem ->> 'klass'
-           end                                                                                        as grade_number,
-       education_elem ->> 'kodUrovObr'                                                                as education_level_code,
-       coalesce(education_elem -> 'extend' ->> 'dataPostup', education_elem ->> 'dataPostup')         as admission_date,
-       education_elem ->> 'dataZachisl'                                                               as enrollment_date,
-       education_elem ->> 'nomPrikazZachisl'                                                          as enrollment_order_number,
-       education_elem ->> 'dataPrikazZachisl'                                                         as enrollment_order_date,
-       coalesce(education_elem -> 'extend' ->> 'dataZavershObuch', education_elem ->> 'dataOkonch')   as completion_date,
-       education_elem -> 'svedObrProg' ->> 'naimFormaObuch'                                           as education_form,
-       education_elem -> 'svedObrProg' ->> 'dataNachObuch'                                            as education_program_start_date,
-       education_elem -> 'extend' ->> 'dataNachObuch'                                                 as education_start_date,
-       coalesce(education_elem -> 'svedObrProg' ->> 'planDataOkonch', education_elem ->>'dataOzhid')  as planned_completion_date,
-       education_elem -> 'svedObrProg' -> 'svedSpeczMinobr' ->> 'kodSpecz'                            as minobr_speciality_code,
-       education_elem -> 'svedObrProg' -> 'svedSpeczMinprosv' ->> 'kodSpecz'                          as minprosv_speciality_code,
-       education_elem ->> 'svedVosst' != 'null'                                                       as recovery_info,
-       education_elem -> 'svedVosst' ->> 'dataVosst'                                                  as recovery_date,
-       education_elem -> 'svedVosst' ->> 'dataPrikazVosst'                                            as recovery_order_date,
-       education_elem -> 'svedVosst' ->> 'nomPrikazVosst'                                             as recovery_order_number,
-       education_elem ->> 'svedOtchisl' != 'null'                                                     as expulsion_info,
-       education_elem -> 'svedOtchisl' ->> 'dataOtchisl'                                              as expulsion_date,
-       education_elem -> 'svedOtchisl' ->> 'dataPrikazOtchisl'                                        as expulsion_order_date,
-       education_elem -> 'svedOtchisl' ->> 'nomPrikazOtchisl'                                         as expulsion_order_number,
-       education_elem ->> 'svedOtpusk' != 'null'                                                      as academical_leave_info,
-       education_elem ->> 'prPervObuch' = '1'                                                         as first_education,
-       education_elem -> 'svedObrProg' ->> 'prVUSpecz' = '1'                                          as vus_spec,
-       education_elem -> 'svedVoenObuch' != 'null'                                                    as military_center_education_info,
-       education_elem -> 'svedVoenObuch' ->> 'dataNach'                                               as military_center_education_start_date,
-       education_elem -> 'svedVoenObuch' ->> 'dataOkonch'                                             as military_center_education_end_date,
-       education_elem -> 'svedVoenObuch' -> 'extend' -&gt;&gt; 'srokObuch'                                  as military_center_education_period,
-       education_elem -> 'svedVoenObuch' -> 'extend' ->> 'svedUspeshZaverObuch' ='1'                  as military_center_completion,
-       education_elem -> 'extend' ->> 'svedVoenKaf' != 'null'                                         as military_department_education_info,
-       education_elem -> 'extend' -> 'svedVoenKaf' ->> 'dataNach'                                     as military_department_start_date,
-       education_elem -> 'extend' -> 'svedVoenKaf' ->> 'dataOkonch'                                   as military_department_end_date,
-       academ_elem -> 'dataNach'                                                                      as academ_start_date,
-       academ_elem -> 'dataOkonch'                                                                    as academ_end_date,
-       academ_elem -> 'naimPrichOtpusk'                                                               as academ_reason
-FROM filteredData fd
-ORDER BY source_id;</sql>
-    <variables_active>Y</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>480</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>education_leave_output</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <fields>
-      <field>
-        <column_name>start_date</column_name>
-        <stream_name>academ_start_date</stream_name>
-      </field>
-      <field>
-        <column_name>end_date</column_name>
-        <stream_name>academ_end_date</stream_name>
-      </field>
-      <field>
-        <column_name>reason</column_name>
-        <stream_name>academ_reason</stream_name>
-      </field>
-      <field>
-        <column_name>citizen_education_source_id</column_name>
-        <stream_name>source_id</stream_name>
-      </field>
-    </fields>
-    <ignore_errors>N</ignore_errors>
-    <only_when_have_rows>N</only_when_have_rows>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <return_keys>N</return_keys>
-    <schema>ervu_dashboard</schema>
-    <specify_fields>Y</specify_fields>
-    <table>educational_leave</table>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_in_table>Y</tablename_in_table>
-    <truncate>N</truncate>
-    <use_batch>Y</use_batch>
-    <attributes/>
-    <GUI>
-      <xloc>1136</xloc>
-      <yloc>704</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-    <error>
-      <source_transform>citizen_education_output</source_transform>
-      <target_transform>Change job status on error</target_transform>
-      <is_enabled>Y</is_enabled>
-      <nr_valuename/>
-      <descriptions_valuename>error_description</descriptions_valuename>
-      <fields_valuename/>
-      <codes_valuename/>
-      <max_errors/>
-      <max_pct_errors/>
-      <min_pct_rows/>
-    </error>
-    <error>
-      <source_transform>education_leave_output</source_transform>
-      <target_transform>Change job status on error</target_transform>
-      <is_enabled>Y</is_enabled>
-      <nr_valuename/>
-      <descriptions_valuename>error_description</descriptions_valuename>
-      <fields_valuename/>
-      <codes_valuename/>
-      <max_errors/>
-      <max_pct_errors/>
-      <min_pct_rows/>
-    </error>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/recruitment_five_flow_delta.hpl b/mappings/info_recruits/citizen_tables/education/educational_institution_learning/recruitment_five_flow_delta.hpl
deleted file mode 100644
index bce8e0b..0000000
--- a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/recruitment_five_flow_delta.hpl
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>recruitment_five_flow_delta</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/08/28 21:23:43.331</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/08/28 21:23:43.331</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>Table input</from>
-      <to>citizen_education_flow_delta.hpl</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>get_max_source_update_date</from>
-      <to>Table input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>citizen_education_flow_delta.hpl 2</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>citizen_education_flow_delta.hpl 3</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>citizen_education_flow_delta.hpl 4</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>citizen_education_flow_delta.hpl 5</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>Table input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard-test</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <lookup>get_max_source_update_date</lookup>
-    <sql>WITH mud AS (
-    SELECT
-        recruitment_id,
-        MAX(execution_datetime) AS max_upd_date
-    FROM etl.job_execution
-    WHERE job_name = '${JOB_NAME}'
-      AND status IN ('SUCCESS','DELTA_ERROR','DELTA_SUCCESS','DELTA_PROCESSING')
-    GROUP BY recruitment_id
-)
-SELECT
-    r.idm_id,
-    ? max_source_update_date
-FROM ervu_dashboard.recruitment r
-         JOIN mud ON mud.recruitment_id = r.idm_id
-         JOIN recruits_info ri
-              ON COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = r.idm_id
-                  AND ri.updated_at > mud.max_upd_date;</sql>
-    <variables_active>Y</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>608</xloc>
-      <yloc>384</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>citizen_education_flow_delta.hpl</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>800</xloc>
-      <yloc>224</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>citizen_education_flow_delta.hpl 2</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>800</xloc>
-      <yloc>304</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>citizen_education_flow_delta.hpl 3</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>800</xloc>
-      <yloc>384</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>citizen_education_flow_delta.hpl 4</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>800</xloc>
-      <yloc>464</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>citizen_education_flow_delta.hpl 5</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>800</xloc>
-      <yloc>544</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>get_max_source_update_date</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>select max(source_update_date)
-from education_institution_learning;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>432</xloc>
-      <yloc>384</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/education/foreign_diploma/constants/foreign_diploma_constants_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/education/foreign_diploma/constants/foreign_diploma_constants_flow_repeat.hpl
deleted file mode 100644
index 52729cf..0000000
--- a/mappings/info_recruits/citizen_tables/education/foreign_diploma/constants/foreign_diploma_constants_flow_repeat.hpl
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>foreign_diploma_constants_flow_repeat</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/21 21:27:15.216</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/21 21:27:15.216</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>get_max_country_oksm_update_date</from>
-      <to>country_oksm_input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>country_oksm_input</from>
-      <to>country_oksm</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>country_oksm_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>nsi</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <lookup>get_max_country_oksm_update_date</lookup>
-    <sql>SELECT
-    key as code,
-    value ->> 'value' as value,
-    NOT hidden as actual,
-    updated_at as update_date
-FROM classifier_records
-WHERE code = 'countriesOKSM'
-AND updated_at > ?;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>464</xloc>
-      <yloc>240</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>get_max_country_oksm_update_date</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT
-       max(update_date) as max_update_date
-FROM country_oksm;
-</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>240</xloc>
-      <yloc>240</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>country_oksm</name>
-    <type>InsertUpdate</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <lookup>
-      <key>
-        <condition>=</condition>
-        <field>code</field>
-        <name>code</name>
-        <name2/>
-      </key>
-      <key>
-        <condition>&lt;></condition>
-        <field>actual</field>
-        <name>actual</name>
-        <name2/>
-      </key>
-      <schema>ervu_dashboard</schema>
-      <table>country_oksm</table>
-      <value>
-        <name>code</name>
-        <rename>code</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>value</name>
-        <rename>value</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>actual</name>
-        <rename>actual</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>update_date</name>
-        <rename>update_date</rename>
-        <update>Y</update>
-      </value>
-    </lookup>
-    <update_bypassed>N</update_bypassed>
-    <attributes/>
-    <GUI>
-      <xloc>688</xloc>
-      <yloc>240</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/education/foreign_diploma/foreign_diploma_job.hwf b/mappings/info_recruits/citizen_tables/education/foreign_diploma/foreign_diploma_job.hwf
deleted file mode 100644
index 0868d20..0000000
--- a/mappings/info_recruits/citizen_tables/education/foreign_diploma/foreign_diploma_job.hwf
+++ /dev/null
@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<workflow>
-  <name>foreign_diploma_job</name>
-  <name_sync_with_filename>Y</name_sync_with_filename>
-  <description/>
-  <extended_description/>
-  <workflow_version/>
-  <created_user>-</created_user>
-  <created_date>2025/09/04 20:50:35.289</created_date>
-  <modified_user>-</modified_user>
-  <modified_date>2025/09/04 20:50:35.289</modified_date>
-  <parameters>
-    </parameters>
-  <actions>
-    <action>
-      <name>Start</name>
-      <description/>
-      <type>SPECIAL</type>
-      <attributes/>
-      <DayOfMonth>1</DayOfMonth>
-      <hour>12</hour>
-      <intervalMinutes>60</intervalMinutes>
-      <intervalSeconds>0</intervalSeconds>
-      <minutes>0</minutes>
-      <repeat>N</repeat>
-      <schedulerType>0</schedulerType>
-      <weekDay>1</weekDay>
-      <parallel>N</parallel>
-      <xloc>336</xloc>
-      <yloc>224</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>check_if_job_execution_exists.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/support/check_if_job_execution_exists.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>1360</xloc>
-      <yloc>240</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>employer_job_execution_exists_check</name>
-      <description/>
-      <type>SIMPLE_EVAL</type>
-      <attributes/>
-      <fieldtype>boolean</fieldtype>
-      <successbooleancondition>false</successbooleancondition>
-      <successcondition>equal</successcondition>
-      <successnumbercondition>equal</successnumbercondition>
-      <successwhenvarset>N</successwhenvarset>
-      <valuetype>variable</valuetype>
-      <variablename>JOB_EXECUTED_FLAG</variablename>
-      <parallel>N</parallel>
-      <xloc>1664</xloc>
-      <yloc>240</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>recruitment_five_flow.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/recruitment_five_flow.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>Y</parallel>
-      <xloc>1936</xloc>
-      <yloc>240</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>recruitment_five_flow_repeat.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/recruitment_five_flow_repeat.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>1936</xloc>
-      <yloc>544</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>check_if_need_to_repeat.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/support/check_if_need_to_repeat.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>1664</xloc>
-      <yloc>384</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>Simple evaluation</name>
-      <description/>
-      <type>SIMPLE_EVAL</type>
-      <attributes/>
-      <fieldtype>boolean</fieldtype>
-      <successbooleancondition>true</successbooleancondition>
-      <successcondition>equal</successcondition>
-      <successnumbercondition>equal</successnumbercondition>
-      <successwhenvarset>N</successwhenvarset>
-      <valuetype>variable</valuetype>
-      <variablename>NEED_TO_REPEAT_JOB</variablename>
-      <parallel>N</parallel>
-      <xloc>1664</xloc>
-      <yloc>544</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>recruitment_five_flow_delta.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/recruitment_five_flow_delta.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>1664</xloc>
-      <yloc>704</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>check_if_constants_exists.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/constants/support/check_if_constants_exists.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>512</xloc>
-      <yloc>224</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>constants_exists</name>
-      <description/>
-      <type>SIMPLE_EVAL</type>
-      <attributes/>
-      <fieldtype>boolean</fieldtype>
-      <successbooleancondition>true</successbooleancondition>
-      <successcondition>equal</successcondition>
-      <successnumbercondition>equal</successnumbercondition>
-      <successwhenvarset>N</successwhenvarset>
-      <valuetype>variable</valuetype>
-      <variablename>CONSTANTS_EXISTS</variablename>
-      <parallel>N</parallel>
-      <xloc>688</xloc>
-      <yloc>224</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>foreign_diploma_constants_flow.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/constants/foreign_diploma_constants_flow.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>880</xloc>
-      <yloc>144</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>foreign_diploma_constants_flow_repeat.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/constants/foreign_diploma_constants_flow_repeat.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>880</xloc>
-      <yloc>320</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>init_job_name</name>
-      <description/>
-      <type>SET_VARIABLES</type>
-      <attributes/>
-      <fields>
-        <field>
-          <variable_name>JOB_NAME</variable_name>
-          <variable_type>CURRENT_WORKFLOW</variable_type>
-          <variable_value>foreign_diploma_job</variable_value>
-        </field>
-      </fields>
-      <file_variable_type>CURRENT_WORKFLOW</file_variable_type>
-      <replacevars>N</replacevars>
-      <parallel>N</parallel>
-      <xloc>1120</xloc>
-      <yloc>240</yloc>
-      <attributes_hac/>
-    </action>
-  </actions>
-  <hops>
-    <hop>
-      <from>check_if_job_execution_exists.hpl</from>
-      <to>employer_job_execution_exists_check</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>employer_job_execution_exists_check</from>
-      <to>check_if_need_to_repeat.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>N</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>check_if_need_to_repeat.hpl</from>
-      <to>Simple evaluation</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>check_if_constants_exists.hpl</from>
-      <to>constants_exists</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>constants_exists</from>
-      <to>foreign_diploma_constants_flow.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>N</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>constants_exists</from>
-      <to>foreign_diploma_constants_flow_repeat.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>foreign_diploma_constants_flow.hpl</from>
-      <to>init_job_name</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>foreign_diploma_constants_flow_repeat.hpl</from>
-      <to>init_job_name</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>init_job_name</from>
-      <to>check_if_job_execution_exists.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>Start</from>
-      <to>check_if_constants_exists.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
-    </hop>
-    <hop>
-      <from>employer_job_execution_exists_check</from>
-      <to>recruitment_five_flow.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>Simple evaluation</from>
-      <to>recruitment_five_flow_repeat.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>Simple evaluation</from>
-      <to>recruitment_five_flow_delta.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>N</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-  </hops>
-  <notepads>
-  </notepads>
-  <attributes/>
-</workflow>
diff --git a/mappings/info_recruits/citizen_tables/education/russian_diploma/constants/russian_diploma_constants_flow.hpl b/mappings/info_recruits/citizen_tables/education/russian_diploma/constants/russian_diploma_constants_flow.hpl
deleted file mode 100644
index aee3c4e..0000000
--- a/mappings/info_recruits/citizen_tables/education/russian_diploma/constants/russian_diploma_constants_flow.hpl
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>russian_diploma_constants_flow</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/22 08:32:44.247</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/22 08:32:44.247</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>minobr_doc_type_input</from>
-      <to>minobr_doc_type_output</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>minprosv_doc_type_input</from>
-      <to>minprosv_doc_type_output</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>minobr_doc_type_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>nsi</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT
-    key as code,
-    value ->> 'value' as value,
-    NOT hidden as actual,
-    updated_at as update_date
-FROM classifier_records
-WHERE code = 'educationNaimVidDocMinobr';</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>384</xloc>
-      <yloc>272</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>minprosv_doc_type_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>nsi</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT
-    key as code,
-    value ->> 'value' as value,
-    NOT hidden as actual,
-    updated_at as update_date
-FROM classifier_records
-WHERE code = 'educationNaimVidDocMinprosv';</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>384</xloc>
-      <yloc>384</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>minobr_doc_type_output</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <fields>
-      <field>
-        <column_name>code</column_name>
-        <stream_name>code</stream_name>
-      </field>
-      <field>
-        <column_name>value</column_name>
-        <stream_name>value</stream_name>
-      </field>
-      <field>
-        <column_name>actual</column_name>
-        <stream_name>actual</stream_name>
-      </field>
-      <field>
-        <column_name>update_date</column_name>
-        <stream_name>update_date</stream_name>
-      </field>
-    </fields>
-    <ignore_errors>N</ignore_errors>
-    <only_when_have_rows>N</only_when_have_rows>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_field/>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <return_field/>
-    <return_keys>N</return_keys>
-    <schema>ervu_dashboard</schema>
-    <specify_fields>Y</specify_fields>
-    <table>minobr_doc_type</table>
-    <tablename_field/>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_in_table>Y</tablename_in_table>
-    <truncate>N</truncate>
-    <use_batch>Y</use_batch>
-    <attributes/>
-    <GUI>
-      <xloc>624</xloc>
-      <yloc>272</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>minprosv_doc_type_output</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <fields>
-      <field>
-        <column_name>code</column_name>
-        <stream_name>code</stream_name>
-      </field>
-      <field>
-        <column_name>value</column_name>
-        <stream_name>value</stream_name>
-      </field>
-      <field>
-        <column_name>actual</column_name>
-        <stream_name>actual</stream_name>
-      </field>
-      <field>
-        <column_name>update_date</column_name>
-        <stream_name>update_date</stream_name>
-      </field>
-    </fields>
-    <ignore_errors>N</ignore_errors>
-    <only_when_have_rows>N</only_when_have_rows>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_field/>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <return_field/>
-    <return_keys>N</return_keys>
-    <schema>ervu_dashboard</schema>
-    <specify_fields>Y</specify_fields>
-    <table>minprosv_doc_type</table>
-    <tablename_field/>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_in_table>Y</tablename_in_table>
-    <truncate>N</truncate>
-    <use_batch>Y</use_batch>
-    <attributes/>
-    <GUI>
-      <xloc>624</xloc>
-      <yloc>384</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/education/russian_diploma/constants/russian_diploma_constants_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/education/russian_diploma/constants/russian_diploma_constants_flow_repeat.hpl
deleted file mode 100644
index 54dedda..0000000
--- a/mappings/info_recruits/citizen_tables/education/russian_diploma/constants/russian_diploma_constants_flow_repeat.hpl
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>foreign_diploma_constants_flow</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/22 08:32:45.452</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/22 08:32:45.452</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>minobr_doc_type_input</from>
-      <to>minobr_doc_type_upsert</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>minprosv_doc_type_input</from>
-      <to>minprosv_doc_type_upsert</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>get_max_minobr_doc_type_update_date</from>
-      <to>minobr_doc_type_input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>get_max_minprosv_doc_type_date</from>
-      <to>minprosv_doc_type_input</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>minobr_doc_type_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>nsi</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <lookup>get_max_minobr_doc_type_update_date</lookup>
-    <sql>SELECT
-    key as code,
-    value ->> 'value' as value,
-    NOT hidden as actual
-FROM classifier_records
-WHERE code = 'educationNaimVidDocMinobr'
-AND updated_at > ?;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>720</xloc>
-      <yloc>256</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>minobr_doc_type_upsert</name>
-    <type>InsertUpdate</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <lookup>
-      <key>
-        <condition>=</condition>
-        <field>code</field>
-        <name>code</name>
-        <name2/>
-      </key>
-      <schema>ervu_dashboard</schema>
-      <table>minobr_doc_type</table>
-      <value>
-        <name>code</name>
-        <rename>code</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>value</name>
-        <rename>value</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>actual</name>
-        <rename>actual</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>update_date</name>
-        <rename>update_date</rename>
-        <update>Y</update>
-      </value>
-    </lookup>
-    <update_bypassed>N</update_bypassed>
-    <attributes/>
-    <GUI>
-      <xloc>992</xloc>
-      <yloc>256</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>minprosv_doc_type_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>nsi</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <lookup>get_max_minprosv_doc_type_date</lookup>
-    <sql>SELECT
-    key as code,
-    value ->> 'value' as value,
-    NOT hidden as actual
-FROM classifier_records
-WHERE code = 'educationNaimVidDocMinprosv'
-AND updated_at > ?;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>720</xloc>
-      <yloc>416</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>minprosv_doc_type_upsert</name>
-    <type>InsertUpdate</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <lookup>
-      <key>
-        <condition>=</condition>
-        <field>code</field>
-        <name>code</name>
-        <name2/>
-      </key>
-      <schema>ervu_dashboard</schema>
-      <table>minprosv_doc_type</table>
-      <value>
-        <name>code</name>
-        <rename>code</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>value</name>
-        <rename>value</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>actual</name>
-        <rename>actual</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>update_date</name>
-        <rename>update_date</rename>
-        <update>Y</update>
-      </value>
-    </lookup>
-    <update_bypassed>N</update_bypassed>
-    <attributes/>
-    <GUI>
-      <xloc>992</xloc>
-      <yloc>416</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>get_max_minobr_doc_type_update_date</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT
-       max(update_date) as max_update_date
-FROM minobr_doc_type;
-</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>464</xloc>
-      <yloc>256</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>get_max_minprosv_doc_type_date</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT
-       max(update_date) as max_update_date
-FROM minprosv_doc_type;
-</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>464</xloc>
-      <yloc>416</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/education/russian_diploma/recruitment_five_flow_delta.hpl b/mappings/info_recruits/citizen_tables/education/russian_diploma/recruitment_five_flow_delta.hpl
deleted file mode 100644
index 38479ff..0000000
--- a/mappings/info_recruits/citizen_tables/education/russian_diploma/recruitment_five_flow_delta.hpl
+++ /dev/null
@@ -1,423 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>recruitment_five_flow_delta</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/01 17:07:38.569</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/01 17:07:38.569</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>Table input</from>
-      <to>russian_diploma_flow_delta.hpl</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>get_max_source_update_date</from>
-      <to>Table input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>russian_diploma_flow_delta.hpl 2</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>russian_diploma_flow_delta.hpl 3</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>russian_diploma_flow_delta.hpl 4</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>russian_diploma_flow_delta.hpl 5</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>Table input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard-test</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <lookup>get_max_source_update_date</lookup>
-    <sql>SELECT
-    r.idm_id,
-    ? max_source_update_date
-FROM ervu_dashboard.recruitment r
-         LEFT JOIN etl.job_execution je
-                   ON r.idm_id = je.recruitment_id
-                       and job_name = '${JOB_NAME}'
- JOIN recruits_info ri
-              ON COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = r.idm_id
-                  AND ri.updated_at > (
-                      SELECT MAX(execution_datetime)
-                      FROM etl.job_execution
-                      WHERE job_name = '${JOB_NAME}'
-                        AND recruitment_id = r.idm_id
-                  )
-where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING');</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>688</xloc>
-      <yloc>368</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>get_max_source_update_date</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>select max(source_update_date)
-from russian_diploma;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>512</xloc>
-      <yloc>368</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>russian_diploma_flow_delta.hpl</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>russian_diploma_job</input>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>880</xloc>
-      <yloc>208</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>russian_diploma_flow_delta.hpl 2</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>russian_diploma_job</input>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>880</xloc>
-      <yloc>288</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>russian_diploma_flow_delta.hpl 3</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>russian_diploma_job</input>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>880</xloc>
-      <yloc>368</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>russian_diploma_flow_delta.hpl 4</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>russian_diploma_job</input>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>880</xloc>
-      <yloc>448</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>russian_diploma_flow_delta.hpl 5</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>russian_diploma_job</input>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>880</xloc>
-      <yloc>528</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/education/russian_diploma/russian_diploma_job.hwf b/mappings/info_recruits/citizen_tables/education/russian_diploma/russian_diploma_job.hwf
deleted file mode 100644
index cc7726c..0000000
--- a/mappings/info_recruits/citizen_tables/education/russian_diploma/russian_diploma_job.hwf
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<workflow>
-  <name>russian_diploma_job</name>
-  <name_sync_with_filename>Y</name_sync_with_filename>
-  <description/>
-  <extended_description/>
-  <workflow_version/>
-  <created_user>-</created_user>
-  <created_date>2025/09/01 15:59:15.492</created_date>
-  <modified_user>-</modified_user>
-  <modified_date>2025/09/01 15:59:15.492</modified_date>
-  <parameters>
-    </parameters>
-  <actions>
-    <action>
-      <name>Start</name>
-      <description/>
-      <type>SPECIAL</type>
-      <attributes/>
-      <DayOfMonth>1</DayOfMonth>
-      <hour>12</hour>
-      <intervalMinutes>60</intervalMinutes>
-      <intervalSeconds>0</intervalSeconds>
-      <minutes>0</minutes>
-      <repeat>N</repeat>
-      <schedulerType>0</schedulerType>
-      <weekDay>1</weekDay>
-      <parallel>N</parallel>
-      <xloc>272</xloc>
-      <yloc>208</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>check_if_job_execution_exists.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/support/check_if_job_execution_exists.hpl</filename>
-      <logext/>
-      <logfile/>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>1200</xloc>
-      <yloc>224</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>employer_job_execution_exists_check</name>
-      <description/>
-      <type>SIMPLE_EVAL</type>
-      <attributes/>
-      <fieldtype>boolean</fieldtype>
-      <successbooleancondition>false</successbooleancondition>
-      <successcondition>equal</successcondition>
-      <successnumbercondition>equal</successnumbercondition>
-      <successwhenvarset>N</successwhenvarset>
-      <valuetype>variable</valuetype>
-      <variablename>JOB_EXECUTED_FLAG</variablename>
-      <parallel>N</parallel>
-      <xloc>1504</xloc>
-      <yloc>224</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>recruitment_five_flow.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/recruitment_five_flow.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>Y</parallel>
-      <xloc>1744</xloc>
-      <yloc>224</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>recruitment_five_flow_repeat.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/recruitment_five_flow_repeat.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>1728</xloc>
-      <yloc>528</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>check_if_need_to_repeat.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/support/check_if_need_to_repeat.hpl</filename>
-      <logext/>
-      <logfile/>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>1504</xloc>
-      <yloc>368</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>Simple evaluation</name>
-      <description/>
-      <type>SIMPLE_EVAL</type>
-      <attributes/>
-      <fieldtype>boolean</fieldtype>
-      <successbooleancondition>true</successbooleancondition>
-      <successcondition>equal</successcondition>
-      <successnumbercondition>equal</successnumbercondition>
-      <successwhenvarset>N</successwhenvarset>
-      <valuetype>variable</valuetype>
-      <variablename>NEED_TO_REPEAT_JOB</variablename>
-      <parallel>N</parallel>
-      <xloc>1504</xloc>
-      <yloc>528</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>recruitment_five_flow_delta.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/recruitment_five_flow_delta.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>1504</xloc>
-      <yloc>672</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>check_if_constants_exists.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/constants/support/check_if_constants_exists.hpl</filename>
-      <logext/>
-      <logfile/>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>432</xloc>
-      <yloc>208</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>constants_exists</name>
-      <description/>
-      <type>SIMPLE_EVAL</type>
-      <attributes/>
-      <fieldtype>boolean</fieldtype>
-      <successbooleancondition>true</successbooleancondition>
-      <successcondition>equal</successcondition>
-      <successnumbercondition>equal</successnumbercondition>
-      <successwhenvarset>N</successwhenvarset>
-      <valuetype>variable</valuetype>
-      <variablename>CONSTANTS_EXISTS</variablename>
-      <parallel>N</parallel>
-      <xloc>608</xloc>
-      <yloc>208</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>russian_diploma_constants_flow.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/constants/russian_diploma_constants_flow.hpl</filename>
-      <logext/>
-      <logfile/>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>800</xloc>
-      <yloc>128</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>russian_diploma_constants_flow_repeat.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/constants/russian_diploma_constants_flow_repeat.hpl</filename>
-      <logext/>
-      <logfile/>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>800</xloc>
-      <yloc>304</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>init_job_name</name>
-      <description/>
-      <type>SET_VARIABLES</type>
-      <attributes/>
-      <fields>
-        <field>
-          <variable_name>JOB_NAME</variable_name>
-          <variable_type>CURRENT_WORKFLOW</variable_type>
-          <variable_value>russian_diploma_job</variable_value>
-        </field>
-      </fields>
-      <file_variable_type>CURRENT_WORKFLOW</file_variable_type>
-      <filename/>
-      <replacevars>N</replacevars>
-      <parallel>N</parallel>
-      <xloc>992</xloc>
-      <yloc>224</yloc>
-      <attributes_hac/>
-    </action>
-  </actions>
-  <hops>
-    <hop>
-      <from>check_if_job_execution_exists.hpl</from>
-      <to>employer_job_execution_exists_check</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>employer_job_execution_exists_check</from>
-      <to>check_if_need_to_repeat.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>N</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>check_if_need_to_repeat.hpl</from>
-      <to>Simple evaluation</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>check_if_constants_exists.hpl</from>
-      <to>constants_exists</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>constants_exists</from>
-      <to>russian_diploma_constants_flow.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>N</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>constants_exists</from>
-      <to>russian_diploma_constants_flow_repeat.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>russian_diploma_constants_flow.hpl</from>
-      <to>init_job_name</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>russian_diploma_constants_flow_repeat.hpl</from>
-      <to>init_job_name</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>Start</from>
-      <to>check_if_constants_exists.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
-    </hop>
-    <hop>
-      <from>init_job_name</from>
-      <to>check_if_job_execution_exists.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>employer_job_execution_exists_check</from>
-      <to>recruitment_five_flow.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>Simple evaluation</from>
-      <to>recruitment_five_flow_repeat.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>Simple evaluation</from>
-      <to>recruitment_five_flow_delta.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>N</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-  </hops>
-  <notepads>
-  </notepads>
-  <attributes/>
-</workflow>
diff --git a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/recruitment_five_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/passport/recruitment_five_flow_delta.hpl
similarity index 83%
rename from mappings/info_recruits/citizen_tables/education/educational_institution_learning/recruitment_five_flow_repeat.hpl
rename to mappings/info_recruits/citizen_tables/passport/recruitment_five_flow_delta.hpl
index a120f61..8259a10 100644
--- a/mappings/info_recruits/citizen_tables/education/educational_institution_learning/recruitment_five_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/passport/recruitment_five_flow_delta.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>recruitment_five_flow_repeat</name>
+    <name>recruitment_five_flow_delta</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,36 +13,36 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/08/28 21:16:24.371</created_date>
+    <created_date>2025/08/11 13:16:11.204</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/08/28 21:16:24.371</modified_date>
+    <modified_date>2025/08/11 13:16:11.204</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
       <from>Table input</from>
-      <to>citizen_education_flow_repeat.hpl</to>
+      <to>passport_flow_delta.hpl</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>citizen_education_flow_repeat.hpl 2</to>
+      <to>passport_flow_delta.hpl 2</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>citizen_education_flow_repeat.hpl 3</to>
+      <to>passport_flow_delta.hpl 3</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>citizen_education_flow_repeat.hpl 4</to>
+      <to>passport_flow_delta.hpl 4</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>citizen_education_flow_repeat.hpl 5</to>
+      <to>passport_flow_delta.hpl 5</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -57,25 +57,25 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>ervu-dashboard-test</connection>
+    <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT r.idm_id AS recruitment_id
+    <limit/>
+    <sql>SELECT
+    r.idm_id as recruitment_id
 FROM ervu_dashboard.recruitment r
          LEFT JOIN etl.job_execution je
                    ON r.idm_id = je.recruitment_id
-                       AND je.job_name = '${JOB_NAME}'
-WHERE je.id IS NULL
-   OR je.status IN ('ERROR', 'PROCESSING');</sql>
-    <variables_active>Y</variables_active>
+                       and job_name = 'passport_job'
+where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING');</sql>
+    <variables_active>N</variables_active>
     <attributes/>
     <GUI>
-      <xloc>672</xloc>
-      <yloc>496</yloc>
+      <xloc>352</xloc>
+      <yloc>288</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>citizen_education_flow_repeat.hpl</name>
+    <name>passport_flow_delta.hpl</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -86,7 +86,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/passport/parallel/passport_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -98,6 +98,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>passport_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -121,12 +126,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>880</xloc>
-      <yloc>336</yloc>
+      <xloc>544</xloc>
+      <yloc>128</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>citizen_education_flow_repeat.hpl 2</name>
+    <name>passport_flow_delta.hpl 2</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -137,7 +142,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/passport/parallel/passport_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -149,6 +154,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>passport_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -172,12 +182,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>880</xloc>
-      <yloc>416</yloc>
+      <xloc>544</xloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>citizen_education_flow_repeat.hpl 3</name>
+    <name>passport_flow_delta.hpl 3</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -188,7 +198,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/passport/parallel/passport_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -200,6 +210,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>passport_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -223,12 +238,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>880</xloc>
-      <yloc>496</yloc>
+      <xloc>544</xloc>
+      <yloc>288</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>citizen_education_flow_repeat.hpl 4</name>
+    <name>passport_flow_delta.hpl 4</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -239,7 +254,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/passport/parallel/passport_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -251,6 +266,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>passport_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -274,12 +294,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>880</xloc>
-      <yloc>576</yloc>
+      <xloc>544</xloc>
+      <yloc>368</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>citizen_education_flow_repeat.hpl 5</name>
+    <name>passport_flow_delta.hpl 5</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -290,7 +310,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/educational_institution_learning/parallel/citizen_education_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/passport/parallel/passport_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -302,6 +322,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>passport_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -325,8 +350,8 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>880</xloc>
-      <yloc>656</yloc>
+      <xloc>544</xloc>
+      <yloc>448</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
diff --git a/mappings/info_recruits/citizen_tables/education/foreign_diploma/recruitment_five_flow.hpl b/mappings/info_recruits/citizen_tables/prosecution/recruitments_five_flow.hpl
similarity index 81%
rename from mappings/info_recruits/citizen_tables/education/foreign_diploma/recruitment_five_flow.hpl
rename to mappings/info_recruits/citizen_tables/prosecution/recruitments_five_flow.hpl
index 06fe914..2d2c4ac 100644
--- a/mappings/info_recruits/citizen_tables/education/foreign_diploma/recruitment_five_flow.hpl
+++ b/mappings/info_recruits/citizen_tables/prosecution/recruitments_five_flow.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>recruitment_five_flow</name>
+    <name>recruitments_five_flow</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,41 +13,41 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/04 20:54:08.982</created_date>
+    <created_date>2025/04/18 09:48:01.970</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/04 20:54:08.982</modified_date>
+    <modified_date>2025/04/18 09:48:01.970</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
-      <from>Get all recruitments</from>
-      <to>foreign_diploma_flow.hpl</to>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>prosecution_flow.hpl</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Get all recruitments</from>
-      <to>foreign_diploma_flow.hpl 2</to>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>prosecution_flow.hpl 2</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Get all recruitments</from>
-      <to>foreign_diploma_flow.hpl 3</to>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>prosecution_flow.hpl 3</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Get all recruitments</from>
-      <to>foreign_diploma_flow.hpl 4</to>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>prosecution_flow.hpl 4</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Get all recruitments</from>
-      <to>foreign_diploma_flow.hpl 5</to>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>prosecution_flow.hpl 5</to>
       <enabled>Y</enabled>
     </hop>
   </order>
   <transform>
-    <name>Get all recruitments</name>
+    <name>Get all recruitments ordered by created_date</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -57,71 +57,21 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>ervu-dashboard-test</connection>
+    <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
+    <limit/>
     <sql>SELECT 
-idm_id
+idm_id AS recruitment
 FROM ervu_dashboard.recruitment;</sql>
     <variables_active>N</variables_active>
     <attributes/>
     <GUI>
-      <xloc>448</xloc>
-      <yloc>464</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>foreign_diploma_flow.hpl</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>720</xloc>
+      <xloc>432</xloc>
       <yloc>304</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>foreign_diploma_flow.hpl 2</name>
+    <name>prosecution_flow.hpl</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -132,7 +82,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -141,9 +91,14 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>prosecution_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -167,12 +122,180 @@ FROM ervu_dashboard.recruitment;</sql>
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>720</xloc>
+      <xloc>704</xloc>
+      <yloc>144</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>prosecution_flow.hpl 2</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>prosecution_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>704</xloc>
+      <yloc>224</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>prosecution_flow.hpl 3</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>prosecution_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>704</xloc>
+      <yloc>304</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>prosecution_flow.hpl 4</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>prosecution_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>704</xloc>
       <yloc>384</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>foreign_diploma_flow.hpl 3</name>
+    <name>prosecution_flow.hpl 5</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -183,7 +306,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -192,9 +315,14 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>prosecution_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -218,112 +346,10 @@ FROM ervu_dashboard.recruitment;</sql>
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>720</xloc>
+      <xloc>704</xloc>
       <yloc>464</yloc>
     </GUI>
   </transform>
-  <transform>
-    <name>foreign_diploma_flow.hpl 4</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>720</xloc>
-      <yloc>544</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>foreign_diploma_flow.hpl 5</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>720</xloc>
-      <yloc>624</yloc>
-    </GUI>
-  </transform>
   <transform_error_handling>
   </transform_error_handling>
   <attributes/>
diff --git a/mappings/info_recruits/citizen_tables/education/russian_diploma/recruitment_five_flow.hpl b/mappings/info_recruits/citizen_tables/punishment/recruitments_five_flow.hpl
similarity index 81%
rename from mappings/info_recruits/citizen_tables/education/russian_diploma/recruitment_five_flow.hpl
rename to mappings/info_recruits/citizen_tables/punishment/recruitments_five_flow.hpl
index 3860444..33ee4da 100644
--- a/mappings/info_recruits/citizen_tables/education/russian_diploma/recruitment_five_flow.hpl
+++ b/mappings/info_recruits/citizen_tables/punishment/recruitments_five_flow.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>recruitment_five_flow</name>
+    <name>recruitments_five_flow</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,41 +13,41 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/01 16:12:33.364</created_date>
+    <created_date>2025/04/18 09:48:01.970</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/01 16:12:33.364</modified_date>
+    <modified_date>2025/04/18 09:48:01.970</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
-      <from>Get all recruitments</from>
-      <to>russian_diploma_flow.hpl</to>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>punishment_flow.hpl</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Get all recruitments</from>
-      <to>russian_diploma_flow.hpl 2</to>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>punishment_flow.hpl 2</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Get all recruitments</from>
-      <to>russian_diploma_flow.hpl 3</to>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>punishment_flow.hpl 3</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Get all recruitments</from>
-      <to>russian_diploma_flow.hpl 4</to>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>punishment_flow.hpl 4</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Get all recruitments</from>
-      <to>russian_diploma_flow.hpl 5</to>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>punishment_flow.hpl 5</to>
       <enabled>Y</enabled>
     </hop>
   </order>
   <transform>
-    <name>Get all recruitments</name>
+    <name>Get all recruitments ordered by created_date</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -57,20 +57,21 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>ervu-dashboard-test</connection>
+    <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
+    <limit/>
     <sql>SELECT 
-idm_id
+idm_id AS recruitment
 FROM ervu_dashboard.recruitment;</sql>
     <variables_active>N</variables_active>
     <attributes/>
     <GUI>
       <xloc>432</xloc>
-      <yloc>512</yloc>
+      <yloc>304</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>russian_diploma_flow.hpl</name>
+    <name>punishment_flow.hpl</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -81,7 +82,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/punishment/parallel/punishment_flow.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -90,9 +91,14 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>punishment_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -117,11 +123,11 @@ FROM ervu_dashboard.recruitment;</sql>
     <attributes/>
     <GUI>
       <xloc>704</xloc>
-      <yloc>352</yloc>
+      <yloc>144</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>russian_diploma_flow.hpl 2</name>
+    <name>punishment_flow.hpl 2</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -132,7 +138,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/punishment/parallel/punishment_flow.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -141,9 +147,14 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>punishment_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -168,11 +179,11 @@ FROM ervu_dashboard.recruitment;</sql>
     <attributes/>
     <GUI>
       <xloc>704</xloc>
-      <yloc>432</yloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>russian_diploma_flow.hpl 3</name>
+    <name>punishment_flow.hpl 3</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -183,7 +194,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/punishment/parallel/punishment_flow.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -192,9 +203,14 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>punishment_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -219,11 +235,11 @@ FROM ervu_dashboard.recruitment;</sql>
     <attributes/>
     <GUI>
       <xloc>704</xloc>
-      <yloc>512</yloc>
+      <yloc>304</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>russian_diploma_flow.hpl 4</name>
+    <name>punishment_flow.hpl 4</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -234,7 +250,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/punishment/parallel/punishment_flow.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -243,9 +259,14 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>punishment_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -270,11 +291,11 @@ FROM ervu_dashboard.recruitment;</sql>
     <attributes/>
     <GUI>
       <xloc>704</xloc>
-      <yloc>592</yloc>
+      <yloc>384</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>russian_diploma_flow.hpl 5</name>
+    <name>punishment_flow.hpl 5</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -285,7 +306,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/education/russian_diploma/parallel/russian_diploma_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/punishment/parallel/punishment_flow.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -294,9 +315,14 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>punishment_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -321,7 +347,7 @@ FROM ervu_dashboard.recruitment;</sql>
     <attributes/>
     <GUI>
       <xloc>704</xloc>
-      <yloc>672</yloc>
+      <yloc>464</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
diff --git a/mappings/info_recruits/citizen_tables/education/foreign_diploma/constants/support/check_if_constants_exists.hpl b/mappings/info_recruits/citizen_tables/work/self_employed/support/check_if_self_employed_job_execution_exists.hpl
similarity index 75%
rename from mappings/info_recruits/citizen_tables/education/foreign_diploma/constants/support/check_if_constants_exists.hpl
rename to mappings/info_recruits/citizen_tables/work/self_employed/support/check_if_self_employed_job_execution_exists.hpl
index 7a4fb03..494e70f 100644
--- a/mappings/info_recruits/citizen_tables/education/foreign_diploma/constants/support/check_if_constants_exists.hpl
+++ b/mappings/info_recruits/citizen_tables/work/self_employed/support/check_if_self_employed_job_execution_exists.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>check_if_constants_exists</name>
+    <name>check_if_self_employed_job_execution_exists</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,9 +13,9 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/21 21:25:15.712</created_date>
+    <created_date>2025/08/18 20:34:56.618</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/21 21:25:15.712</modified_date>
+    <modified_date>2025/08/18 20:34:56.618</modified_date>
   </info>
   <notepads>
   </notepads>
@@ -39,16 +39,16 @@
     </partitioning>
     <fields>
       <field>
-        <field_name>constasnts_exists</field_name>
-        <variable_name>CONSTANTS_EXISTS</variable_name>
+        <field_name>job_executed_flag</field_name>
+        <variable_name>JOB_EXECUTED_FLAG</variable_name>
         <variable_type>PARENT_WORKFLOW</variable_type>
       </field>
     </fields>
     <use_formatting>Y</use_formatting>
     <attributes/>
     <GUI>
-      <xloc>576</xloc>
-      <yloc>272</yloc>
+      <xloc>592</xloc>
+      <yloc>192</yloc>
     </GUI>
   </transform>
   <transform>
@@ -66,13 +66,16 @@
     <execute_each_row>N</execute_each_row>
     <limit>0</limit>
     <sql>SELECT EXISTS (
-    SELECT 1 FROM country_oksm
-) AS constasnts_exists</sql>
-    <variables_active>Y</variables_active>
+            SELECT 1
+            FROM etl.job_execution
+            WHERE job_name = 'self_employed_job'
+            limit 1
+        ) AS job_executed_flag;</sql>
+    <variables_active>N</variables_active>
     <attributes/>
     <GUI>
-      <xloc>288</xloc>
-      <yloc>272</yloc>
+      <xloc>304</xloc>
+      <yloc>192</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
diff --git a/mappings/info_recruits/citizen_tables/education/russian_diploma/constants/support/check_if_constants_exists.hpl b/mappings/info_recruits/citizen_tables/work/work_activity/support/check_if_work_activity_job_exists.hpl
similarity index 76%
rename from mappings/info_recruits/citizen_tables/education/russian_diploma/constants/support/check_if_constants_exists.hpl
rename to mappings/info_recruits/citizen_tables/work/work_activity/support/check_if_work_activity_job_exists.hpl
index fd54f04..a4b4134 100644
--- a/mappings/info_recruits/citizen_tables/education/russian_diploma/constants/support/check_if_constants_exists.hpl
+++ b/mappings/info_recruits/citizen_tables/work/work_activity/support/check_if_work_activity_job_exists.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>check_if_constants_exists</name>
+    <name>check_if_work_activity_job_exists</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,9 +13,9 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/22 08:47:26.114</created_date>
+    <created_date>2025/08/05 13:28:46.661</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/22 08:47:26.114</modified_date>
+    <modified_date>2025/08/05 13:28:46.661</modified_date>
   </info>
   <notepads>
   </notepads>
@@ -39,17 +39,16 @@
     </partitioning>
     <fields>
       <field>
-        <default_value/>
-        <field_name>constants_exists</field_name>
-        <variable_name>CONSTANTS_EXISTS</variable_name>
+        <field_name>job_executed_flag</field_name>
+        <variable_name>JOB_EXECUTED_FLAG</variable_name>
         <variable_type>PARENT_WORKFLOW</variable_type>
       </field>
     </fields>
     <use_formatting>Y</use_formatting>
     <attributes/>
     <GUI>
-      <xloc>480</xloc>
-      <yloc>208</yloc>
+      <xloc>672</xloc>
+      <yloc>336</yloc>
     </GUI>
   </transform>
   <transform>
@@ -67,15 +66,15 @@
     <execute_each_row>N</execute_each_row>
     <limit>0</limit>
     <sql>SELECT EXISTS (
-    SELECT 1 FROM minobr_doc_type
-    UNION ALL
-    SELECT 1 FROM minprosv_doc_type
-) AS constants_exists</sql>
-    <variables_active>Y</variables_active>
+            SELECT 1
+            FROM etl.job_execution
+            WHERE job_name = 'work_activity_job'
+        ) AS job_executed_flag;</sql>
+    <variables_active>N</variables_active>
     <attributes/>
     <GUI>
-      <xloc>192</xloc>
-      <yloc>208</yloc>
+      <xloc>384</xloc>
+      <yloc>336</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
diff --git a/mappings/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow_repeat.hpl b/mappings/info_recruits/raw_data/restriction_document/parallel/restriction_document_flow_repeat.hpl
similarity index 63%
rename from mappings/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow_repeat.hpl
rename to mappings/info_recruits/raw_data/restriction_document/parallel/restriction_document_flow_repeat.hpl
index 83f0d80..809cfea 100644
--- a/mappings/info_recruits/citizen_tables/education/foreign_diploma/parallel/foreign_diploma_flow_repeat.hpl
+++ b/mappings/info_recruits/raw_data/restriction_document/parallel/restriction_document_flow_repeat.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>foreign_diploma_flow_repeat</name>
+    <name>restriction_document_flow_repeat</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,21 +13,21 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/04 21:35:58.671</created_date>
+    <created_date>2025/08/08 13:25:52.319</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/04 21:35:58.671</modified_date>
+    <modified_date>2025/08/08 13:25:52.319</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
+      <from>Create job execution record</from>
+      <to>Table input</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Create job execution record</from>
-      <to>foerign_diploma_input</to>
+      <from>Table input</from>
+      <to>Identify last row in a stream</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
@@ -36,33 +36,33 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
+      <from>Detect empty stream</from>
+      <to>Change job status on success</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>foerign_diploma_input</from>
-      <to>Identify last row in a stream</to>
+      <from>Change job status on error</from>
+      <to>Abort</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Identify last row in a stream</from>
-      <to>foreign_diploma_upsert</to>
+      <to>Insert / update</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>foreign_diploma_upsert</from>
+      <from>Insert / update</from>
       <to>Filter rows</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>foreign_diploma_upsert</from>
-      <to>Change job status on error</to>
+      <from>Insert / update</from>
+      <to>Detect empty stream</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Detect empty stream</from>
-      <to>Change job status on success</to>
+      <from>Insert / update</from>
+      <to>Change job status on error</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -77,13 +77,13 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <abort_option>ABORT</abort_option>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
     <always_log_rows>Y</always_log_rows>
     <row_threshold>0</row_threshold>
     <attributes/>
     <GUI>
       <xloc>1248</xloc>
-      <yloc>624</yloc>
+      <yloc>400</yloc>
     </GUI>
   </transform>
   <transform>
@@ -117,8 +117,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1024</xloc>
-      <yloc>624</yloc>
+      <xloc>960</xloc>
+      <yloc>400</yloc>
     </GUI>
   </transform>
   <transform>
@@ -148,8 +148,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1248</xloc>
-      <yloc>272</yloc>
+      <xloc>1440</xloc>
+      <yloc>48</yloc>
     </GUI>
   </transform>
   <transform>
@@ -171,17 +171,32 @@ and recruitment_id = '${IDM_ID}';
     <replace_variables>Y</replace_variables>
     <set_params>N</set_params>
     <single_statement>N</single_statement>
-    <sql>UPDATE etl.job_execution  
-SET
+    <sql>INSERT INTO etl.job_execution (
+    id,
+    job_name,
+    status,
+    execution_datetime,
+    error_description,
+    recruitment_id
+)
+VALUES (
+    DEFAULT,
+    '${JOB_NAME}',
+    'PROCESSING',
+    DEFAULT,
+    NULL,
+    '${IDM_ID}'
+)
+ON CONFLICT (job_name, recruitment_id)
+DO UPDATE SET
     status = 'PROCESSING',
-    execution_datetime = current_timestamp,
+    execution_datetime = DEFAULT,
     error_description = NULL
-where job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';</sql>
+</sql>
     <attributes/>
     <GUI>
-      <xloc>320</xloc>
-      <yloc>448</yloc>
+      <xloc>272</xloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform>
@@ -197,8 +212,8 @@ and recruitment_id = '${IDM_ID}';</sql>
     </partitioning>
     <attributes/>
     <GUI>
-      <xloc>736</xloc>
-      <yloc>272</yloc>
+      <xloc>1440</xloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform>
@@ -233,15 +248,15 @@ and recruitment_id = '${IDM_ID}';</sql>
     <send_true_to>Change job status on success</send_true_to>
     <attributes/>
     <GUI>
-      <xloc>1248</xloc>
-      <yloc>448</yloc>
+      <xloc>960</xloc>
+      <yloc>48</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Identify last row in a stream</name>
     <type>DetectLastRow</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -251,166 +266,151 @@ and recruitment_id = '${IDM_ID}';</sql>
     <resultfieldname>last_row</resultfieldname>
     <attributes/>
     <GUI>
-      <xloc>736</xloc>
-      <yloc>448</yloc>
+      <xloc>720</xloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>foerign_diploma_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit/>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             ri.info -> 'svedFL' -> 'svedInObr' -> 'inObr' as diploma_arr
-                      FROM recruits_info ri
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedInObr' -> 'inObr') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-)
-SELECT fd.recruit_id,
-       diploma_elem ->> 'id'                               AS source_id,
-       to_date(diploma_elem ->> 'dataSved', 'YYYY-MM-DD')  as source_update_date,
-       diploma_elem ->> 'kodUrObr'                         as education_level_code,
-       diploma_elem ->> 'naimUchZaved'                     as educational_institution_name,
-       diploma_elem ->> 'naimInoDok'                        as foreign_doc_name,
-       diploma_elem ->> 'serNomDok'                         as ser_num_doc,
-       diploma_elem ->> 'regNomDok'                        as reg_num,
-       diploma_elem ->> 'nomSved'                          as recognition_certificate_number,
-       to_date(diploma_elem ->> 'dataPriz', 'YYYY-MM-DD')  as recognition_date,
-       diploma_elem -> 'svedSpecz' ->> 'naimSpecz'         as speciality_name,
-       diploma_elem -> 'svedSpeczMinobr' ->> 'kodSpecz'    as minobr_speciality_code,
-       diploma_elem -> 'svedSpeczMinprosv' ->> 'kodSpecz'  as minprosv_speciality_code,
-       diploma_elem ->> 'kodOKSM'                          as oksm_code,
-       coalesce(diploma_elem ->> 'prVUSpecz' = '1', false) as vus_spec
-FROM filteredData fd
-         CROSS JOIN LATERAL jsonb_array_elements(diploma_arr) AS diploma_elem;
-</sql>
-    <variables_active>Y</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>544</xloc>
-      <yloc>448</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>foreign_diploma_upsert</name>
+    <name>Insert / update</name>
     <type>InsertUpdate</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <commit>10000</commit>
+    <commit>100</commit>
     <connection>ervu-dashboard</connection>
     <lookup>
       <key>
         <condition>=</condition>
-        <field>source_id</field>
-        <name>source_id</name>
+        <field>id</field>
+        <name>id</name>
+        <name2/>
+      </key>
+      <key>
+        <condition>=</condition>
+        <field>created_at</field>
+        <name>created_at</name>
+        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
-      <table>foreign_diploma</table>
+      <table>restriction_document</table>
       <value>
-        <name>recruit_id</name>
-        <rename>recruit_id</rename>
+        <name>id</name>
+        <rename>id</rename>
         <update>N</update>
       </value>
       <value>
-        <name>source_id</name>
-        <rename>source_id</rename>
+        <name>subpoena_id</name>
+        <rename>subpoena_id</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>created_at</name>
+        <rename>created_at</rename>
         <update>N</update>
       </value>
       <value>
-        <name>source_update_date</name>
-        <rename>source_update_date</rename>
+        <name>updated_at</name>
+        <rename>updated_at</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>education_level_code</name>
-        <rename>education_level_code</rename>
+        <name>vk_id</name>
+        <rename>vk_id</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>educational_institution_name</name>
-        <rename>educational_institution_name</rename>
+        <name>user_id</name>
+        <rename>user_id</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>foreign_doc_name</name>
-        <rename>foreign_doc_name</rename>
+        <name>user_name</name>
+        <rename>user_name</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>ser_num_doc</name>
-        <rename>ser_num_doc</rename>
+        <name>status</name>
+        <rename>status</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>reg_num</name>
-        <rename>reg_num</rename>
+        <name>decision_number</name>
+        <rename>decision_number</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>recognition_certificate_number</name>
-        <rename>recognition_certificate_number</rename>
+        <name>decision_date</name>
+        <rename>decision_date</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>recognition_date</name>
-        <rename>recognition_date</rename>
+        <name>decision_reason</name>
+        <rename>decision_reason</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>speciality_name</name>
-        <rename>speciality_name</rename>
+        <name>extra_info</name>
+        <rename>extra_info</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>minobr_speciality_code</name>
-        <rename>minobr_speciality_code</rename>
+        <name>type</name>
+        <rename>type</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>minprosv_speciality_code</name>
-        <rename>minprosv_speciality_code</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>oksm_code</name>
-        <rename>oksm_code</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>vus_spec</name>
-        <rename>vus_spec</rename>
+        <name>recruitment_name</name>
+        <rename>recruitment_name</rename>
         <update>Y</update>
       </value>
     </lookup>
     <update_bypassed>N</update_bypassed>
     <attributes/>
     <GUI>
-      <xloc>1024</xloc>
-      <yloc>448</yloc>
+      <xloc>960</xloc>
+      <yloc>208</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Table input</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>N</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>postgres.subpoena</connection>
+    <execute_each_row>N</execute_each_row>
+    <sql>SELECT
+*
+FROM public.restriction_document 
+WHERE 
+    '${IDM_ID}' != ''  -- Проверка на пустую строку
+    AND vk_id = '${IDM_ID}'
+    AND '${M_R_CR_DATE}' >= created_at
+${LIMIT_FW}</sql>
+    <variables_active>Y</variables_active>
+    <attributes/>
+    <GUI>
+      <xloc>480</xloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
     <error>
-      <source_transform>foreign_diploma_upsert</source_transform>
+      <source_transform>Insert / update</source_transform>
       <target_transform>Change job status on error</target_transform>
       <is_enabled>Y</is_enabled>
       <nr_valuename/>
-      <descriptions_valuename>error_description</descriptions_valuename>
+      <descriptions_valuename/>
       <fields_valuename/>
       <codes_valuename/>
       <max_errors/>
diff --git a/mappings/info_recruits/citizen_tables/education/foreign_diploma/constants/foreign_diploma_constants_flow.hpl b/mappings_new/info_recruits/citizen_tables/passport/recruit_update_date_ervu_dashboard.hpl
similarity index 62%
rename from mappings/info_recruits/citizen_tables/education/foreign_diploma/constants/foreign_diploma_constants_flow.hpl
rename to mappings_new/info_recruits/citizen_tables/passport/recruit_update_date_ervu_dashboard.hpl
index e2c8de2..0236547 100644
--- a/mappings/info_recruits/citizen_tables/education/foreign_diploma/constants/foreign_diploma_constants_flow.hpl
+++ b/mappings_new/info_recruits/citizen_tables/passport/recruit_update_date_ervu_dashboard.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>foreign_diploma_constants_flow</name>
+    <name>recruit_update_date_ervu_dashboard</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,21 +13,21 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/22 08:32:45.452</created_date>
+    <created_date>2025/06/02 14:50:31.833</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/22 08:32:45.452</modified_date>
+    <modified_date>2025/06/02 14:50:31.833</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
-      <from>country_oksm_input</from>
-      <to>country_oksm_output</to>
+      <from>Table input</from>
+      <to>Table output</to>
       <enabled>Y</enabled>
     </hop>
   </order>
   <transform>
-    <name>country_oksm_input</name>
+    <name>Table input</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -37,26 +37,26 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>nsi</connection>
+    <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
     <limit>0</limit>
-    <sql>SELECT
-    key as code,
-    value ->> 'value' as value,
-    NOT hidden as actual,
-    updated_at as update_date
-FROM classifier_records
-WHERE code = 'countriesOKSM';
-</sql>
+    <sql>SELECT 
+    created_at AS system_create_date,
+    updated_at AS system_update_date,
+    current_timestamp AS record_created,
+    'job_recruits_info' AS workflow
+FROM recruits_info
+WHERE updated_at = (SELECT MAX(updated_at) FROM recruits_info)
+limit 1</sql>
     <variables_active>N</variables_active>
     <attributes/>
     <GUI>
-      <xloc>416</xloc>
-      <yloc>192</yloc>
+      <xloc>896</xloc>
+      <yloc>304</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>country_oksm_output</name>
+    <name>Table output</name>
     <type>TableOutput</type>
     <description/>
     <distribute>Y</distribute>
@@ -66,26 +66,10 @@ WHERE code = 'countriesOKSM';
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <commit>10000</commit>
+    <commit>1000</commit>
     <connection>ervu-dashboard</connection>
     <fields>
-      <field>
-        <column_name>code</column_name>
-        <stream_name>code</stream_name>
-      </field>
-      <field>
-        <column_name>value</column_name>
-        <stream_name>value</stream_name>
-      </field>
-      <field>
-        <column_name>actual</column_name>
-        <stream_name>actual</stream_name>
-      </field>
-      <field>
-        <column_name>update_date</column_name>
-        <stream_name>update_date</stream_name>
-      </field>
-    </fields>
+</fields>
     <ignore_errors>N</ignore_errors>
     <only_when_have_rows>N</only_when_have_rows>
     <partitioning_daily>N</partitioning_daily>
@@ -94,9 +78,9 @@ WHERE code = 'countriesOKSM';
     <partitioning_monthly>Y</partitioning_monthly>
     <return_field/>
     <return_keys>N</return_keys>
-    <schema>ervu_dashboard</schema>
-    <specify_fields>Y</specify_fields>
-    <table>country_oksm</table>
+    <schema>public</schema>
+    <specify_fields>N</specify_fields>
+    <table>recruit_create</table>
     <tablename_field/>
     <tablename_in_field>N</tablename_in_field>
     <tablename_in_table>Y</tablename_in_table>
@@ -104,8 +88,8 @@ WHERE code = 'countriesOKSM';
     <use_batch>Y</use_batch>
     <attributes/>
     <GUI>
-      <xloc>640</xloc>
-      <yloc>192</yloc>
+      <xloc>1216</xloc>
+      <yloc>304</yloc>
     </GUI>
   </transform>
   <transform_error_handling>