diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P1.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P1.java
index 69be76846..03e5cbc05 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P1.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P1.java
@@ -16,9 +16,9 @@ public class ReportBR_0420312_P1 extends ReportWithPeriod {
     @XStreamAlias("destination")
     private String destination;
 
+    @XStreamAlias("rows")
     private final List<Info_0420312_P1> rows = new ArrayList<>();
 
-
     public ReportBR_0420312_P1(LocalDate startDate,
                                LocalDate endDate,
                                String destination) {
@@ -31,80 +31,10 @@ public class ReportBR_0420312_P1 extends ReportWithPeriod {
         this.destination = destination;
     }
 
-
     public List<Info_0420312_P1> getRows() {
         return rows;
     }
 
-    @Deprecated
-    public ReportBR_0420312_P1(LocalDate startDate,
-                               LocalDate endDate,
-                               String companyClearingCode,
-                               String destination,
-                               String liabilitiesClaimsAssetsCompanyId,
-                               String liabilitiesClaimsAssetsFullName,
-                               String companySymbolCode,
-                               String companySymbolValue,
-                               String companyInfoCountryCode,
-                               String clearingMemberCategoryClearingMemberCategory) {
-        this(startDate, endDate, destination);
-        getRows().add(new Info_0420312_P1(companyClearingCode,
-                liabilitiesClaimsAssetsCompanyId,
-                liabilitiesClaimsAssetsFullName,
-                companySymbolCode,
-                companySymbolValue,
-                companyInfoCountryCode,
-                clearingMemberCategoryClearingMemberCategory));
-    }
-
-    @XStreamAlias("rows")
-    public static class Info_0420312_P1 {
-        @XStreamAsAttribute
-        @XStreamAlias("company_clearingCode")
-        private String companyClearingCode;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_companyId")
-        private String liabilitiesClaimsAssetsCompanyId;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_fullName")
-        private String liabilitiesClaimsAssetsFullName;
-
-        @XStreamAsAttribute
-        @XStreamAlias("companySymbol_code")
-        private String companySymbolCode;
-
-        @XStreamAsAttribute
-        @XStreamAlias("companySymbol_value")
-        private String companySymbolValue;
-
-        @XStreamAsAttribute
-        @XStreamAlias("companyInfo_countryCode")
-        private String companyInfoCountryCode;
-
-        @XStreamAsAttribute
-        @XStreamAlias("clearingMemberCategory_clearingMemberCategory")
-        private String clearingMemberCategoryClearingMemberCategory;
-
-
-        public Info_0420312_P1(String companyClearingCode,
-                               String liabilitiesClaimsAssetsCompanyId,
-                               String liabilitiesClaimsAssetsFullName,
-                               String companySymbolCode,
-                               String companySymbolValue,
-                               String companyInfoCountryCode,
-                               String clearingMemberCategoryClearingMemberCategory) {
-            this.companyClearingCode = companyClearingCode;
-            this.liabilitiesClaimsAssetsCompanyId = liabilitiesClaimsAssetsCompanyId;
-            this.liabilitiesClaimsAssetsFullName = liabilitiesClaimsAssetsFullName;
-            this.companySymbolCode = companySymbolCode;
-            this.companySymbolValue = companySymbolValue;
-            this.companyInfoCountryCode = companyInfoCountryCode;
-            this.clearingMemberCategoryClearingMemberCategory = clearingMemberCategoryClearingMemberCategory;
-        }
-    }
-
     @Override
     public String getReportName(LocalDateTime reportDateTime) {
         return "REPBR.0420312_р1-1.%s-%s.%s".formatted(
@@ -114,4 +44,15 @@ public class ReportBR_0420312_P1 extends ReportWithPeriod {
         );
     }
 
+    @XStreamAlias("row")
+    public record Info_0420312_P1(
+            @XStreamAsAttribute @XStreamAlias("company_clearingCode") String companyClearingCode,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_companyId") String liabilitiesClaimsAssetsCompanyId,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_fullName") String liabilitiesClaimsAssetsFullName,
+            @XStreamAsAttribute @XStreamAlias("companySymbol_code") String companySymbolCode,
+            @XStreamAsAttribute @XStreamAlias("companySymbol_value") String companySymbolValue,
+            @XStreamAsAttribute @XStreamAlias("companyInfo_countryCode") String companyInfoCountryCode,
+            @XStreamAsAttribute @XStreamAlias("clearingMemberCategory_clearingMemberCategory") String clearingMemberCategoryClearingMemberCategory) {
+    }
+
 }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P10.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P10.java
index b0d7546e8..08a428309 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P10.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P10.java
@@ -2,11 +2,14 @@ package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import ru.spcex.clearing.reports.reports.Destination;
 import ru.spcex.clearing.reports.reports.ReportId;
 import ru.spcex.clearing.reports.reports.ReportWithPeriod;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 @XStreamAlias("clearingCoverage10")
 public class ReportBR_0420312_P10 extends ReportWithPeriod {
@@ -15,32 +18,24 @@ public class ReportBR_0420312_P10 extends ReportWithPeriod {
     private String destination;
 
     @XStreamAlias("rows")
-    private final Info_0420312_P10 part_10;
+    private final List<Info_0420312_P10> rows = new ArrayList<>();
 
     public ReportBR_0420312_P10(LocalDate startDate,
-                                LocalDate endDate,
-                                String destination,
-                                String liabilitiesAmount) {
+                                LocalDate endDate) {
         super(ReportId.BR_0420312_P10,
                 "0.0.5",
                 "0420312",
                 "Сведения о клиринговом обеспечении, часть 10",
                 startDate,
                 endDate);
-        this.destination = destination;
-        part_10 = new Info_0420312_P10(liabilitiesAmount);
+        this.destination = Destination.BR.getKey();
     }
 
-    public static class Info_0420312_P10 {
-        @XStreamAsAttribute
-        @XStreamAlias("liabilities_amount")
-        private String liabilitiesAmount;
-
-        public Info_0420312_P10(String liabilitiesAmount) {
-            this.liabilitiesAmount = liabilitiesAmount;
-        }
+    public List<ReportBR_0420312_P10.Info_0420312_P10> getRows() {
+        return rows;
     }
 
+
     @Override
     public String getReportName(LocalDateTime reportDateTime) {
         return "REPBR.0420312_р3-3.%s-%s.%s".formatted(
@@ -49,4 +44,8 @@ public class ReportBR_0420312_P10 extends ReportWithPeriod {
                 DATE_TIME_FORMATTER.format(reportDateTime)
         );
     }
+
+    public record Info_0420312_P10(
+            @XStreamAsAttribute @XStreamAlias("liabilities_amount") String liabilitiesAmount) {
+    }
 }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P2.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P2.java
index f1531e2ac..22706fb9d 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P2.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P2.java
@@ -2,6 +2,7 @@ package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import ru.spcex.clearing.reports.reports.Destination;
 import ru.spcex.clearing.reports.reports.ReportId;
 import ru.spcex.clearing.reports.reports.ReportWithPeriod;
 
@@ -28,37 +29,7 @@ public class ReportBR_0420312_P2 extends ReportWithPeriod {
                 "Сведения о клиринговом обеспечении, часть 2",
                 startDate,
                 endDate);
-        this.destination = destination;
-    }
-
-    @Deprecated
-    public ReportBR_0420312_P2(LocalDate startDate,
-                               LocalDate endDate,
-                               String destination,
-                               String liabilitiesClaimsAssetsCompanyId,
-                               String liabilitiesClaimsAssetsLiabilities) {
-        this(startDate, endDate, destination);
-        rows.add(new Info_0420312_P2(liabilitiesClaimsAssetsCompanyId, liabilitiesClaimsAssetsLiabilities));
-    }
-
-    public static class Info_0420312_P2 {
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_companyId")
-        private String liabilitiesClaimsAssetsCompanyId;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_liabilities")
-        private String liabilitiesClaimsAssetsLiabilities;
-
-        public Info_0420312_P2(String liabilitiesClaimsAssetsCompanyId,
-                               String liabilitiesClaimsAssetsLiabilities) {
-            this.liabilitiesClaimsAssetsCompanyId = liabilitiesClaimsAssetsCompanyId;
-            this.liabilitiesClaimsAssetsLiabilities = liabilitiesClaimsAssetsLiabilities;
-        }
-    }
-
-    public List<Info_0420312_P2> getRows() {
-        return rows;
+        this.destination = Destination.BR.getKey();
     }
 
     @Override
@@ -70,4 +41,14 @@ public class ReportBR_0420312_P2 extends ReportWithPeriod {
         );
     }
 
+    public List<Info_0420312_P2> getRows() {
+        return rows;
+    }
+
+    @XStreamAlias("row")
+    public record Info_0420312_P2(
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_companyId") String liabilitiesClaimsAssetsCompanyId,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_liabilities") String liabilitiesClaimsAssetsLiabilities) {
+    }
+
 }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P3.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P3.java
