diff --git a/src/constants/model.ts b/src/constants/model.ts
deleted file mode 100644
index 782e2f70..00000000
--- a/src/constants/model.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Field names used by the tables for the DB objects.
- */
-export enum Field {
-  // Setting
-  KEY = "key",
-  VALUE = "value",
-  // Log
-  SEVERITY = "severity",
-  LABEL = "label",
-  ERROR = "error",
-  // Accounts
-  NAME = "name",
-  DESCRIPTION = "description",
-  ID = "id",
-  IDENTITY = "indentity",
-  CREATED_TIMESTAMP = "createdTimestamp",
-  STATUS = "status",
-}
-
-export enum Severity {
-  DEBUG = "Debug",
-  INFO = "Info",
-  WARN = "Warning",
-  ERROR = "Error",
-  CRITICAL = "Critical",
-}
diff --git a/src/constants/table.ts b/src/constants/table.ts
deleted file mode 100644
index 915eb80c..00000000
--- a/src/constants/table.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Dexie table names used by the DexieWrapper service.
- */
-export enum AppTable {
-  ACCOUNTS = "Accounts-Table",
-}
diff --git a/src/db/tables/accounts.ts b/src/db/tables/accounts.ts
index c14ac956..8ed1bd2b 100644
--- a/src/db/tables/accounts.ts
+++ b/src/db/tables/accounts.ts
@@ -3,13 +3,16 @@ import { Table } from "dexie";
 export type Account = {
   id?: number;
   publicKey: string;
+  mnemonic: string;
   identity: string;
+  dateCreated: number;
 };
 
 export type AccountsTable = {
   accounts: Table<Account>;
 };
 
+// mark encrypted field by starting with a $ character
 export const accountsSchema = {
-  accounts: "++id, publicKey, $identity",
+  accounts: "++id, publicKey, $mnemonic, $identity, dateCreated",
 };
diff --git a/src/models/Account.ts b/src/models/Account.ts
deleted file mode 100644
index 0c5f6d35..00000000
--- a/src/models/Account.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { Field } from "@/constants/model";
-
-export interface IDBAccount {
-  [Field.ID]?: string;
-  [Field.IDENTITY]: string;
-  [Field.NAME]: string;
-  [Field.DESCRIPTION]: string;
-  [Field.CREATED_TIMESTAMP]: number;
-}
diff --git a/src/services/DexieWrapper.ts b/src/services/DexieWrapper.ts
deleted file mode 100644
index fa04a6ae..00000000
--- a/src/services/DexieWrapper.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import Dexie, { type Table } from "dexie";
-import { encrypted, Encryption } from "@pvermeer/dexie-encrypted-addon";
-
-import { AppString } from "@/constants/app";
-import { AppTable } from "../constants/table";
-import { Field } from "@/constants/model";
-import { IDBAccount } from "@/models/Account";
-
-export class DexieWrapper extends Dexie {
-  [AppTable.ACCOUNTS]!: Table<IDBAccount>;
-
-  constructor(name: string, secret: string) {
-    super(name, { autoOpen: true });
-    encrypted(this, { secretKey: secret });
-    this.version(1).stores({
-      [AppTable.ACCOUNTS]: `#&${Field.ID}, $${Field.IDENTITY}`,
-    });
-  }
-}
-
-const secret =
-  localStorage.getItem("secret") || Encryption.createRandomEncryptionKey();
-
-if (localStorage.getItem("secret") == null) {
-  localStorage.setItem("secret", secret);
-}
-
-/**
- * Preconfigured DexieWrapper
- */
-export const dexieWrapper = new DexieWrapper(
-  `${AppString.APP_NAME} v${AppString.VERSION}`,
-  secret
-);
diff --git a/src/use/useDBAccounts.ts b/src/use/useDBAccounts.ts
deleted file mode 100644
index 19de0ba9..00000000
--- a/src/use/useDBAccounts.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { IndexableType } from "dexie";
-import { AppTable } from "@/constants/table";
-import { Field } from "@/constants/model";
-import { dexieWrapper } from "@/services/DexieWrapper";
-import type { IDBAccount } from "@/models/Account";
-
-export default function useDBAccounts() {
-  /**
-   * Gets all data from the Logs table.
-   * @returns IDBAccount[]
-   */
-  async function getAccountsTable(): Promise<IDBAccount[]> {
-    return await dexieWrapper.table(AppTable.ACCOUNTS).toArray();
-  }
-
-  /**
-   * Adds an Account to the database.
-   * @param name
-   * @param description
-   * @param identity
-   * @returns Id of new Account
-   */
-  async function addAccount(
-    name: string,
-    description: string,
-    identity: string
-  ): Promise<IndexableType> {
-    const account: IDBAccount = {
-      [Field.CREATED_TIMESTAMP]: new Date().getTime(),
-      [Field.NAME]: name,
-      [Field.DESCRIPTION]: description,
-      [Field.IDENTITY]: identity,
-    };
-    return await dexieWrapper.table(AppTable.ACCOUNTS).add(account);
-  }
-
-  return {
-    getAccountsTable,
-    addAccount,
-  };
-}
diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue
index 9e8b9f03..bd4e55f3 100644
--- a/src/views/AccountViewView.vue
+++ b/src/views/AccountViewView.vue
@@ -228,7 +228,9 @@ export default class AccountViewView extends Vue {
               odexie._allTables.accounts
                 .add({
                   publicKey: newId.keys[0].publicKeyHex,
+                  mnemonic: mnemonic,
                   identity: JSON.stringify(newId),
+                  dateCreated: new Date().getTime(),
                 })
                 .then(function () {
                   odexie._allTables.accounts.each(function (account) {
diff --git a/vue.config.js b/vue.config.js
index 7a47bf41..c38a5949 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,6 +5,6 @@ module.exports = defineConfig({
     devtool: "source-map",
     experiments: {
       topLevelAwait: true,
-    }
+    },
   },
 });