diff --git a/market/v1/msg.proto b/market/v1/msg.proto
index ca5d25d..a803b2f 100644
--- a/market/v1/msg.proto
+++ b/market/v1/msg.proto
@@ -16,7 +16,7 @@ message MarketOrder {
   double amount = 5;
   double unit_price = 6;
   double total_price = 7;
-  MarketOrderType type = 8;
+  MarketOrderSide side = 8;
   MarketOrderStatus status = 9;
   int64 from = 10;
   float commission = 11;
@@ -58,27 +58,17 @@ message MarketOrderList {
   repeated MarketOrder list = 1;
 }
 
-message Buyer {}
-message Seller {}
-// message CancelOrderReq{
-//   uint64 order_id = 1;
-// }
-// message NewMarketRes{
-//   uint64 order_id = 1;
-//   wallet.v1.Asset asset = 2;
-//   double amount = 3;
-//   double unit_price = 4;
-// }
 message NewMarketReq{
   auth.v1.InternalIAM iam = 1;
   wallet.v1.Asset asset = 2;
   double amount = 3;
   double unit_price = 4;
-  auth.v1.TFA tfa = 5;
-  bool accepted_contract = 6;
+  MarketOrderSide side = 5;
+  auth.v1.TFA tfa = 6;
+  bool accepted_contract = 7;
 }
 
-enum MarketOrderType {
+enum MarketOrderSide {
   MO_UNKOWN = 0;
   MO_BUY = 1;
   MO_SELL = 2;
@@ -93,9 +83,10 @@ enum MarketOrderStatus {
   // MO_EXPIRED = 4; // Order is expired
 }
 message OrderListFilter {
+  optional auth.v1.InternalIAM iam = 1;
   base.v1.BaseQueryParam base = 2;
   optional string search = 3;
-  repeated MarketOrderType type = 4;
+  repeated MarketOrderSide side = 4;
   repeated MarketOrderStatus status = 5;
   repeated string from = 6;
   repeated string to = 7;
@@ -106,7 +97,3 @@ message OrderListFilter {
   uint64 trx_id = 12;
 }
 
-message OrderListFilterWithIAM {
-  OrderListFilter filter = 1;
-  auth.v1.InternalIAM iam = 2;
-}
diff --git a/market/v1/srv.proto b/market/v1/srv.proto
index eb4c9ce..daa09bf 100644
--- a/market/v1/srv.proto
+++ b/market/v1/srv.proto
@@ -12,19 +12,15 @@ service MarketplaceSrv {
 
   rpc GetMarketAssetList(MarketAssetListReq) returns (MarketAssetList); //  assets that can be listed in marketplace
 
-  rpc GetSellerList(OrderListFilter) returns (MarketOrderList); //  list of orders by sellers
-  rpc GetBuyerList(OrderListFilter) returns (MarketOrderList); //  list of orders by buyers
-
-  rpc NewSellOrder(NewMarketReq) returns (MarketOrder); // insert new sell order to market
-  rpc NewBuyOrder(NewMarketReq) returns (MarketOrder); // insert new buy order to market
+  rpc NewMarketOrder(NewMarketReq) returns (MarketOrder); // insert new buy order to market
 
   rpc Purchace(PurchaseReq) returns (PurchaseRes); // purchase from an order
 
   rpc CancelOrder(auth.v1.IdReqWithIAM) returns (base.v1.StatusRes); // cancel an order
 
   rpc GetMarketPubHistory(OrderListFilter) returns (MarketOrderList); // This is for public market
+  rpc GetUserMarketHistory(OrderListFilter) returns (MarketOrderList); // list of order + purchase related to buying an asset
 
-  rpc GetMarketHistory(OrderListFilterWithIAM) returns (MarketOrderList); // list of order + purchase related to buying an asset
-  rpc GetBuyHistory(OrderListFilterWithIAM) returns (MarketOrderList); // list of order + purchase related to buying an asset
-  rpc GetSellHistory(OrderListFilterWithIAM) returns (MarketOrderList); // list of order + purchase related to selling an asset
+  // rpc GetBuyHistory(OrderListFilterWithIAM) returns (MarketOrderList); // list of order + purchase related to buying an asset
+  // rpc GetSellHistory(OrderListFilterWithIAM) returns (MarketOrderList); // list of order + purchase related to selling an asset
 }