index 9fa6c6c8e..4b78a1b87 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P3.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P3.java
@@ -2,6 +2,7 @@ package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import ru.spcex.clearing.reports.reports.Destination;
 import ru.spcex.clearing.reports.reports.ReportId;
 import ru.spcex.clearing.reports.reports.ReportWithPeriod;
 
@@ -28,38 +29,7 @@ public class ReportBR_0420312_P3 extends ReportWithPeriod {
                 "Сведения о клиринговом обеспечении, часть 3",
                 startDate,
                 endDate);
-        this.destination = destination;
-    }
-
-    @Deprecated
-    public ReportBR_0420312_P3(LocalDate startDate,
-                               LocalDate endDate,
-                               String destination,
-                               String liabilitiesClaimsAssetsCompanyId,
-                               String liabilitiesClaimsAssetsLiabilities) {
-        this(startDate, endDate, destination);
-        rows.add(new Info_0420312_P3(liabilitiesClaimsAssetsCompanyId, liabilitiesClaimsAssetsLiabilities));
-    }
-
-    public static class Info_0420312_P3 {
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_companyId")
-        private String liabilitiesClaimsAssetsCompanyId;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_liabilities")
-        private String liabilitiesClaimsAssetsLiabilities;
-
-
-        public Info_0420312_P3(String liabilitiesClaimsAssetsCompanyId,
-                               String liabilitiesClaimsAssetsLiabilities) {
-            this.liabilitiesClaimsAssetsCompanyId = liabilitiesClaimsAssetsCompanyId;
-            this.liabilitiesClaimsAssetsLiabilities = liabilitiesClaimsAssetsLiabilities;
-        }
-    }
-
-    public List<Info_0420312_P3> getRows() {
-        return rows;
+        this.destination = Destination.BR.getKey();
     }
 
     @Override
