diff --git a/api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/Trade.kt b/api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/Trade.kt
index 6212380ba..31ca765d9 100644
--- a/api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/Trade.kt
+++ b/api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/Trade.kt
@@ -1,6 +1,7 @@
 package co.nilin.opex.api.core.inout
 
 import java.math.BigDecimal
+import java.time.LocalDateTime
 import java.util.*
 
 data class Trade(
@@ -12,7 +13,7 @@ data class Trade(
     val quoteQuantity: BigDecimal,
     val commission: BigDecimal,
     val commissionAsset: String,
-    val time: Date,
+    val time: LocalDateTime,
     val isBuyer: Boolean,
     val isMaker: Boolean,
     val isBestMatch: Boolean,
diff --git a/api/api-ports/api-binance-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/data/TradeResponse.kt b/api/api-ports/api-binance-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/data/TradeResponse.kt
index 05c2d28aa..5ef611cfa 100644
--- a/api/api-ports/api-binance-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/data/TradeResponse.kt
+++ b/api/api-ports/api-binance-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/data/TradeResponse.kt
@@ -2,6 +2,7 @@ package co.nilin.opex.api.ports.binance.data
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import java.math.BigDecimal
+import java.time.LocalDateTime
 import java.util.*
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -15,7 +16,7 @@ data class TradeResponse(
     val quoteQty: BigDecimal,
     val commission: BigDecimal,
     val commissionAsset: String,
-    val time: Date,
+    val time: LocalDateTime,
     val isBuyer: Boolean,
     val isMaker: Boolean,
     val isBestMatch: Boolean
diff --git a/api/api-ports/api-opex-rest/src/main/kotlin/co/nilin/opex/api/ports/opex/controller/UserHistoryController.kt b/api/api-ports/api-opex-rest/src/main/kotlin/co/nilin/opex/api/ports/opex/controller/UserHistoryController.kt
index 0e2335fcf..8ea58b43a 100644
--- a/api/api-ports/api-opex-rest/src/main/kotlin/co/nilin/opex/api/ports/opex/controller/UserHistoryController.kt
+++ b/api/api-ports/api-opex-rest/src/main/kotlin/co/nilin/opex/api/ports/opex/controller/UserHistoryController.kt
@@ -71,7 +71,7 @@ class UserHistoryController(
         @CurrentSecurityContext securityContext: SecurityContext,
     ): List<Trade> {
         return marketUserDataProxy.getTradeHistory(
-            securityContext.authentication.name, symbol, startTime, endTime, direction, limit ?: 10, offset ?: 10
+            securityContext.authentication.name, symbol, startTime, endTime, direction, limit ?: 10, offset ?: 0
         )
     }
 
diff --git a/market/market-core/src/main/kotlin/co/nilin/opex/market/core/inout/Trade.kt b/market/market-core/src/main/kotlin/co/nilin/opex/market/core/inout/Trade.kt
index 3b707f36b..9a23460b4 100644
--- a/market/market-core/src/main/kotlin/co/nilin/opex/market/core/inout/Trade.kt
+++ b/market/market-core/src/main/kotlin/co/nilin/opex/market/core/inout/Trade.kt
@@ -1,6 +1,7 @@
 package co.nilin.opex.market.core.inout
 
 import java.math.BigDecimal
+import java.time.LocalDateTime
 import java.util.*
 
 // User trade data
@@ -13,7 +14,7 @@ data class Trade(
     val quoteQuantity: BigDecimal,
     val commission: BigDecimal,
     val commissionAsset: String,
-    val time: Date,
+    val time: LocalDateTime,
     val isBuyer: Boolean,
     val isMaker: Boolean,
     val isBestMatch: Boolean,
diff --git a/market/market-ports/market-persister-postgres/src/main/kotlin/co/nilin/opex/market/ports/postgres/impl/UserQueryHandlerImpl.kt b/market/market-ports/market-persister-postgres/src/main/kotlin/co/nilin/opex/market/ports/postgres/impl/UserQueryHandlerImpl.kt
index 17e0f8433..87ee17cac 100644
--- a/market/market-ports/market-persister-postgres/src/main/kotlin/co/nilin/opex/market/ports/postgres/impl/UserQueryHandlerImpl.kt
+++ b/market/market-ports/market-persister-postgres/src/main/kotlin/co/nilin/opex/market/ports/postgres/impl/UserQueryHandlerImpl.kt
@@ -100,7 +100,7 @@ class UserQueryHandlerImpl(
                 if (isMakerBuyer) makerOrder.quoteQuantity!! else takerOrder.quoteQuantity!!,
                 if (it.takerUuid == uuid) it.takerCommission!! else it.makerCommission!!,
                 if (it.takerUuid == uuid) it.takerCommissionAsset!! else it.makerCommissionAsset!!,
-                Date.from(it.createDate.atZone(ZoneId.systemDefault()).toInstant()),
+                it.createDate,
                 if (it.takerUuid == uuid)
                     OrderDirection.ASK == takerOrder.direction
                 else