diff --git a/proto/mycel/registry/second_level_domain.proto b/proto/mycel/registry/second_level_domain.proto
index ed5397ee..8a2e8b03 100644
--- a/proto/mycel/registry/second_level_domain.proto
+++ b/proto/mycel/registry/second_level_domain.proto
@@ -41,5 +41,5 @@ message SecondLevelDomain {
     (gogoproto.nullable) = false
   ];
   map<string, Record> records = 5;
-  map<string, DomainRole> accessControl = 6;
+  repeated DomainRole accessControl = 6;
 }
diff --git a/proto/mycel/registry/subdomain_config.proto b/proto/mycel/registry/subdomain_config.proto
index df8b388e..8669d095 100644
--- a/proto/mycel/registry/subdomain_config.proto
+++ b/proto/mycel/registry/subdomain_config.proto
@@ -2,21 +2,32 @@ syntax = "proto3";
 package mycel.registry;
 
 import "cosmos/base/v1beta1/coin.proto";
+import "mycel/registry/role.proto";
 
 option go_package = "github.com/mycel-domain/mycel/x/registry/types";
 
 message SubdomainRegistrationFees {
-  map<uint32, Fee> feeByLength = 1;
-  map<string, Fee> feeByName = 2;
+  repeated FeeByLength feeByLength = 1;
+  repeated FeeByName feeByName = 2;
   cosmos.base.v1beta1.Coin defaultFee = 3;
 }
 
-message Fee {
-  bool isRegistrable = 1;
-  cosmos.base.v1beta1.Coin fee = 2;
+message FeeByLength {
+  uint32 length = 1;
+  bool isRegistrable = 2;
+  cosmos.base.v1beta1.Coin fee = 3;
+}
+
+message FeeByName {
+  string name = 1;
+  bool isRegistrable = 2;
+  cosmos.base.v1beta1.Coin fee = 3;
 }
 
 message SubdomainConfig {
   uint64 maxSubdomainRegistrations = 1;
   SubdomainRegistrationFees subdomainRegistrationFees = 2;
+  bool isRegistrable = 3;
+  DomainRole registrableRole = 4;
+  bool customExpirationDate = 5;
 }
diff --git a/proto/mycel/registry/top_level_domain.proto b/proto/mycel/registry/top_level_domain.proto
index 7c9e4887..6741e9b7 100644
--- a/proto/mycel/registry/top_level_domain.proto
+++ b/proto/mycel/registry/top_level_domain.proto
@@ -15,11 +15,10 @@ message TopLevelDomain {
     (gogoproto.stdtime) = true,
     (gogoproto.nullable) = false
   ];
-  map<string, string> metadata = 3;
-  SubdomainConfig subdomainConfig = 4;
-  uint64 subdomainCount = 5;
-  map<string, DomainRole> accessControl = 6;
-  repeated cosmos.base.v1beta1.Coin totalWithdrawalAmount = 7 [
+  SubdomainConfig subdomainConfig = 3;
+  uint64 subdomainCount = 4;
+  repeated DomainRole accessControl = 5;
+  repeated cosmos.base.v1beta1.Coin totalWithdrawalAmount = 6 [
     (gogoproto.nullable) = false,
     (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
   ];