@@ -70,4 +40,14 @@ public class ReportBR_0420312_P3 extends ReportWithPeriod {
                 DATE_TIME_FORMATTER.format(reportDateTime)
         );
     }
+
+    public List<Info_0420312_P3> getRows() {
+        return rows;
+    }
+
+    @XStreamAlias("row")
+    public record Info_0420312_P3(
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_companyId") String liabilitiesClaimsAssetsCompanyId,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_liabilities") String liabilitiesClaimsAssetsLiabilities) {
+    }
 }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P4.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P4.java
index 89aeb0761..d7aa87a9f 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P4.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P4.java
@@ -2,11 +2,14 @@ package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import ru.spcex.clearing.reports.reports.Destination;
 import ru.spcex.clearing.reports.reports.ReportId;
 import ru.spcex.clearing.reports.reports.ReportWithPeriod;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 @XStreamAlias("clearingCoverage4")
 public class ReportBR_0420312_P4 extends ReportWithPeriod {
@@ -14,31 +17,18 @@ public class ReportBR_0420312_P4 extends ReportWithPeriod {
     @XStreamAlias("destination")
     private String destination;
 
-    @XStreamAlias("part_4")
-    private final Info_0420312_P4 part_4;
+    @XStreamAlias("rows")
+    private final List<Info_0420312_P4> rows = new ArrayList<>();
 
     public ReportBR_0420312_P4(LocalDate startDate,
-                               LocalDate endDate,
-                               String destination,
-                               String liabilitiesAmount) {
+                               LocalDate endDate) {
         super(ReportId.BR_0420312_P4,
                 "0.0.5",
                 "0420312",
                 "Сведения о клиринговом обеспечении, часть 4",
                 startDate,
                 endDate);
-        this.destination = destination;
-        part_4 = new Info_0420312_P4(liabilitiesAmount);
-    }
-
-    public static class Info_0420312_P4 {
-        @XStreamAsAttribute
-        @XStreamAlias("liabilities_amount")
-        private String liabilitiesAmount;
-
-        public Info_0420312_P4(String liabilitiesAmount) {
-            this.liabilitiesAmount = liabilitiesAmount;
-        }
+        this.destination = Destination.BR.getKey();
     }
 
     @Override
@@ -49,4 +39,13 @@ public class ReportBR_0420312_P4 extends ReportWithPeriod {
                 DATE_TIME_FORMATTER.format(reportDateTime)
         );
     }
+
+    public List<Info_0420312_P4> getRows() {
+        return rows;
+    }
+
+    @XStreamAlias("row")
+    public record Info_0420312_P4(
+            @XStreamAsAttribute @XStreamAlias("liabilities_amount") String liabilitiesAmount) {
+    }
 }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P5.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P5.java
