diff --git a/app/src/substrate/substrate_dispatch_V3.c b/app/src/substrate/substrate_dispatch_V3.c
index 8dad271..a94c77a 100644
--- a/app/src/substrate/substrate_dispatch_V3.c
+++ b/app/src/substrate/substrate_dispatch_V3.c
@@ -64,7 +64,7 @@ __Z_INLINE parser_error_t _readMethod_balances_transfer_V3(
 }
 
 __Z_INLINE parser_error_t _readMethod_fueltanks_add_account_V3(
-        parser_context_t* c, pd_fueltanks_add_acount_V3_t* m)
+        parser_context_t* c, pd_fueltanks_add_account_V3_t* m)
 {
     CHECK_ERROR(_readAccountIdLookupOfT(c, &m->tank_id))
     CHECK_ERROR(_readAccountIdLookupOfT(c, &m->user_id))
@@ -153,7 +153,7 @@ __Z_INLINE parser_error_t _readMethod_fueltanks_insert_rule_set_V3(
 {
     CHECK_ERROR(_readAccountIdLookupOfT(c, &m->tank_id))
     CHECK_ERROR(_readu32(c, &m->rule_set_id))
-    CHECK_ERROR(_readVecRuleDescriptorsOf(c, &m->rules))
+    CHECK_ERROR(_readVecDispatchRuleDescriptor(c, &m->rules))
     return parser_ok;
 }
 
@@ -161,7 +161,7 @@ __Z_INLINE parser_error_t _readMethod_fueltanks_mutate_fuel_tank_V3(
         parser_context_t* c, pd_fueltanks_mutate_fuel_tank_V3_t* m)
 {
     CHECK_ERROR(_readAccountIdLookupOfT(c, &m->tank_id))
-    CHECK_ERROR(_readDefaultTankMutation(c, &m->mutation))
+    CHECK_ERROR(_readFuelTankMutationOf(c, &m->mutation))
     return parser_ok;
 }
 
diff --git a/app/src/substrate/substrate_functions.h b/app/src/substrate/substrate_functions.h
index dce45dd..3d965ec 100644
--- a/app/src/substrate/substrate_functions.h
+++ b/app/src/substrate/substrate_functions.h
@@ -206,6 +206,13 @@ parser_error_t _readOptionAccountIdLookupOfT(parser_context_t* c, pd_OptionAccou
 parser_error_t _readBurnParamsOfT(parser_context_t* c, pd_BurnParamsOfT_t * v);
 parser_error_t _readVecu32(parser_context_t* c, pd_Vecu32_t* v);
 parser_error_t _readVecu8(parser_context_t* c, pd_Vecu8_t* v);
+parser_error_t _readFuelTankDescriptorOf(parser_context_t* c, pd_FuelTankDescriptorOf_t* v);
+parser_error_t _readOptionDispatchSettings(parser_context_t* c, pd_OptionDispatchSettings_t* v);
+parser_error_t _readConsumptionOf(parser_context_t* c, pd_ConsumptionOf_t* v);
+parser_error_t _readVecDispatchRuleDescriptor(parser_context_t* c, pd_VecDispatchRuleDescriptor_t* v);
+parser_error_t _readFuelTankMutationOf(parser_context_t* c, pd_FuelTankMutationOf_t* v);
+parser_error_t _readDispatchRuleKind(parser_context_t* c, pd_DispatchRuleKind_t* v);
+
 
 // Common toString functions
 
diff --git a/app/src/substrate/substrate_methods_V3.h b/app/src/substrate/substrate_methods_V3.h
index 6017676..0f1926b 100644
--- a/app/src/substrate/substrate_methods_V3.h
+++ b/app/src/substrate/substrate_methods_V3.h
@@ -75,13 +75,13 @@ typedef struct {
 #define PD_CALL_FUELTANKS_BATCH_ADD_ACCOUNT_V3 10
 typedef struct {
     pd_AccountIdLookupOfT_t tank_id;
-    pd_AccountIdLookupOfT_t user_ids;
+    pd_VecAccountIdLookupOfT_t user_ids;
 } pd_fueltanks_batch_add_account_V3_t;
 
 #define PD_CALL_FUELTANKS_BATCH_REMOVE_ACCOUNT_V3 11
 typedef struct {
     pd_AccountIdLookupOfT_t tank_id;
-    pd_AccountIdLookupOfT_t user_ids;
+    pd_VecAccountIdLookupOfT_t user_ids;
 } pd_fueltanks_batch_remove_account_V3_t;
 
 #define PD_CALL_FUELTANKS_CREATE_FUEL_TANK_V3 0
@@ -99,7 +99,7 @@ typedef struct {
     pd_AccountIdLookupOfT_t tank_id;
     pd_u32_t rule_set_id;
     pd_Call_t call;
-    pd_OptionDispatchSettings settings;
+    pd_OptionDispatchSettings_t settings;
 } pd_fueltanks_dispatch_V3_t;
 
 #define PD_CALL_FUELTANKS_DISPATCH_AND_TOUCH_V3 6
@@ -107,14 +107,14 @@ typedef struct {
     pd_AccountIdLookupOfT_t tank_id;
     pd_u32_t rule_set_id;
     pd_Call_t call;
-    pd_OptionDispatchSettings settings;
+    pd_OptionDispatchSettings_t settings;
 } pd_fueltanks_dispatch_and_touch_V3_t;
 
 #define PD_CALL_FUELTANKS_FORCE_BATCH_ADD_ACCOUNT_V3 15
 typedef struct {
     pd_AccountIdLookupOfT_t owner;
     pd_AccountIdLookupOfT_t tank_id;
-    pd_AccountIdLookupOfT_t user_ids;
+    pd_VecAccountIdLookupOfT_t user_ids;
 } pd_fueltanks_force_batch_add_account_V3_t;
 
 #define PD_CALL_FUELTANKS_FORCE_CREATE_FUEL_TANK_V3 14
@@ -126,7 +126,7 @@ typedef struct {
 #define PD_CALL_FUELTANKS_FORCE_SET_CONSUMPTION_V3 12
 typedef struct {
     pd_AccountIdLookupOfT_t tank_id;
-    pd_AccountIdLookupOfT_t user_id;
+    pd_OptionAccountIdLookupOfT_t user_id;
     pd_u32_t rule_set_id;
     pd_ConsumptionOf_t consumption;
 } pd_fueltanks_force_set_consumption_V3_t;
@@ -135,7 +135,7 @@ typedef struct {
 typedef struct {
     pd_AccountIdLookupOfT_t tank_id;
     pd_u32_t rule_set_id;
-    pd_RuleSetOf_t rules;
+    pd_VecDispatchRuleDescriptor_t rules;
 } pd_fueltanks_insert_rule_set_V3_t;
 
 #define PD_CALL_FUELTANKS_MUTATE_FUEL_TANKS_V3 1
diff --git a/app/src/substrate/substrate_types.c b/app/src/substrate/substrate_types.c
index e5a9d31..4c70ae6 100644
--- a/app/src/substrate/substrate_types.c
+++ b/app/src/substrate/substrate_types.c
@@ -2520,6 +2520,31 @@ parser_error_t _readTokenIdOf(parser_context_t* c, pd_TokenIdOf_t* v)
     return _readTokenId(c, &v->value);
 }
 
+parser_error_t _readFuelTankDescriptorOf(parser_context_t* c, pd_FuelTankDescriptorOf_t* v)
+{
+}
+
+parser_error_t _readOptionDispatchSettings(parser_context_t* c, pd_OptionDispatchSettings_t* v)
+{
+}
+
+parser_error_t _readConsumptionOf(parser_context_t* c, pd_ConsumptionOf_t* v)
+{
+}
+
+parser_error_t _readVecDispatchRuleDescriptor(parser_context_t* c, pd_VecDispatchRuleDescriptor_t* v)
+{
+}
+
+parser_error_t _readFuelTankMutationOf(parser_context_t* c, pd_FuelTankMutationOf_t* v)
+{
+}
+
+parser_error_t _readDispatchRuleKind(parser_context_t* c, pd_DispatchRuleKind_t* v)
+{
+}
+
+
 ///////////////////////////////////
 ///////////////////////////////////
 ///////////////////////////////////
diff --git a/app/src/substrate/substrate_types.h b/app/src/substrate/substrate_types.h
index 76cb3a3..aaf801a 100644
--- a/app/src/substrate/substrate_types.h
+++ b/app/src/substrate/substrate_types.h
@@ -787,6 +787,11 @@ typedef struct {
     pd_u128_t value;
 } pd_TokenId_t;
 
+typedef struct {
+    uint8_t some;
+    pd_bool_t contained;
+} pd_Optionbool_t;
+
 typedef struct {
     pd_CompactTokenId_t tokenId;
     pd_Compactu128_t amount;
@@ -1179,6 +1184,77 @@ typedef struct {
     pd_bool_t isFrozen;
 } pd_TokenAccountOf_t;
 
+typedef struct {
+    uint8_t value;
+} pd_DispatchRuleKind_t;
+
+typedef struct {
+    pd_bool_t tankReservesExistentialDeposit;
+    pd_bool_t tankReservesAccountCreationDeposit;
+} pd_UserAccountManagement_t;
+
+typedef struct {
+    uint8_t some;
+    pd_UserAccountManagement_t contained;
+} pd_OptionUserAccountManagement_t;
+
+typedef struct {
+    uint64_t _len;
+    const uint8_t* _ptr;
+    uint64_t _lenBuffer;
+} pd_VecRulesAccountRuleDescriptor_t;
+
+typedef struct {
+    pd_Bytes_t name;
+    pd_OptionUserAccountManagement_t userAccountManagement;
+    pd_Bytes_t ruleSets;
+    pd_bool_t providesDeposit;
+    pd_VecRulesAccountRuleDescriptor_t accountRules;
+} pd_FuelTankDescriptorOf_t;
+
+typedef struct {
+    pd_bool_t useNoneOrigin;
+    pd_bool_t paysRemainingFee;
+} pd_DispatchSettings_t;
+
+typedef struct {
+    uint8_t some;
+    pd_DispatchSettings_t contained;
+} pd_OptionDispatchSettings_t;
+
+typedef struct {
+    pd_Compactu128_t totalConsumed;
+    pd_Optionu32_t lastResetBlock;
+} pd_ConsumptionOf_t;
+
+typedef struct {
+    uint8_t value;
+    pd_OptionUserAccountManagement_t set;
+} pd_ShouldMutateOption_t;
+
+typedef struct {
+    uint64_t _len;
+    const uint8_t* _ptr;
+    uint64_t _lenBuffer;
+} pd_VecAccountRuleDescriptor_t;
+
+typedef struct {
+    uint64_t _len;
+    const uint8_t* _ptr;
+    uint64_t _lenBuffer;
+} pd_VecDispatchRuleDescriptor_t;
+
+typedef struct {
+    uint8_t some;
+    pd_VecAccountRuleDescriptor_t contained;
+} pd_OptionVecAccountRuleDescriptor_t;
+
+typedef struct {
+    pd_ShouldMutateOption_t userAccountManagement;
+    pd_Optionbool_t providesDeposit;
+    pd_OptionVecAccountRuleDescriptor_t accountRules;
+} pd_FuelTankMutationOf_t;
+
 typedef struct {
     uint8_t some;
     pd_TokenAccountOf_t contained;