diff --git a/bin/proof-generator/include/nil/proof-generator/prover.hpp b/bin/proof-generator/include/nil/proof-generator/prover.hpp
index b84b9c48..40217bfe 100644
--- a/bin/proof-generator/include/nil/proof-generator/prover.hpp
+++ b/bin/proof-generator/include/nil/proof-generator/prover.hpp
@@ -101,22 +101,16 @@ namespace nil {
             }
 
             template<typename FRIScheme, typename FieldType>
-            typename FRIScheme::params_type create_fri_params(std::size_t degree_log, const int max_step = 1) {
-                typename FRIScheme::params_type params;
-                nil::crypto3::math::polynomial<typename FieldType::value_type> q = {0, 0, 1};
-
-                constexpr std::size_t expand_factor = 0;
+            typename FRIScheme::params_type create_fri_params(
+                    std::size_t degree_log, const int max_step = 1, std::size_t expand_factor = 0) {
                 std::size_t r = degree_log - 1;
 
-                std::vector<std::shared_ptr<nil::crypto3::math::evaluation_domain<FieldType>>> domain_set =
-                    nil::crypto3::math::calculate_domain_set<FieldType>(degree_log + expand_factor, r);
-
-                params.r = r;
-                params.D = domain_set;
-                params.max_degree = (1 << degree_log) - 1;
-                params.step_list = generate_random_step_list(r, max_step);
-
-                return params;
+                return typename FRIScheme::params_type(
+                    (1 << degree_log) - 1, // max_degree
+                    nil::crypto3::math::calculate_domain_set<FieldType>(degree_log + expand_factor, r),
+                    generate_random_step_list(r, max_step),
+                    expand_factor
+                );
             }
         
         }    // namespace detail
@@ -126,8 +120,8 @@ namespace nil {
             using BlueprintFieldType = typename curve_type::base_field_type;
             constexpr std::size_t WitnessColumns = 15;
             constexpr std::size_t PublicInputColumns = 1;
-            constexpr std::size_t ConstantColumns = 5;
-            constexpr std::size_t SelectorColumns = 35;
+            constexpr std::size_t ConstantColumns = 35;
+            constexpr std::size_t SelectorColumns = 36;
 
             using ArithmetizationParams =
                 nil::crypto3::zk::snark::plonk_arithmetization_params<WitnessColumns, PublicInputColumns, ConstantColumns,
diff --git a/libs/crypto3 b/libs/crypto3
index 368e3121..db4c84fe 160000
--- a/libs/crypto3
+++ b/libs/crypto3
@@ -1 +1 @@
-Subproject commit 368e31213835ee2afd5f614e95e45d737ca265a8
+Subproject commit db4c84fe87e909735dd6e76c12e324f5415f15f3