index e3117b3b9..9132d81db 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P5.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P5.java
@@ -2,43 +2,34 @@ package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import ru.spcex.clearing.reports.reports.Destination;
 import ru.spcex.clearing.reports.reports.ReportId;
 import ru.spcex.clearing.reports.reports.ReportWithPeriod;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 @XStreamAlias("clearingCoverage5")
 public class ReportBR_0420312_P5 extends ReportWithPeriod {
+
     @XStreamAsAttribute
     @XStreamAlias("destination")
     private String destination;
 
-    @XStreamAlias("part_5")
-    private final Info_0420312_P5 part_5;
+    @XStreamAlias("rows")
+    private final List<Info_0420312_P5> rows = new ArrayList<>();
 
     public ReportBR_0420312_P5(LocalDate startDate,
-                               LocalDate endDate,
-                               String destination,
-                               String liabilitiesAmount) {
+                               LocalDate endDate) {
         super(ReportId.BR_0420312_P5,
                 "0.0.5",
                 "0420312",
                 "Сведения о клиринговом обеспечении, часть 5",
                 startDate,
                 endDate);
-        this.destination = destination;
-        part_5 = new Info_0420312_P5(liabilitiesAmount);
-    }
-
-    public static class Info_0420312_P5 {
-        @XStreamAsAttribute
-        @XStreamAlias("liabilities_amount")
-        private String liabilitiesAmount;
-
-        public Info_0420312_P5(String liabilitiesAmount) {
-            this.liabilitiesAmount = liabilitiesAmount;
-        }
+        this.destination = Destination.BR.getKey();
     }
 
     @Override
@@ -49,4 +40,14 @@ public class ReportBR_0420312_P5 extends ReportWithPeriod {
                 DATE_TIME_FORMATTER.format(reportDateTime)
         );
     }
+
+    public List<Info_0420312_P5> getRows() {
+        return rows;
+    }
+
+
+    @XStreamAlias("row")
+    public record Info_0420312_P5(
+            @XStreamAsAttribute @XStreamAlias("liabilities_amount") String liabilitiesAmount) {
+    }
 }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P6.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P6.java
