diff --git a/documentation.swagger.json b/documentation.swagger.json
index 4991601..79c962e 100644
--- a/documentation.swagger.json
+++ b/documentation.swagger.json
@@ -11,7 +11,7 @@
   ],
   "swagger": "2.0",
   "info": {
-    "title": "service/accountBalance.proto",
+    "title": "service/account.proto",
     "version": "version not set"
   },
   "paths": {
@@ -504,6 +504,11 @@
             "description": "Transactions set offset to be fetched.",
             "name": "Offset",
             "in": "query"
+          },
+          {
+            "type": "string",
+            "name": "AccountAddress",
+            "in": "query"
           }
         ],
         "responses": {
@@ -874,6 +879,14 @@
           "type": "string",
           "format": "int64"
         },
+        "RecipientAccountID": {
+          "type": "string",
+          "format": "byte"
+        },
+        "SenderAccountID": {
+          "type": "string",
+          "format": "byte"
+        },
         "TransactionBytes": {
           "type": "string",
           "format": "byte"
diff --git a/model/transaction.proto b/model/transaction.proto
index 504779f..8f27fd9 100644
--- a/model/transaction.proto
+++ b/model/transaction.proto
@@ -69,27 +69,25 @@ message ProofOfOwnershipMessage {
     uint32 BlockHeight = 4;
 }
 
+
+//------------
+// P2P Content
+//------------
+
+// GetTransactionRequest return model.Transaction
 message GetTransactionRequest {
     // Fetch Transaction by its ID
     int64 ID = 1;
 }
 
+// GetTransactions return GetTransactionsResponse
 message GetTransactionsRequest {
     // Transactions set limit to be fetched
     uint32 Limit = 1;
     // Transactions set offset to be fetched
     uint64 Offset = 2;
+    string AccountAddress = 3;
 }
-
-message PostTransactionRequest {
-    // Signed transaction bytes
-    bytes TransactionBytes = 1;
-}
-
-message PostTransactionResponse {
-    Transaction Transaction = 1;
-}
-
 message GetTransactionsResponse {
     // Number of transactions in total
     uint64 Total = 1;
@@ -99,14 +97,17 @@ message GetTransactionsResponse {
     repeated Transaction Transactions = 3;
 }
 
-// SendTransaction request in p2pCommunication service
-message SendTransactionRequest {
+// PostTransactionRequest return PostTransactionResponse
+message PostTransactionRequest {
+    // Signed transaction bytes
     bytes TransactionBytes = 1;
 }
+message PostTransactionResponse {
+    Transaction Transaction = 1;
+}
 
-// TODO: Currently not yet used. Should we delete it?
-message PostUnconfirmedTransactionRequest {
-	Transaction      Transaction = 1;
-	uint32 ArrivalTimestamp = 2;
-	int64 FeePerByte = 3;
+// SendTransactionRequest request in p2pCommunication service
+message SendTransactionRequest {
+    bytes TransactionBytes = 1;
 }
+