diff --git a/packages/hoppscotch-backend/prisma/migrations/20230123184916_sdfv/migration.sql b/packages/hoppscotch-backend/prisma/migrations/20230123184916_sdfv/migration.sql
new file mode 100644
index 000000000..6a044925a
--- /dev/null
+++ b/packages/hoppscotch-backend/prisma/migrations/20230123184916_sdfv/migration.sql
@@ -0,0 +1,18 @@
+-- CreateEnum
+CREATE TYPE "ReqType" AS ENUM ('REST', 'GQL');
+
+-- CreateTable
+CREATE TABLE "UserHistory" (
+    "id" TEXT NOT NULL,
+    "userUid" TEXT NOT NULL,
+    "type" "ReqType" NOT NULL,
+    "request" JSONB NOT NULL,
+    "responseMetadata" JSONB NOT NULL,
+    "isStarred" BOOLEAN NOT NULL,
+    "executedOn" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "UserHistory_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "UserHistory" ADD CONSTRAINT "UserHistory_userUid_fkey" FOREIGN KEY ("userUid") REFERENCES "User"("uid") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/packages/hoppscotch-backend/src/user-history/user-history.service.ts b/packages/hoppscotch-backend/src/user-history/user-history.service.ts
index 83c60698b..880c5b500 100644
--- a/packages/hoppscotch-backend/src/user-history/user-history.service.ts
+++ b/packages/hoppscotch-backend/src/user-history/user-history.service.ts
@@ -32,13 +32,10 @@ export class UserHistoryService {
     const userHistoryColl: UserHistory[] = userHistory.map(
       (history) =>
         <UserHistory>{
-          id: history.id,
-          userUid: history.userUid,
+          ...history,
           reqType: history.type,
           request: JSON.stringify(history.request),
           responseMetadata: JSON.stringify(history.responseMetadata),
-          isStarred: history.isStarred,
-          executedOn: history.executedOn,
         },
     );
 
@@ -73,13 +70,10 @@ export class UserHistoryService {
     });
 
     const userHistory = <UserHistory>{
-      id: history.id,
-      userUid: history.userUid,
+      ...history,
+      reqType: history.type,
       request: JSON.stringify(history.request),
       responseMetadata: JSON.stringify(history.responseMetadata),
-      executedOn: history.executedOn,
-      isStarred: history.isStarred,
-      reqType: history.type,
     };
 
     // Publish created user history subscription
@@ -118,13 +112,10 @@ export class UserHistoryService {
       });
 
       const updatedUserHistory = <UserHistory>{
-        id: updatedHistory.id,
-        userUid: updatedHistory.userUid,
+        ...updatedHistory,
+        reqType: updatedHistory.type,
         request: JSON.stringify(updatedHistory.request),
         responseMetadata: JSON.stringify(updatedHistory.responseMetadata),
-        executedOn: updatedHistory.executedOn,
-        isStarred: updatedHistory.isStarred,
-        reqType: updatedHistory.type,
       };
 
       // Publish updated user history subscription
@@ -153,13 +144,10 @@ export class UserHistoryService {
       });
 
       const deletedUserHistory = <UserHistory>{
-        id: delUserHistory.id,
-        userUid: delUserHistory.userUid,
+        ...delUserHistory,
+        reqType: delUserHistory.type,
         request: JSON.stringify(delUserHistory.request),
         responseMetadata: JSON.stringify(delUserHistory.responseMetadata),
-        executedOn: delUserHistory.executedOn,
-        isStarred: delUserHistory.isStarred,
-        reqType: delUserHistory.type,
       };
 
       // Publish deleted user history subscription