index 997a7243b..00a273649 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P6.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P6.java
@@ -2,11 +2,14 @@ package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import ru.spcex.clearing.reports.reports.Destination;
 import ru.spcex.clearing.reports.reports.ReportId;
 import ru.spcex.clearing.reports.reports.ReportWithPeriod;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 @XStreamAlias("clearingCoverage6")
 public class ReportBR_0420312_P6 extends ReportWithPeriod {
@@ -14,31 +17,18 @@ public class ReportBR_0420312_P6 extends ReportWithPeriod {
     @XStreamAlias("destination")
     private String destination;
 
-    @XStreamAlias("part_6")
-    private final Info_0420312_P6 part_6;
+    @XStreamAlias("rows")
+    private final List<Info_0420312_P6> rows = new ArrayList<>();
 
     public ReportBR_0420312_P6(LocalDate startDate,
-                               LocalDate endDate,
-                               String destination,
-                               String liabilitiesAmount) {
+                               LocalDate endDate) {
         super(ReportId.BR_0420312_P6,
                 "0.0.5",
                 "0420312",
                 "Сведения о клиринговом обеспечении, часть 6",
                 startDate,
                 endDate);
-        this.destination = destination;
-        part_6 = new Info_0420312_P6(liabilitiesAmount);
-    }
-
-    public static class Info_0420312_P6 {
-        @XStreamAsAttribute
-        @XStreamAlias("liabilities_amount")
-        private String liabilitiesAmount;
-
-        public Info_0420312_P6(String liabilitiesAmount) {
-            this.liabilitiesAmount = liabilitiesAmount;
-        }
+        this.destination = Destination.BR.getKey();
     }
 
     @Override
@@ -49,4 +39,13 @@ public class ReportBR_0420312_P6 extends ReportWithPeriod {
                 DATE_TIME_FORMATTER.format(reportDateTime)
         );
     }
+
+    public List<Info_0420312_P6> getRows() {
+        return rows;
+    }
+
+    @XStreamAlias("row")
+    public record Info_0420312_P6(
+            @XStreamAsAttribute @XStreamAlias("liabilities_amount") String liabilitiesAmount) {
+    }
 }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P7.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P7.java
