diff --git a/documentation.swagger.json b/documentation.swagger.json
index f0fd2da..d2c6a60 100644
--- a/documentation.swagger.json
+++ b/documentation.swagger.json
@@ -483,7 +483,7 @@
       "properties": {
         "AccountType": {
           "type": "integer",
-          "format": "int32"
+          "format": "int64"
         },
         "Address": {
           "type": "string"
@@ -800,15 +800,15 @@
           "type": "string"
         },
         "RecipientAccountType": {
-          "type": "string",
-          "format": "byte"
+          "type": "integer",
+          "format": "int64"
         },
         "SenderAccountAddress": {
           "type": "string"
         },
         "SenderAccountType": {
-          "type": "string",
-          "format": "byte"
+          "type": "integer",
+          "format": "int64"
         },
         "Signature": {
           "type": "string",
@@ -835,8 +835,8 @@
           "format": "int64"
         },
         "Version": {
-          "type": "string",
-          "format": "byte"
+          "type": "integer",
+          "format": "int64"
         },
         "emptyTransactionBody": {
           "$ref": "#/definitions/modelEmptyTransactionBody"
diff --git a/model/account.proto b/model/account.proto
index 51a0654..a1973d7 100644
--- a/model/account.proto
+++ b/model/account.proto
@@ -7,7 +7,7 @@ option go_package = "github.com/zoobc/zoobc-core/common/model";
 // Account represent the transaction data structure stored in the database
 message Account {
     bytes ID = 1;
-    int32 AccountType = 2;
+    uint32 AccountType = 2;
     string Address = 3;
 }
 
diff --git a/model/transaction.proto b/model/transaction.proto
index 3f36a8e..19ac2ae 100644
--- a/model/transaction.proto
+++ b/model/transaction.proto
@@ -6,13 +6,13 @@ option go_package = "github.com/zoobc/zoobc-core/common/model";
 
 // Transaction represent the transaction data structure stored in the database
 message Transaction {
-    bytes Version = 1;
+    uint32 Version = 1;
     bytes ID = 2;
     int64 BlockID = 3;
     uint32 Height = 4;
-    bytes SenderAccountType = 5;
+    uint32 SenderAccountType = 5;
     string SenderAccountAddress = 6;
-    bytes RecipientAccountType = 7;
+    uint32 RecipientAccountType = 7;
     string RecipientAccountAddress = 8;
     uint32 TransactionType = 9;
     int64 Fee = 10;