index 5c7e6523b..c22ddc714 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P7.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P7.java
@@ -7,6 +7,8 @@ import ru.spcex.clearing.reports.reports.ReportWithPeriod;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 @XStreamAlias("clearingCoverage7")
 public class ReportBR_0420312_P7 extends ReportWithPeriod {
@@ -14,13 +16,12 @@ public class ReportBR_0420312_P7 extends ReportWithPeriod {
     @XStreamAlias("destination")
     private String destination;
 
-    @XStreamAlias("part_7")
-    private final Info_0420312_P7 part_7;
+    @XStreamAlias("rows")
+    private final List<Info_0420312_P7> rows = new ArrayList<>();
 
     public ReportBR_0420312_P7(LocalDate startDate,
                                LocalDate endDate,
-                               String destination,
-                               String liabilitiesAmount) {
+                               String destination) {
         super(ReportId.BR_0420312_P7,
                 "0.0.5",
                 "0420312",
@@ -28,17 +29,6 @@ public class ReportBR_0420312_P7 extends ReportWithPeriod {
                 startDate,
                 endDate);
         this.destination = destination;
-        part_7 = new Info_0420312_P7(liabilitiesAmount);
-    }
-
-    public static class Info_0420312_P7 {
-        @XStreamAsAttribute
-        @XStreamAlias("liabilities_amount")
-        private String liabilitiesAmount;
-
-        public Info_0420312_P7(String liabilitiesAmount) {
-            this.liabilitiesAmount = liabilitiesAmount;
-        }
     }
 
     @Override
@@ -49,4 +39,13 @@ public class ReportBR_0420312_P7 extends ReportWithPeriod {
                 DATE_TIME_FORMATTER.format(reportDateTime)
         );
     }
+
+    public List<Info_0420312_P7> getRows() {
+        return rows;
+    }
+
+    @XStreamAlias("row")
+    public record Info_0420312_P7(
+            @XStreamAsAttribute @XStreamAlias("liabilities_amount") String liabilitiesAmount) {
+    }
 }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P8.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P8.java
index 2568023af..eff2fb7a7 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P8.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P8.java
@@ -2,6 +2,7 @@ package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import ru.spcex.clearing.reports.reports.Destination;
 import ru.spcex.clearing.reports.reports.ReportId;
 import ru.spcex.clearing.reports.reports.ReportWithPeriod;
 
@@ -19,84 +20,15 @@ public class ReportBR_0420312_P8 extends ReportWithPeriod {
     @XStreamAlias("rows")
     private final List<Info_0420312_P8> rows = new ArrayList<>();
 
-
     public ReportBR_0420312_P8(LocalDate startDate,
-                               LocalDate endDate,
-                               String destination) {
+                               LocalDate endDate) {
         super(ReportId.BR_0420312_P8,
                 "0.0.5",
                 "0420312",
                 "Сведения о клиринговом обеспечении, часть 8",
                 startDate,
                 endDate);
-        this.destination = destination;
-    }
-
-    @Deprecated
-    public ReportBR_0420312_P8(LocalDate startDate,
-                               LocalDate endDate,
-                               String destination,
-                               String currencyId,
-                               String liabilitiesClaimsAssetsCompanyId,
-                               String liabilitiesClaimsAssetsFullName,
-                               String companySymbolCode,
-                               String companySymbolValue,
-                               String companyInfoCountryCode,
-                               String clearingMemberCategoryClearingMemberCategory) {
-        this(startDate, endDate, destination);
-        rows.add(new Info_0420312_P8(currencyId,
-                liabilitiesClaimsAssetsCompanyId,
-                liabilitiesClaimsAssetsFullName,
-                companySymbolCode,
-                companySymbolValue,
-                companyInfoCountryCode,
-                clearingMemberCategoryClearingMemberCategory));
-    }
-
-    public static class Info_0420312_P8 {
-        @XStreamAsAttribute
-        @XStreamAlias("currency_id")
-        private String currencyId;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_companyId")
-        private String liabilitiesClaimsAssetsCompanyId;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_fullName")
-        private String liabilitiesClaimsAssetsFullName;
-
-        @XStreamAsAttribute
-        @XStreamAlias("companySymbol_code")
-        private String companySymbolCode;
-
-        @XStreamAsAttribute
-        @XStreamAlias("companySymbol_value")
-        private String companySymbolValue;
-
-        @XStreamAsAttribute
-        @XStreamAlias("companyInfo_countryCode")
-        private String companyInfoCountryCode;
-
-        @XStreamAsAttribute
-        @XStreamAlias("clearingMemberCategory_clearingMemberCategory")
-        private String clearingMemberCategoryClearingMemberCategory;
-
-        public Info_0420312_P8(String currencyId,
-                               String liabilitiesClaimsAssetsCompanyId,
-                               String liabilitiesClaimsAssetsFullName,
-                               String companySymbolCode,
-                               String companySymbolValue,
-                               String companyInfoCountryCode,
-                               String clearingMemberCategoryClearingMemberCategory) {
-            this.currencyId = currencyId;
-            this.liabilitiesClaimsAssetsCompanyId = liabilitiesClaimsAssetsCompanyId;
-            this.liabilitiesClaimsAssetsFullName = liabilitiesClaimsAssetsFullName;
-            this.companySymbolCode = companySymbolCode;
-            this.companySymbolValue = companySymbolValue;
-            this.companyInfoCountryCode = companyInfoCountryCode;
-            this.clearingMemberCategoryClearingMemberCategory = clearingMemberCategoryClearingMemberCategory;
-        }
+        this.destination = Destination.BR.getKey();
     }
 
     public List<Info_0420312_P8> getRows() {
@@ -111,4 +43,16 @@ public class ReportBR_0420312_P8 extends ReportWithPeriod {
                 DATE_TIME_FORMATTER.format(reportDateTime)
         );
     }
+
+    @XStreamAlias("row")
+    public record Info_0420312_P8(
+            @XStreamAsAttribute @XStreamAlias("currency_id") String currencyId,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_companyId") String liabilitiesClaimsAssetsCompanyId,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_fullName") String liabilitiesClaimsAssetsFullName,
+            @XStreamAsAttribute @XStreamAlias("companySymbol_code") String companySymbolCode,
+            @XStreamAsAttribute @XStreamAlias("companySymbol_value") String companySymbolValue,
+            @XStreamAsAttribute @XStreamAlias("companyInfo_countryCode") String companyInfoCountryCode,
+            @XStreamAsAttribute @XStreamAlias("clearingMemberCategory_clearingMemberCategory") String clearingMemberCategoryClearingMemberCategory
+    ) {
+    }
 }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P9.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P9.java
index 8a7cc05f6..92c5e7f68 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P9.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P9.java
@@ -2,6 +2,7 @@ package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import ru.spcex.clearing.reports.reports.Destination;
 import ru.spcex.clearing.reports.reports.ReportId;
 import ru.spcex.clearing.reports.reports.ReportWithPeriod;
 
@@ -19,60 +20,15 @@ public class ReportBR_0420312_P9 extends ReportWithPeriod {
     @XStreamAlias("rows")
     private final List<Info_0420312_P9> rows = new ArrayList<>();
 
-
     public ReportBR_0420312_P9(LocalDate startDate,
-                               LocalDate endDate,
-                               String destination) {
+                               LocalDate endDate) {
         super(ReportId.BR_0420312_P9,
                 "0.0.5",
                 "0420312",
                 "Сведения о клиринговом обеспечении, часть 9",
                 startDate,
                 endDate);
-        this.destination = destination;
-    }
-    @Deprecated
-    public ReportBR_0420312_P9(LocalDate startDate,
-                               LocalDate endDate,
-                               String destination,
-                               String currencyId,
-                               String liabilitiesClaimsAssetsCompanyId,
-                               String liabilitiesClaimsMoneyCurrencyCode,
-                               String liabilitiesClaimsAssetsLiabilities) {
-        this(startDate,
-                endDate, destination);
-        rows.add( new Info_0420312_P9(currencyId,
-                liabilitiesClaimsAssetsCompanyId,
-                liabilitiesClaimsMoneyCurrencyCode,
-                liabilitiesClaimsAssetsLiabilities));
-    }
-
-    public static class Info_0420312_P9 {
-        @XStreamAsAttribute
-        @XStreamAlias("currency_id")
-        private String currencyId;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_companyId")
-        private String liabilitiesClaimsAssetsCompanyId;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsMoney_currencyCode")
-        private String liabilitiesClaimsMoneyCurrencyCode;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_liabilities")
-        private String liabilitiesClaimsAssetsLiabilities;
-
-        public Info_0420312_P9(String currencyId,
-                               String liabilitiesClaimsAssetsCompanyId,
-                               String liabilitiesClaimsMoneyCurrencyCode,
-                               String liabilitiesClaimsAssetsLiabilities) {
-            this.currencyId = currencyId;
-            this.liabilitiesClaimsAssetsCompanyId = liabilitiesClaimsAssetsCompanyId;
-            this.liabilitiesClaimsMoneyCurrencyCode = liabilitiesClaimsMoneyCurrencyCode;
-            this.liabilitiesClaimsAssetsLiabilities = liabilitiesClaimsAssetsLiabilities;
-        }
+        this.destination = Destination.BR.getKey();
     }
 
     public List<Info_0420312_P9> getRows() {
@@ -87,4 +43,12 @@ public class ReportBR_0420312_P9 extends ReportWithPeriod {
                 DATE_TIME_FORMATTER.format(reportDateTime)
         );
     }
+
+    public record Info_0420312_P9(
+            @XStreamAsAttribute @XStreamAlias("currency_id") String currencyId,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_companyId") String liabilitiesClaimsAssetsCompanyId,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsMoney_currencyCode") String liabilitiesClaimsMoneyCurrencyCode,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_liabilities") String liabilitiesClaimsAssetsLiabilities
+    ) {
+    }
 }