Release 1.119.0

2022-02-21 21:00:33 +01:00
569 changed files with 17028 additions and 45601 deletions
--- a/.env
+++ b/.env
@ -3,14 +3,14 @@ COMPOSE_PROJECT_NAME=ghostfolio-development
 # CACHE
 REDIS_HOST=localhost
 REDIS_PORT=6379
-REDIS_PASSWORD=<INSERT_REDIS_PASSWORD>

 # POSTGRES
 POSTGRES_DB=ghostfolio-db
 POSTGRES_USER=user
-POSTGRES_PASSWORD=<INSERT_POSTGRES_PASSWORD>
+POSTGRES_PASSWORD=password

-ACCESS_TOKEN_SALT=<INSERT_RANDOM_STRING>
+ACCESS_TOKEN_SALT=GHOSTFOLIO
 ALPHA_VANTAGE_API_KEY=
 DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=prefer
-JWT_SECRET_KEY=<INSERT_RANDOM_STRING>
+JWT_SECRET_KEY=123456
+PORT=3333
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1 +0,0 @@
-custom: ['https://www.buymeacoffee.com/ghostfolio']
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,37 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: "[BUG]"
-labels: ''
-assignees: ''
-
---
-
-The Issue tracker is **ONLY** used for reporting bugs. New features should be discussed on our [Slack channel](https://ghostfolio.slack.com) or in [Discussions](https://github.com/ghostfolio/ghostfolio/discussions).
-
-**Describe the bug**
-<!-- A clear and concise description of what the bug is. -->
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1.
-2.
-3.
-4.
-
-**Expected behavior**
-<!-- A clear and concise description of what you expected to happen. -->
-
-**Screenshots**
-<!-- If applicable, add screenshots to help explain your problem. -->
-
-**Logs**
-<!-- If applicable, add logs to help explain your problem. -->
-
-**Environment (please complete the following information):**
- - Ghostfolio Version [e.g. 1.194.0]
- - Browser [e.g. chrome]
- - OS
-
-**Additional context**
-<!-- Add any other context about the problem here. -->
--- a/.github/workflows/build-code.yml
+++ b/.github/workflows/build-code.yml
@ -1,36 +0,0 @@
-name: Build code
-
-on:
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node_version:
-          - 16
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Use Node.js ${{ matrix.node_version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node_version }}
-          cache: 'yarn'
-
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Check formatting
-        run: yarn format:check
-
-      - name: Execute tests
-        run: yarn test
-
-      - name: Build application
-        run: yarn build:all
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@ -1,49 +0,0 @@
-name: Docker image CD
-
-on:
-  push:
-    tags:
-      - '*.*.*'
-  pull_request:
-    branches:
-      - 'main'
-
-jobs:
-  build_and_push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Docker metadata
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ghostfolio/ghostfolio
-          tags: |
-            type=semver,pattern={{version}}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.output.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
--- a/.gitignore
+++ b/.gitignore
@ -24,16 +24,15 @@

 # misc
 /.angular/cache
-.env.prod
 /.sass-cache
 /connect.lock
 /coverage
 /dist
 /libpeerconnection.log
 npm-debug.log
+yarn-error.log
 testem.log
 /typings
-yarn-error.log

 # System Files
 .DS_Store
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,30 @@
+language: node_js
+git:
+  depth: false
+node_js:
+  - 14
+
+services:
+  - docker
+
+cache: yarn
+
+if: (type = pull_request) OR (tag IS present)
+
+jobs:
+  include:
+    - stage: Install dependencies
+      if: type = pull_request
+      script: yarn --frozen-lockfile
+    - stage: Check formatting
+      if: type = pull_request
+      script: yarn format:check
+    - stage: Execute tests
+      if: type = pull_request
+      script: yarn test
+    - stage: Build application
+      if: type = pull_request
+      script: yarn build:all
+    - stage: Build and publish docker image
+      if: tag IS present
+      script: ./publish-docker-image.sh
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/22
+++ b/22
@ -1,6 +1,7 @@
-FROM --platform=$BUILDPLATFORM node:16-slim as builder
+FROM node:14-alpine as builder

 # Build application and add additional files
+
 WORKDIR /ghostfolio

 # Only add basic files without the application itself to avoid rebuilding
@ -9,16 +10,9 @@ COPY ./CHANGELOG.md CHANGELOG.md
 COPY ./LICENSE LICENSE
 COPY ./package.json package.json
 COPY ./yarn.lock yarn.lock
-COPY ./.yarnrc .yarnrc
 COPY ./prisma/schema.prisma prisma/schema.prisma

-RUN apt update && apt install -y \
-    git \
-    g++ \
-    make \
-    openssl \
-    python3 \
-    && rm -rf /var/lib/apt/lists/*
+RUN apk add --no-cache python3 g++ make openssl
 RUN yarn install

 # See https://github.com/nrwl/nx/issues/6586 for further details
@ -29,7 +23,7 @@ COPY ./angular.json angular.json
 COPY ./nx.json nx.json
 COPY ./replace.build.js replace.build.js
 COPY ./jest.preset.js jest.preset.js
-COPY ./jest.config.ts jest.config.ts
+COPY ./jest.config.js jest.config.js
 COPY ./tsconfig.base.json tsconfig.base.json
 COPY ./libs libs
 COPY ./apps apps
@ -51,12 +45,8 @@ COPY package.json /ghostfolio/dist/apps/api
 RUN yarn database:generate-typings

 # Image to run, copy everything needed from builder
-FROM node:16-slim
-RUN apt update && apt install -y \
-    openssl \
-    && rm -rf /var/lib/apt/lists/*
-
+FROM node:14-alpine
 COPY --from=builder /ghostfolio/dist/apps /ghostfolio/apps
 WORKDIR /ghostfolio/apps/api
 EXPOSE 3333
-CMD [  "yarn", "start:prod" ]
+CMD [ "node", "main" ]
--- a/README.md
+++ b/README.md
@ -9,31 +9,32 @@

  <h1>Ghostfolio</h1>
  <p>
-    <strong>Open Source Wealth Management Software</strong>
+    <strong>Open Source Wealth Management Software made for Humans</strong>
  </p>
  <p>
-    <a href="https://ghostfol.io"><strong>Ghostfol.io</strong></a> | <a href="https://ghostfol.io/en/demo"><strong>Live Demo</strong></a> | <a href="https://ghostfol.io/en/pricing"><strong>Ghostfolio Premium</strong></a> | <a href="https://ghostfol.io/en/faq"><strong>FAQ</strong></a> | <a href="https://ghostfol.io/en/blog"><strong>Blog</strong></a> | <a href="https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg"><strong>Slack</strong></a> | <a href="https://twitter.com/ghostfolio_"><strong>Twitter</strong></a>
+    <a href="https://ghostfol.io"><strong>Live Demo</strong></a> | <a href="https://ghostfol.io/pricing"><strong>Ghostfolio Premium</strong></a> | <a href="https://ghostfol.io/blog"><strong>Blog</strong></a> | <a href="https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg"><strong>Slack</strong></a> | <a href="https://twitter.com/ghostfolio_"><strong>Twitter</strong></a>
  </p>
  <p>
    <a href="#contributing">
      <img src="https://img.shields.io/badge/contributions-welcome-orange.svg"/></a>
+    <a href="https://travis-ci.com/github/ghostfolio/ghostfolio" rel="nofollow">
+      <img src="https://travis-ci.com/ghostfolio/ghostfolio.svg?branch=main" alt="Build Status"/></a>
    <a href="https://www.gnu.org/licenses/agpl-3.0" rel="nofollow">
      <img src="https://img.shields.io/badge/License-AGPL%20v3-blue.svg" alt="License: AGPL v3"/></a>
  </p>
 </div>

-**Ghostfolio** is an open source wealth management software built with web technology. The application empowers busy people to keep track of stocks, ETFs or cryptocurrencies and make solid, data-driven investment decisions.
+**Ghostfolio** is an open source wealth management software built with web technology. The application empowers busy people to keep track of their wealth like stocks, ETFs or cryptocurrencies and make solid, data-driven investment decisions.

-<div align="center" style="margin-top: 1rem; margin-bottom: 1rem;">
-  <a href="https://www.youtube.com/watch?v=yY6ObSQVJZk">
-    <img src="./apps/client/src/assets/images/video-preview.jpg" width="600"></a>
+<div align="center">
+  <img src="./apps/client/src/assets/images/screenshot.png" width="300">
 </div>

 ## Ghostfolio Premium

-Our official **[Ghostfolio Premium](https://ghostfol.io/en/pricing)** cloud offering is the easiest way to get started. Due to the time it saves, this will be the best option for most people. The revenue is used for covering the hosting costs.
+Our official **[Ghostfolio Premium](https://ghostfol.io/pricing)** cloud offering is the easiest way to get started. Due to the time it saves, this will be the best option for most people. The revenue is used for covering the hosting costs.

-If you prefer to run Ghostfolio on your own infrastructure, please find further instructions in the [Self-hosting](#self-hosting) section.
+If you prefer to run Ghostfolio on your own infrastructure (self-hosting), please find further instructions in the section [Run with Docker](#run-with-docker-self-hosting).

 ## Why Ghostfolio?

@ -46,7 +47,7 @@ Ghostfolio is for you if you are...
 - 🧘 into minimalism
 - 🧺 caring about diversifying your financial resources
 - 🆓 interested in financial independence
- 🙅 saying no to spreadsheets in 2022
+- 🙅 saying no to spreadsheets in 2021
 - 😎 still reading this list

 ## Features
@ -61,10 +62,6 @@ Ghostfolio is for you if you are...
 - ✅ Zen Mode
 - ✅ Mobile-first design

-<div align="center" style="margin-top: 1rem; margin-bottom: 1rem;">
-  <img src="./apps/client/src/assets/images/screenshot.png" width="300">
-</div>
-
 ## Technology Stack

 Ghostfolio is a modern web application written in [TypeScript](https://www.typescriptlang.org) and organized as an [Nx](https://nx.dev) workspace.
@ -77,53 +74,46 @@ The backend is based on [NestJS](https://nestjs.com) using [PostgreSQL](https://

 The frontend is built with [Angular](https://angular.io) and uses [Angular Material](https://material.angular.io) with utility classes from [Bootstrap](https://getbootstrap.com).

-## Self-hosting
+## Run with Docker (self-hosting)

-We provide official container images hosted on [Docker Hub](https://hub.docker.com/r/ghostfolio/ghostfolio) for `linux/amd64` and `linux/arm64`.
+### Prerequisites

-### Supported Environment Variables
+- [Docker](https://www.docker.com/products/docker-desktop)

-| Name                | Default Value | Description                                                                                                                         |
-| ------------------- | ------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| `ACCESS_TOKEN_SALT` |               | A random string used as salt for access tokens                                                                                      |
-| `BASE_CURRENCY`     | `USD`         | The base currency of the Ghostfolio application. Caution: This cannot be changed later!                                             |
-| `DATABASE_URL`      |               | The database connection URL, e.g. `postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=prefer` |
-| `HOST`              | `0.0.0.0`     | The host where the Ghostfolio application will run on                                                                               |
-| `JWT_SECRET_KEY`    |               | A random string used for _JSON Web Tokens_ (JWT)                                                                                    |
-| `PORT`              | `3333`        | The port where the Ghostfolio application will run on                                                                               |
-| `POSTGRES_DB`       |               | The name of the _PostgreSQL_ database                                                                                               |
-| `POSTGRES_PASSWORD` |               | The password of the _PostgreSQL_ database                                                                                           |
-| `POSTGRES_USER`     |               | The user of the _PostgreSQL_ database                                                                                               |
-| `REDIS_HOST`        |               | The host where _Redis_ is running                                                                                                   |
-| `REDIS_PASSWORD`    |               | The password of _Redis_                                                                                                             |
-| `REDIS_PORT`        |               | The port where _Redis_ is running                                                                                                   |
-
-### Run with Docker Compose
-
-#### Prerequisites
-
- Basic knowledge of Docker
- Installation of [Docker](https://www.docker.com/products/docker-desktop)
- Local copy of this Git repository (clone)
-
-#### a. Run environment
+### a. Run environment

 Run the following command to start the Docker images from [Docker Hub](https://hub.docker.com/r/ghostfolio/ghostfolio):

 ```bash
-docker-compose --env-file ./.env -f docker/docker-compose.yml up -d
+docker-compose -f docker/docker-compose.yml up -d
 ```

-#### b. Build and run environment
+#### Setup Database
+
+Run the following command to setup the database once Ghostfolio is running:
+
+```bash
+docker-compose -f docker/docker-compose.yml exec ghostfolio yarn database:setup
+```
+
+### b. Build and run environment

 Run the following commands to build and start the Docker images:

 ```bash
-docker-compose --env-file ./.env -f docker/docker-compose.build.yml build
-docker-compose --env-file ./.env -f docker/docker-compose.build.yml up -d
+docker-compose -f docker/docker-compose.build.yml build
+docker-compose -f docker/docker-compose.build.yml up -d
 ```

-#### Fetch Historical Data
+#### Setup Database
+
+Run the following command to setup the database once Ghostfolio is running:
+
+```bash
+docker-compose -f docker/docker-compose.build.yml exec ghostfolio yarn database:setup
+```
+
+### Fetch Historical Data

 Open http://localhost:3333 in your browser and accomplish these steps:

@ -131,30 +121,26 @@ Open http://localhost:3333 in your browser and accomplish these steps:
 1. Go to the _Admin Control Panel_ and click _Gather All Data_ to fetch historical data
 1. Click _Sign out_ and check out the _Live Demo_

-#### Upgrade Version
+### Migrate Database

-1. Increase the version of the `ghostfolio/ghostfolio` Docker image in `docker/docker-compose.yml`
-1. Run the following command to start the new Docker image: `docker-compose --env-file ./.env -f docker/docker-compose.yml up -d`  
-   At each start, the container will automatically apply the database schema migrations if needed.
+With the following command you can keep your database schema in sync after a Ghostfolio version update:

-### Run with _Unraid_ (Community)
-
-Please follow the instructions of the Ghostfolio [Unraid Community App](https://unraid.net/community/apps?q=ghostfolio).
+```bash
+docker-compose -f docker/docker-compose-build-local.yml exec ghostfolio yarn database:migrate
+```

 ## Development

 ### Prerequisites

 - [Docker](https://www.docker.com/products/docker-desktop)
- [Node.js](https://nodejs.org/en/download) (version 16+)
+- [Node.js](https://nodejs.org/en/download) (version 14+)
 - [Yarn](https://yarnpkg.com/en/docs/install)
- A local copy of this Git repository (clone)

 ### Setup

 1. Run `yarn install`
-1. Run `yarn build:dev` to build the source code including the assets
-1. Run `docker-compose --env-file ./.env -f docker/docker-compose.dev.yml up -d` to start [PostgreSQL](https://www.postgresql.org) and [Redis](https://redis.io)
+1. Run `docker-compose -f docker/docker-compose.dev.yml up -d` to start [PostgreSQL](https://www.postgresql.org) and [Redis](https://redis.io)
 1. Run `yarn database:setup` to initialize the database schema and populate your database with (example) data
 1. Start the server and the client (see [_Development_](#Development))
 1. Create a new user via _Get Started_ (this first user will get the role `ADMIN`)
@ -176,92 +162,16 @@ Run `yarn start:client`

 Run `yarn start:storybook`

-### Migrate Database
-
-With the following command you can keep your database schema in sync:
-
-```bash
-yarn database:push
-```
-
 ## Testing

 Run `yarn test`

-## Public API
-
-### Import Activities
-
-#### Request
-
-`POST http://localhost:3333/api/v1/import`
-
-#### Authorization: Bearer Token
-
-Set the header as follows:
-
-```
-"Authorization": "Bearer eyJh..."
-```
-
-#### Body
-
-```
-{
-  "activities": [
-    {
-      "currency": "USD",
-      "dataSource": "YAHOO",
-      "date": "2021-09-15T00:00:00.000Z",
-      "fee": 19,
-      "quantity": 5,
-      "symbol": "MSFT"
-      "type": "BUY",
-      "unitPrice": 298.58
-    }
-  ]
-}
-```
-
-| Field      | Type                | Description                                        |
-| ---------- | ------------------- | -------------------------------------------------- |
-| accountId  | string (`optional`) | Id of the account                                  |
-| currency   | string              | `CHF` \| `EUR` \| `USD` etc.                       |
-| dataSource | string              | `MANUAL` (for type `ITEM`) \| `YAHOO`              |
-| date       | string              | Date in the format `ISO-8601`                      |
-| fee        | number              | Fee of the activity                                |
-| quantity   | number              | Quantity of the activity                           |
-| symbol     | string              | Symbol of the activity (suitable for `dataSource`) |
-| type       | string              | `BUY` \| `DIVIDEND` \| `ITEM` \| `SELL`            |
-| unitPrice  | number              | Price per unit of the activity                     |
-
-#### Response
-
-##### Success
-
-`201 Created`
-
-##### Error
-
-`400 Bad Request`
-
-```
-{
-  "error": "Bad Request",
-  "message": [
-    "activities.1 is a duplicate activity"
-  ]
-}
-```
-
 ## Contributing

 Ghostfolio is **100% free** and **open source**. We encourage and support an active and healthy community that accepts contributions from the public - including you.

 Not sure what to work on? We have got some ideas. Please join the Ghostfolio [Slack channel](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg), tweet to [@ghostfolio\_](https://twitter.com/ghostfolio_) or send an e-mail to hi@ghostfol.io. We would love to hear from you.

-If you like to support this project, get **[Ghostfolio Premium](https://ghostfol.io/en/pricing)** or **[Buy me a coffee](https://www.buymeacoffee.com/ghostfolio)**.
-
 ## License

 © 2022 [Ghostfolio](https://ghostfol.io)
--- a/angular.json
+++ b/angular.json
@ -2,7 +2,6 @@
  "version": 1,
  "projects": {
    "api": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
      "root": "apps/api",
      "sourceRoot": "apps/api/src",
      "projectType": "application",
@ -10,7 +9,7 @@
      "schematics": {},
      "architect": {
        "build": {
-          "builder": "@nrwl/node:webpack",
+          "builder": "@nrwl/node:build",
          "options": {
            "outputPath": "dist/apps/api",
            "main": "apps/api/src/main.ts",
@ -34,7 +33,7 @@
          "outputs": ["{options.outputPath}"]
        },
        "serve": {
-          "builder": "@nrwl/node:node",
+          "builder": "@nrwl/node:execute",
          "options": {
            "buildTarget": "api:build"
          }
@ -48,7 +47,7 @@
        "test": {
          "builder": "@nrwl/jest:jest",
          "options": {
-            "jestConfig": "apps/api/jest.config.ts",
+            "jestConfig": "apps/api/jest.config.js",
            "passWithNoTests": true
          },
          "outputs": ["coverage/apps/api"]
@ -57,7 +56,6 @@
      "tags": []
    },
    "client": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
      "projectType": "application",
      "schematics": {
        "@schematics/angular:component": {
@ -77,49 +75,45 @@
            "polyfills": "apps/client/src/polyfills.ts",
            "tsConfig": "apps/client/tsconfig.app.json",
            "assets": [
+              "apps/client/src/assets",
              {
                "glob": "assetlinks.json",
                "input": "apps/client/src/assets",
-                "output": "./../.well-known"
+                "output": "./.well-known"
              },
              {
                "glob": "CHANGELOG.md",
                "input": "",
-                "output": "./../assets"
+                "output": "./assets"
              },
              {
                "glob": "LICENSE",
                "input": "",
-                "output": "./../assets"
+                "output": "./assets"
              },
              {
                "glob": "robots.txt",
                "input": "apps/client/src/assets",
-                "output": "./../"
+                "output": "./"
              },
              {
                "glob": "sitemap.xml",
                "input": "apps/client/src/assets",
-                "output": "./../"
+                "output": "./"
              },
              {
                "glob": "**/*",
                "input": "node_modules/ionicons/dist/ionicons",
-                "output": "./../ionicons"
+                "output": "./ionicons"
              },
              {
                "glob": "**/*.js",
                "input": "node_modules/ionicons/dist/",
-                "output": "./../"
-              },
-              {
-                "glob": "**/*",
-                "input": "apps/client/src/assets",
-                "output": "./../assets/"
+                "output": "./"
              }
            ],
            "styles": ["apps/client/src/styles.scss"],
-            "scripts": ["node_modules/marked/marked.min.js"],
+            "scripts": ["node_modules/marked/lib/marked.js"],
            "vendorChunk": true,
            "extractLicenses": false,
            "buildOptimizer": false,
@ -128,26 +122,6 @@
            "namedChunks": true
          },
          "configurations": {
-            "development-de": {
-              "baseHref": "/de/",
-              "localize": ["de"]
-            },
-            "development-en": {
-              "baseHref": "/en/",
-              "localize": ["en"]
-            },
-            "development-es": {
-              "baseHref": "/es/",
-              "localize": ["es"]
-            },
-            "development-it": {
-              "baseHref": "/it/",
-              "localize": ["it"]
-            },
-            "development-nl": {
-              "baseHref": "/nl/",
-              "localize": ["nl"]
-            },
            "production": {
              "fileReplacements": [
                {
@ -186,38 +160,15 @@
            "proxyConfig": "apps/client/proxy.conf.json"
          },
          "configurations": {
-            "development-de": {
-              "browserTarget": "client:build:development-de"
-            },
-            "development-en": {
-              "browserTarget": "client:build:development-en"
-            },
-            "development-es": {
-              "browserTarget": "client:build:development-es"
-            },
-            "development-it": {
-              "browserTarget": "client:build:development-it"
-            },
-            "development-nl": {
-              "browserTarget": "client:build:development-nl"
-            },
            "production": {
              "browserTarget": "client:build:production"
            }
          }
        },
        "extract-i18n": {
-          "builder": "ng-extract-i18n-merge:ng-extract-i18n-merge",
+          "builder": "@angular-devkit/build-angular:extract-i18n",
          "options": {
-            "browserTarget": "client:build",
-            "includeContext": true,
-            "outputPath": "src/locales",
-            "targetFiles": [
-              "messages.de.xlf",
-              "messages.es.xlf",
-              "messages.it.xlf",
-              "messages.nl.xlf"
-            ]
+            "browserTarget": "client:build"
          }
        },
        "lint": {
@ -229,37 +180,15 @@
        "test": {
          "builder": "@nrwl/jest:jest",
          "options": {
-            "jestConfig": "apps/client/jest.config.ts",
+            "jestConfig": "apps/client/jest.config.js",
            "passWithNoTests": true
          },
          "outputs": ["coverage/apps/client"]
        }
      },
-      "i18n": {
-        "locales": {
-          "de": {
-            "baseHref": "/de/",
-            "translation": "apps/client/src/locales/messages.de.xlf"
-          },
-          "es": {
-            "baseHref": "/es/",
-            "translation": "apps/client/src/locales/messages.es.xlf"
-          },
-          "it": {
-            "baseHref": "/it/",
-            "translation": "apps/client/src/locales/messages.it.xlf"
-          },
-          "nl": {
-            "baseHref": "/nl/",
-            "translation": "apps/client/src/locales/messages.nl.xlf"
-          }
-        },
-        "sourceLocale": "en"
-      },
      "tags": []
    },
    "client-e2e": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
      "root": "apps/client-e2e",
      "sourceRoot": "apps/client-e2e/src",
      "projectType": "application",
@ -282,7 +211,6 @@
      "implicitDependencies": ["client"]
    },
    "common": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
      "root": "libs/common",
      "sourceRoot": "libs/common/src",
      "projectType": "library",
@ -297,7 +225,7 @@
          "builder": "@nrwl/jest:jest",
          "outputs": ["coverage/libs/common"],
          "options": {
-            "jestConfig": "libs/common/jest.config.ts",
+            "jestConfig": "libs/common/jest.config.js",
            "passWithNoTests": true
          }
        }
@ -305,7 +233,6 @@
      "tags": []
    },
    "ui": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
      "projectType": "library",
      "schematics": {
        "@schematics/angular:component": {
@ -320,7 +247,7 @@
          "builder": "@nrwl/jest:jest",
          "outputs": ["coverage/libs/ui"],
          "options": {
-            "jestConfig": "libs/ui/jest.config.ts",
+            "jestConfig": "libs/ui/jest.config.js",
            "passWithNoTests": true
          }
        },
@ -331,12 +258,14 @@
          }
        },
        "storybook": {
-          "builder": "@storybook/angular:start-storybook",
+          "builder": "@nrwl/storybook:storybook",
          "options": {
+            "uiFramework": "@storybook/angular",
            "port": 4400,
-            "configDir": "libs/ui/.storybook",
-            "browserTarget": "ui:build-storybook",
-            "compodoc": false
+            "config": {
+              "configFolder": "libs/ui/.storybook"
+            },
+            "projectBuildConfig": "ui:build-storybook"
          },
          "configurations": {
            "ci": {
@ -345,13 +274,15 @@
          }
        },
        "build-storybook": {
-          "builder": "@storybook/angular:build-storybook",
+          "builder": "@nrwl/storybook:build",
          "outputs": ["{options.outputPath}"],
          "options": {
-            "outputDir": "dist/storybook/ui",
-            "configDir": "libs/ui/.storybook",
-            "browserTarget": "ui:build-storybook",
-            "compodoc": false
+            "uiFramework": "@storybook/angular",
+            "outputPath": "dist/storybook/ui",
+            "config": {
+              "configFolder": "libs/ui/.storybook"
+            },
+            "projectBuildConfig": "ui:build-storybook"
          },
          "configurations": {
            "ci": {
@ -363,7 +294,6 @@
      "tags": []
    },
    "ui-e2e": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
      "root": "apps/ui-e2e",
      "sourceRoot": "apps/ui-e2e/src",
      "projectType": "application",
--- a/apps/api/jest.config.js
+++ b/apps/api/jest.config.js
@ -1,7 +1,6 @@
-/* eslint-disable */
-export default {
+module.exports = {
  displayName: 'api',
-
+  preset: '../../jest.preset.js',
  globals: {
    'ts-jest': {
      tsconfig: '<rootDir>/tsconfig.spec.json'
@ -13,6 +12,5 @@ export default {
  moduleFileExtensions: ['ts', 'js', 'html'],
  coverageDirectory: '../../coverage/apps/api',
  testTimeout: 10000,
-  testEnvironment: 'node',
-  preset: '../../jest.preset.js'
+  testEnvironment: 'node'
 };
--- a/apps/api/src/app/access/access.controller.ts
+++ b/apps/api/src/app/access/access.controller.ts
@ -42,16 +42,14 @@ export class AccessController {
    return accessesWithGranteeUser.map((access) => {
      if (access.GranteeUser) {
        return {
-          alias: access.alias,
-          grantee: access.GranteeUser?.id,
+          granteeAlias: access.GranteeUser?.alias,
          id: access.id,
          type: 'RESTRICTED_VIEW'
        };
      }

      return {
-        alias: access.alias,
-        grantee: 'Public',
+        granteeAlias: 'Public',
        id: access.id,
        type: 'PUBLIC'
      };
@ -73,10 +71,6 @@ export class AccessController {
    }

    return this.accessService.createAccess({
-      alias: data.alias || undefined,
-      GranteeUser: data.granteeUserId
-        ? { connect: { id: data.granteeUserId } }
-        : undefined,
      User: { connect: { id: this.request.user.id } }
    });
  }
@ -84,12 +78,8 @@ export class AccessController {
  @Delete(':id')
  @UseGuards(AuthGuard('jwt'))
  public async deleteAccess(@Param('id') id: string): Promise<AccessModule> {
-    const access = await this.accessService.access({ id });
-
    if (
-      !hasPermission(this.request.user.permissions, permissions.deleteAccess) ||
-      !access ||
-      access.userId !== this.request.user.id
+      !hasPermission(this.request.user.permissions, permissions.deleteAccess)
    ) {
      throw new HttpException(
        getReasonPhrase(StatusCodes.FORBIDDEN),
@ -98,7 +88,10 @@ export class AccessController {
    }

    return this.accessService.deleteAccess({
-      id
+      id_userId: {
+        id,
+        userId: this.request.user.id
+      }
    });
  }
 }
--- a/apps/api/src/app/access/create-access.dto.ts
+++ b/apps/api/src/app/access/create-access.dto.ts
@ -1,11 +1 @@
-import { IsOptional, IsString } from 'class-validator';
-
-export class CreateAccessDto {
-  @IsOptional()
-  @IsString()
-  alias?: string;
-
-  @IsOptional()
-  @IsString()
-  granteeUserId?: string;
-}
+export class CreateAccessDto {}
--- a/apps/api/src/app/account/account.controller.ts
+++ b/apps/api/src/app/account/account.controller.ts
@ -1,4 +1,4 @@
-import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';
+import { PortfolioServiceStrategy } from '@ghostfolio/api/app/portfolio/portfolio-service.strategy';
 import { UserService } from '@ghostfolio/api/app/user/user.service';
 import {
  nullifyValuesInObject,
@ -7,10 +7,7 @@ import {
 import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
 import { Accounts } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import type {
-  AccountWithValue,
-  RequestWithUser
-} from '@ghostfolio/common/types';
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
  Body,
  Controller,
@ -38,7 +35,7 @@ export class AccountController {
  public constructor(
    private readonly accountService: AccountService,
    private readonly impersonationService: ImpersonationService,
-    private readonly portfolioService: PortfolioService,
+    private readonly portfolioServiceStrategy: PortfolioServiceStrategy,
    @Inject(REQUEST) private readonly request: RequestWithUser,
    private readonly userService: UserService
  ) {}
@ -94,12 +91,9 @@ export class AccountController {
        this.request.user.id
      );

-    let accountsWithAggregations =
-      await this.portfolioService.getAccountsWithAggregations(
-        impersonationUserId || this.request.user.id,
-        undefined,
-        true
-      );
+    let accountsWithAggregations = await this.portfolioServiceStrategy
+      .get()
+      .getAccountsWithAggregations(impersonationUserId || this.request.user.id);

    if (
      impersonationUserId ||
@ -107,18 +101,16 @@ export class AccountController {
    ) {
      accountsWithAggregations = {
        ...nullifyValuesInObject(accountsWithAggregations, [
-          'totalBalanceInBaseCurrency',
-          'totalValueInBaseCurrency'
+          'totalBalance',
+          'totalValue'
        ]),
        accounts: nullifyValuesInObjects(accountsWithAggregations.accounts, [
          'balance',
-          'balanceInBaseCurrency',
          'convertedBalance',
          'fee',
          'quantity',
          'unitPrice',
-          'value',
-          'valueInBaseCurrency'
+          'value'
        ])
      };
    }
@ -128,46 +120,13 @@ export class AccountController {

  @Get(':id')
  @UseGuards(AuthGuard('jwt'))
-  public async getAccountById(
-    @Headers('impersonation-id') impersonationId,
-    @Param('id') id: string
-  ): Promise<AccountWithValue> {
-    const impersonationUserId =
-      await this.impersonationService.validateImpersonationId(
-        impersonationId,
-        this.request.user.id
-      );
-
-    let accountsWithAggregations =
-      await this.portfolioService.getAccountsWithAggregations(
-        impersonationUserId || this.request.user.id,
-        [{ id, type: 'ACCOUNT' }],
-        true
-      );
-
-    if (
-      impersonationUserId ||
-      this.userService.isRestrictedView(this.request.user)
-    ) {
-      accountsWithAggregations = {
-        ...nullifyValuesInObject(accountsWithAggregations, [
-          'totalBalanceInBaseCurrency',
-          'totalValueInBaseCurrency'
-        ]),
-        accounts: nullifyValuesInObjects(accountsWithAggregations.accounts, [
-          'balance',
-          'balanceInBaseCurrency',
-          'convertedBalance',
-          'fee',
-          'quantity',
-          'unitPrice',
-          'value',
-          'valueInBaseCurrency'
-        ])
-      };
-    }
-
-    return accountsWithAggregations.accounts[0];
+  public async getAccountById(@Param('id') id: string): Promise<AccountModel> {
+    return this.accountService.account({
+      id_userId: {
+        id,
+        userId: this.request.user.id
+      }
+    });
  }

  @Post()
--- a/apps/api/src/app/account/account.service.ts
+++ b/apps/api/src/app/account/account.service.ts
@ -1,10 +1,7 @@
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { Filter } from '@ghostfolio/common/interfaces';
 import { Injectable } from '@nestjs/common';
 import { Account, Order, Platform, Prisma } from '@prisma/client';
-import Big from 'big.js';
-import { groupBy } from 'lodash';

 import { CashDetails } from './interfaces/cash-details.interface';

@ -104,59 +101,25 @@ export class AccountService {
    });
  }

-  public async getCashDetails({
-    currency,
-    filters = [],
-    userId,
-    withExcludedAccounts = false
-  }: {
-    currency: string;
-    filters?: Filter[];
-    userId: string;
-    withExcludedAccounts?: boolean;
-  }): Promise<CashDetails> {
-    let totalCashBalanceInBaseCurrency = new Big(0);
+  public async getCashDetails(
+    aUserId: string,
+    aCurrency: string
+  ): Promise<CashDetails> {
+    let totalCashBalance = 0;

-    const where: Prisma.AccountWhereInput = {
-      userId
-    };
-
-    if (withExcludedAccounts === false) {
-      where.isExcluded = false;
-    }
-
-    const {
-      ACCOUNT: filtersByAccount,
-      ASSET_CLASS: filtersByAssetClass,
-      TAG: filtersByTag
-    } = groupBy(filters, (filter) => {
-      return filter.type;
+    const accounts = await this.accounts({
+      where: { userId: aUserId }
    });

-    if (filtersByAccount?.length > 0) {
-      where.id = {
-        in: filtersByAccount.map(({ id }) => {
-          return id;
-        })
-      };
-    }
-
-    const accounts = await this.accounts({ where });
-
-    for (const account of accounts) {
-      totalCashBalanceInBaseCurrency = totalCashBalanceInBaseCurrency.plus(
-        this.exchangeRateDataService.toCurrency(
-          account.balance,
-          account.currency,
-          currency
-        )
+    accounts.forEach((account) => {
+      totalCashBalance += this.exchangeRateDataService.toCurrency(
+        account.balance,
+        account.currency,
+        aCurrency
      );
-    }
+    });

-    return {
-      accounts,
-      balanceInBaseCurrency: totalCashBalanceInBaseCurrency.toNumber()
-    };
+    return { accounts, balance: totalCashBalance };
  }

  public async updateAccount(
--- a/apps/api/src/app/account/create-account.dto.ts
+++ b/apps/api/src/app/account/create-account.dto.ts
@ -1,11 +1,5 @@
 import { AccountType } from '@prisma/client';
-import {
-  IsBoolean,
-  IsNumber,
-  IsOptional,
-  IsString,
-  ValidateIf
-} from 'class-validator';
+import { IsNumber, IsString, ValidateIf } from 'class-validator';

 export class CreateAccountDto {
  @IsString()
@ -17,10 +11,6 @@ export class CreateAccountDto {
  @IsString()
  currency: string;

-  @IsBoolean()
-  @IsOptional()
-  isExcluded?: boolean;
-
  @IsString()
  name: string;

--- a/apps/api/src/app/account/interfaces/cash-details.interface.ts
+++ b/apps/api/src/app/account/interfaces/cash-details.interface.ts
@ -2,5 +2,5 @@ import { Account } from '@prisma/client';

 export interface CashDetails {
  accounts: Account[];
-  balanceInBaseCurrency: number;
+  balance: number;
 }
--- a/apps/api/src/app/account/update-account.dto.ts
+++ b/apps/api/src/app/account/update-account.dto.ts
@ -1,11 +1,5 @@
 import { AccountType } from '@prisma/client';
-import {
-  IsBoolean,
-  IsNumber,
-  IsOptional,
-  IsString,
-  ValidateIf
-} from 'class-validator';
+import { IsNumber, IsString, ValidateIf } from 'class-validator';

 export class UpdateAccountDto {
  @IsString()
@ -20,10 +14,6 @@ export class UpdateAccountDto {
  @IsString()
  id: string;

-  @IsBoolean()
-  @IsOptional()
-  isExcluded?: boolean;
-
  @IsString()
  name: string;

--- a/apps/api/src/app/admin/admin.controller.ts
+++ b/apps/api/src/app/admin/admin.controller.ts
@ -1,15 +1,10 @@
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
 import { MarketDataService } from '@ghostfolio/api/services/market-data.service';
 import { PropertyDto } from '@ghostfolio/api/services/property/property.dto';
-import {
-  GATHER_ASSET_PROFILE_PROCESS,
-  GATHER_ASSET_PROFILE_PROCESS_OPTIONS
-} from '@ghostfolio/common/config';
 import {
  AdminData,
  AdminMarketData,
-  AdminMarketDataDetails,
-  Filter
+  AdminMarketDataDetails
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type { RequestWithUser } from '@ghostfolio/common/types';
@ -23,7 +18,6 @@ import {
  Param,
  Post,
  Put,
-  Query,
  UseGuards
 } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
@ -62,24 +56,6 @@ export class AdminController {
    return this.adminService.get();
  }

-  @Post('gather')
-  @UseGuards(AuthGuard('jwt'))
-  public async gather7Days(): Promise<void> {
-    if (
-      !hasPermission(
-        this.request.user.permissions,
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    this.dataGatheringService.gather7Days();
-  }
-
  @Post('gather/max')
  @UseGuards(AuthGuard('jwt'))
  public async gatherMax(): Promise<void> {
@ -95,20 +71,10 @@ export class AdminController {
      );
    }

-    const uniqueAssets = await this.dataGatheringService.getUniqueAssets();
-
-    for (const { dataSource, symbol } of uniqueAssets) {
-      await this.dataGatheringService.addJobToQueue(
-        GATHER_ASSET_PROFILE_PROCESS,
-        {
-          dataSource,
-          symbol
-        },
-        GATHER_ASSET_PROFILE_PROCESS_OPTIONS
-      );
-    }
-
+    await this.dataGatheringService.gatherProfileData();
    this.dataGatheringService.gatherMax();
+
+    return;
  }

  @Post('gather/profile-data')
@ -126,18 +92,9 @@ export class AdminController {
      );
    }

-    const uniqueAssets = await this.dataGatheringService.getUniqueAssets();
+    this.dataGatheringService.gatherProfileData();

-    for (const { dataSource, symbol } of uniqueAssets) {
-      await this.dataGatheringService.addJobToQueue(
-        GATHER_ASSET_PROFILE_PROCESS,
-        {
-          dataSource,
-          symbol
-        },
-        GATHER_ASSET_PROFILE_PROCESS_OPTIONS
-      );
-    }
+    return;
  }

  @Post('gather/profile-data/:dataSource/:symbol')
@ -158,14 +115,9 @@ export class AdminController {
      );
    }

-    await this.dataGatheringService.addJobToQueue(
-      GATHER_ASSET_PROFILE_PROCESS,
-      {
-        dataSource,
-        symbol
-      },
-      GATHER_ASSET_PROFILE_PROCESS_OPTIONS
-    );
+    this.dataGatheringService.gatherProfileData([{ dataSource, symbol }]);
+
+    return;
  }

  @Post('gather/:dataSource/:symbol')
@ -228,9 +180,7 @@ export class AdminController {

  @Get('market-data')
  @UseGuards(AuthGuard('jwt'))
-  public async getMarketData(
-    @Query('assetSubClasses') filterByAssetSubClasses?: string
-  ): Promise<AdminMarketData> {
+  public async getMarketData(): Promise<AdminMarketData> {
    if (
      !hasPermission(
        this.request.user.permissions,
@ -243,18 +193,7 @@ export class AdminController {
      );
    }

-    const assetSubClasses = filterByAssetSubClasses?.split(',') ?? [];
-
-    const filters: Filter[] = [
-      ...assetSubClasses.map((assetSubClass) => {
-        return <Filter>{
-          id: assetSubClass,
-          type: 'ASSET_SUB_CLASS'
-        };
-      })
-    ];
-
-    return this.adminService.getMarketData(filters);
+    return this.adminService.getMarketData();
  }

  @Get('market-data/:dataSource/:symbol')
--- a/apps/api/src/app/admin/admin.module.ts
+++ b/apps/api/src/app/admin/admin.module.ts
@ -11,7 +11,6 @@ import { Module } from '@nestjs/common';

 import { AdminController } from './admin.controller';
 import { AdminService } from './admin.service';
-import { QueueModule } from './queue/queue.module';

@Module({
  imports: [
@ -22,7 +21,6 @@ import { QueueModule } from './queue/queue.module';
    MarketDataModule,
    PrismaModule,
    PropertyModule,
-    QueueModule,
    SubscriptionModule,
    SymbolProfileModule
  ],
--- a/apps/api/src/app/admin/admin.service.ts
+++ b/apps/api/src/app/admin/admin.service.ts
@ -1,63 +1,67 @@
 import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
+import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { MarketDataService } from '@ghostfolio/api/services/market-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
-import { PROPERTY_CURRENCIES } from '@ghostfolio/common/config';
+import { PROPERTY_CURRENCIES, baseCurrency } from '@ghostfolio/common/config';
 import {
  AdminData,
  AdminMarketData,
  AdminMarketDataDetails,
-  AdminMarketDataItem,
-  Filter,
-  UniqueAsset
+  AdminMarketDataItem
 } from '@ghostfolio/common/interfaces';
 import { Injectable } from '@nestjs/common';
-import { AssetSubClass, Prisma, Property } from '@prisma/client';
+import { DataSource, Property } from '@prisma/client';
 import { differenceInDays } from 'date-fns';
-import { groupBy } from 'lodash';

@Injectable()
 export class AdminService {
-  private baseCurrency: string;
-
  public constructor(
    private readonly configurationService: ConfigurationService,
+    private readonly dataGatheringService: DataGatheringService,
    private readonly exchangeRateDataService: ExchangeRateDataService,
    private readonly marketDataService: MarketDataService,
    private readonly prismaService: PrismaService,
    private readonly propertyService: PropertyService,
    private readonly subscriptionService: SubscriptionService,
    private readonly symbolProfileService: SymbolProfileService
-  ) {
-    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
-  }
+  ) {}

-  public async deleteProfileData({ dataSource, symbol }: UniqueAsset) {
+  public async deleteProfileData({
+    dataSource,
+    symbol
+  }: {
+    dataSource: DataSource;
+    symbol: string;
+  }) {
    await this.marketDataService.deleteMany({ dataSource, symbol });
    await this.symbolProfileService.delete({ dataSource, symbol });
  }

  public async get(): Promise<AdminData> {
    return {
+      dataGatheringProgress:
+        await this.dataGatheringService.getDataGatheringProgress(),
      exchangeRates: this.exchangeRateDataService
        .getCurrencies()
        .filter((currency) => {
-          return currency !== this.baseCurrency;
+          return currency !== baseCurrency;
        })
        .map((currency) => {
          return {
-            label1: this.baseCurrency,
+            label1: baseCurrency,
            label2: currency,
            value: this.exchangeRateDataService.toCurrency(
              1,
-              this.baseCurrency,
+              baseCurrency,
              currency
            )
          };
        }),
+      lastDataGathering: await this.getLastDataGathering(),
      settings: await this.propertyService.get(),
      transactionCount: await this.prismaService.order.count(),
      userCount: await this.prismaService.user.count(),
@ -65,27 +69,14 @@ export class AdminService {
    };
  }

-  public async getMarketData(filters?: Filter[]): Promise<AdminMarketData> {
-    const where: Prisma.SymbolProfileWhereInput = {};
-
-    const { ASSET_SUB_CLASS: filtersByAssetSubClass } = groupBy(
-      filters,
-      (filter) => {
-        return filter.type;
-      }
-    );
-
+  public async getMarketData(): Promise<AdminMarketData> {
    const marketData = await this.prismaService.marketData.groupBy({
      _count: true,
      by: ['dataSource', 'symbol']
    });

-    let currencyPairsToGather: AdminMarketDataItem[] = [];
-
-    if (filtersByAssetSubClass) {
-      where.assetSubClass = AssetSubClass[filtersByAssetSubClass[0].id];
-    } else {
-      currencyPairsToGather = this.exchangeRateDataService
+    const currencyPairsToGather: AdminMarketDataItem[] =
+      this.exchangeRateDataService
        .getCurrencyPairs()
        .map(({ dataSource, symbol }) => {
          const marketDataItemCount =
@ -99,24 +90,17 @@ export class AdminService {
          return {
            dataSource,
            marketDataItemCount,
-            symbol,
-            countriesCount: 0,
-            sectorsCount: 0
+            symbol
          };
        });
-    }

    const symbolProfilesToGather: AdminMarketDataItem[] = (
      await this.prismaService.symbolProfile.findMany({
-        where,
        orderBy: [{ symbol: 'asc' }],
        select: {
          _count: {
            select: { Order: true }
          },
-          assetClass: true,
-          assetSubClass: true,
-          countries: true,
          dataSource: true,
          Order: {
            orderBy: [{ date: 'asc' }],
@ -124,14 +108,10 @@ export class AdminService {
            take: 1
          },
          scraperConfiguration: true,
-          sectors: true,
          symbol: true
        }
      })
    ).map((symbolProfile) => {
-      const countriesCount = symbolProfile.countries
-        ? Object.keys(symbolProfile.countries).length
-        : 0;
      const marketDataItemCount =
        marketData.find((marketDataItem) => {
          return (
@ -139,17 +119,10 @@ export class AdminService {
            marketDataItem.symbol === symbolProfile.symbol
          );
        })?._count ?? 0;
-      const sectorsCount = symbolProfile.sectors
-        ? Object.keys(symbolProfile.sectors).length
-        : 0;

      return {
-        countriesCount,
        marketDataItemCount,
-        sectorsCount,
        activityCount: symbolProfile._count.Order,
-        assetClass: symbolProfile.assetClass,
-        assetSubClass: symbolProfile.assetSubClass,
        dataSource: symbolProfile.dataSource,
        date: symbolProfile.Order?.[0]?.date,
        symbol: symbolProfile.symbol
@ -164,7 +137,10 @@ export class AdminService {
  public async getMarketDataBySymbol({
    dataSource,
    symbol
-  }: UniqueAsset): Promise<AdminMarketDataDetails> {
+  }: {
+    dataSource: DataSource;
+    symbol: string;
+  }): Promise<AdminMarketDataDetails> {
    return {
      marketData: await this.marketDataService.marketDataItems({
        orderBy: {
@ -189,11 +165,30 @@ export class AdminService {

    if (key === PROPERTY_CURRENCIES) {
      await this.exchangeRateDataService.initialize();
+      await this.dataGatheringService.reset();
    }

    return response;
  }

+  private async getLastDataGathering() {
+    const lastDataGathering =
+      await this.dataGatheringService.getLastDataGathering();
+
+    if (lastDataGathering) {
+      return lastDataGathering;
+    }
+
+    const dataGatheringInProgress =
+      await this.dataGatheringService.getIsInProgress();
+
+    if (dataGatheringInProgress) {
+      return 'IN_PROGRESS';
+    }
+
+    return undefined;
+  }
+
  private async getUsersWithAnalytics(): Promise<AdminData['users']> {
    const usersWithAnalytics = await this.prismaService.user.findMany({
      orderBy: {
@ -205,6 +200,7 @@ export class AdminService {
        _count: {
          select: { Account: true, Order: true }
        },
+        alias: true,
        Analytics: {
          select: {
            activityCount: true,
@ -224,7 +220,7 @@ export class AdminService {
    });

    return usersWithAnalytics.map(
-      ({ _count, Analytics, createdAt, id, Subscription }) => {
+      ({ _count, alias, Analytics, createdAt, id, Subscription }) => {
        const daysSinceRegistration =
          differenceInDays(new Date(), createdAt) + 1;
        const engagement = Analytics.activityCount / daysSinceRegistration;
@ -236,6 +232,7 @@ export class AdminService {
          : undefined;

        return {
+          alias,
          createdAt,
          engagement,
          id,
--- a/apps/api/src/app/admin/queue/queue.controller.ts
+++ b/apps/api/src/app/admin/queue/queue.controller.ts
@ -1,87 +0,0 @@
-import { AdminJobs } from '@ghostfolio/common/interfaces';
-import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import type { RequestWithUser } from '@ghostfolio/common/types';
-import {
-  Controller,
-  Delete,
-  Get,
-  HttpException,
-  Inject,
-  Param,
-  Query,
-  UseGuards
-} from '@nestjs/common';
-import { REQUEST } from '@nestjs/core';
-import { AuthGuard } from '@nestjs/passport';
-import { JobStatus } from 'bull';
-import { StatusCodes, getReasonPhrase } from 'http-status-codes';
-
-import { QueueService } from './queue.service';
-
-@Controller('admin/queue')
-export class QueueController {
-  public constructor(
-    private readonly queueService: QueueService,
-    @Inject(REQUEST) private readonly request: RequestWithUser
-  ) {}
-
-  @Delete('job')
-  @UseGuards(AuthGuard('jwt'))
-  public async deleteJobs(
-    @Query('status') filterByStatus?: string
-  ): Promise<void> {
-    if (
-      !hasPermission(
-        this.request.user.permissions,
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    const status = <JobStatus[]>filterByStatus?.split(',') ?? undefined;
-    return this.queueService.deleteJobs({ status });
-  }
-
-  @Get('job')
-  @UseGuards(AuthGuard('jwt'))
-  public async getJobs(
-    @Query('status') filterByStatus?: string
-  ): Promise<AdminJobs> {
-    if (
-      !hasPermission(
-        this.request.user.permissions,
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    const status = <JobStatus[]>filterByStatus?.split(',') ?? undefined;
-    return this.queueService.getJobs({ status });
-  }
-
-  @Delete('job/:id')
-  @UseGuards(AuthGuard('jwt'))
-  public async deleteJob(@Param('id') id: string): Promise<void> {
-    if (
-      !hasPermission(
-        this.request.user.permissions,
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    return this.queueService.deleteJob(id);
-  }
-}
--- a/apps/api/src/app/admin/queue/queue.module.ts
+++ b/apps/api/src/app/admin/queue/queue.module.ts
@ -1,12 +0,0 @@
-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
-import { Module } from '@nestjs/common';
-
-import { QueueController } from './queue.controller';
-import { QueueService } from './queue.service';
-
-@Module({
-  controllers: [QueueController],
-  imports: [DataGatheringModule],
-  providers: [QueueService]
-})
-export class QueueModule {}
--- a/apps/api/src/app/admin/queue/queue.service.ts
+++ b/apps/api/src/app/admin/queue/queue.service.ts
@ -1,65 +0,0 @@
-import {
-  DATA_GATHERING_QUEUE,
-  QUEUE_JOB_STATUS_LIST
-} from '@ghostfolio/common/config';
-import { AdminJobs } from '@ghostfolio/common/interfaces';
-import { InjectQueue } from '@nestjs/bull';
-import { Injectable, Logger } from '@nestjs/common';
-import { JobStatus, Queue } from 'bull';
-
-@Injectable()
-export class QueueService {
-  public constructor(
-    @InjectQueue(DATA_GATHERING_QUEUE)
-    private readonly dataGatheringQueue: Queue
-  ) {}
-
-  public async deleteJob(aId: string) {
-    return (await this.dataGatheringQueue.getJob(aId))?.remove();
-  }
-
-  public async deleteJobs({
-    status = QUEUE_JOB_STATUS_LIST
-  }: {
-    status?: JobStatus[];
-  }) {
-    const jobs = await this.dataGatheringQueue.getJobs(status);
-
-    for (const job of jobs) {
-      try {
-        await job.remove();
-      } catch (error) {
-        Logger.warn(error, 'QueueService');
-      }
-    }
-  }
-
-  public async getJobs({
-    limit = 1000,
-    status = QUEUE_JOB_STATUS_LIST
-  }: {
-    limit?: number;
-    status?: JobStatus[];
-  }): Promise<AdminJobs> {
-    const jobs = await this.dataGatheringQueue.getJobs(status);
-
-    const jobsWithState = await Promise.all(
-      jobs.slice(0, limit).map(async (job) => {
-        return {
-          attemptsMade: job.attemptsMade + 1,
-          data: job.data,
-          finishedOn: job.finishedOn,
-          id: job.id,
-          name: job.name,
-          stacktrace: job.stacktrace,
-          state: await job.getState(),
-          timestamp: job.timestamp
-        };
-      })
-    );
-
-    return {
-      jobs: jobsWithState
-    };
-  }
-}
--- a/apps/api/src/app/app.controller.ts
+++ b/apps/api/src/app/app.controller.ts
@ -1,17 +1,26 @@
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
+import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
 import { Controller } from '@nestjs/common';

+import { RedisCacheService } from './redis-cache/redis-cache.service';
+
@Controller()
 export class AppController {
  public constructor(
-    private readonly exchangeRateDataService: ExchangeRateDataService
+    private readonly dataGatheringService: DataGatheringService,
+    private readonly redisCacheService: RedisCacheService
  ) {
    this.initialize();
  }

  private async initialize() {
-    try {
-      await this.exchangeRateDataService.initialize();
-    } catch {}
+    this.redisCacheService.reset();
+
+    const isDataGatheringInProgress =
+      await this.dataGatheringService.getIsInProgress();
+
+    if (isDataGatheringInProgress) {
+      // Prepare for automatical data gathering, if hung up in progress state
+      await this.dataGatheringService.reset();
+    }
  }
 }
--- a/apps/api/src/app/app.module.ts
+++ b/apps/api/src/app/app.module.ts
@ -9,8 +9,7 @@ import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
 import { TwitterBotModule } from '@ghostfolio/api/services/twitter-bot/twitter-bot.module';
-import { BullModule } from '@nestjs/bull';
-import { MiddlewareConsumer, Module, RequestMethod } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { ScheduleModule } from '@nestjs/schedule';
 import { ServeStaticModule } from '@nestjs/serve-static';
@ -20,10 +19,8 @@ import { AccountModule } from './account/account.module';
 import { AdminModule } from './admin/admin.module';
 import { AppController } from './app.controller';
 import { AuthModule } from './auth/auth.module';
-import { BenchmarkModule } from './benchmark/benchmark.module';
 import { CacheModule } from './cache/cache.module';
 import { ExportModule } from './export/export.module';
-import { FrontendMiddleware } from './frontend.middleware';
 import { ImportModule } from './import/import.module';
 import { InfoModule } from './info/info.module';
 import { OrderModule } from './order/order.module';
@ -39,14 +36,6 @@ import { UserModule } from './user/user.module';
    AccountModule,
    AuthDeviceModule,
    AuthModule,
-    BenchmarkModule,
-    BullModule.forRoot({
-      redis: {
-        host: process.env.REDIS_HOST,
-        port: parseInt(process.env.REDIS_PORT, 10),
-        password: process.env.REDIS_PASSWORD
-      }
-    }),
    CacheModule,
    ConfigModule.forRoot(),
    ConfigurationModule,
@ -83,10 +72,4 @@ import { UserModule } from './user/user.module';
  controllers: [AppController],
  providers: [CronService]
 })
-export class AppModule {
-  configure(consumer: MiddlewareConsumer) {
-    consumer
-      .apply(FrontendMiddleware)
-      .forRoutes({ path: '*', method: RequestMethod.ALL });
-  }
-}
+export class AppModule {}
--- a/apps/api/src/app/auth/auth.controller.ts
+++ b/apps/api/src/app/auth/auth.controller.ts
@ -1,7 +1,5 @@
 import { WebAuthService } from '@ghostfolio/api/app/auth/web-auth.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
-import { OAuthResponse } from '@ghostfolio/common/interfaces';
 import {
  Body,
  Controller,
@ -11,9 +9,7 @@ import {
  Post,
  Req,
  Res,
-  UseGuards,
-  VERSION_NEUTRAL,
-  Version
+  UseGuards
 } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
@ -33,9 +29,7 @@ export class AuthController {
  ) {}

  @Get('anonymous/:accessToken')
-  public async accessTokenLogin(
-    @Param('accessToken') accessToken: string
-  ): Promise<OAuthResponse> {
+  public async accessTokenLogin(@Param('accessToken') accessToken: string) {
    try {
      const authToken = await this.authService.validateAnonymousLogin(
        accessToken
@ -57,40 +51,14 @@ export class AuthController {

  @Get('google/callback')
  @UseGuards(AuthGuard('google'))
-  @Version(VERSION_NEUTRAL)
  public googleLoginCallback(@Req() req, @Res() res) {
    // Handles the Google OAuth2 callback
    const jwt: string = req.user.jwt;

    if (jwt) {
-      res.redirect(
-        `${this.configurationService.get(
-          'ROOT_URL'
-        )}/${DEFAULT_LANGUAGE_CODE}/auth/${jwt}`
-      );
+      res.redirect(`${this.configurationService.get('ROOT_URL')}/auth/${jwt}`);
    } else {
-      res.redirect(
-        `${this.configurationService.get(
-          'ROOT_URL'
-        )}/${DEFAULT_LANGUAGE_CODE}/auth`
-      );
-    }
-  }
-
-  @Get('internet-identity/:principalId')
-  public async internetIdentityLogin(
-    @Param('principalId') principalId: string
-  ): Promise<OAuthResponse> {
-    try {
-      const authToken = await this.authService.validateInternetIdentityLogin(
-        principalId
-      );
-      return { authToken };
-    } catch {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
+      res.redirect(`${this.configurationService.get('ROOT_URL')}/auth`);
    }
  }

--- a/apps/api/src/app/auth/auth.service.ts
+++ b/apps/api/src/app/auth/auth.service.ts
@ -2,7 +2,6 @@ import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { Injectable, InternalServerErrorException } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
-import { Provider } from '@prisma/client';

 import { ValidateOAuthLoginParams } from './interfaces/interfaces';

@ -14,7 +13,7 @@ export class AuthService {
    private readonly userService: UserService
  ) {}

-  public async validateAnonymousLogin(accessToken: string): Promise<string> {
+  public async validateAnonymousLogin(accessToken: string) {
    return new Promise(async (resolve, reject) => {
      try {
        const hashedAccessToken = this.userService.createAccessToken(
@ -27,7 +26,7 @@ export class AuthService {
        });

        if (user) {
-          const jwt = this.jwtService.sign({
+          const jwt: string = this.jwtService.sign({
            id: user.id
          });

@ -41,33 +40,6 @@ export class AuthService {
    });
  }

-  public async validateInternetIdentityLogin(principalId: string) {
-    try {
-      const provider: Provider = 'INTERNET_IDENTITY';
-
-      let [user] = await this.userService.users({
-        where: { provider, thirdPartyId: principalId }
-      });
-
-      if (!user) {
-        // Create new user if not found
-        user = await this.userService.createUser({
-          provider,
-          thirdPartyId: principalId
-        });
-      }
-
-      return this.jwtService.sign({
-        id: user.id
-      });
-    } catch (error) {
-      throw new InternalServerErrorException(
-        'validateInternetIdentityLogin',
-        error.message
-      );
-    }
-  }
-
  public async validateOAuthLogin({
    provider,
    thirdPartyId
@ -85,14 +57,13 @@ export class AuthService {
        });
      }

-      return this.jwtService.sign({
+      const jwt: string = this.jwtService.sign({
        id: user.id
      });
-    } catch (error) {
-      throw new InternalServerErrorException(
-        'validateOAuthLogin',
-        error.message
-      );
+
+      return jwt;
+    } catch (err) {
+      throw new InternalServerErrorException('validateOAuthLogin', err.message);
    }
  }
 }
--- a/apps/api/src/app/auth/google.strategy.ts
+++ b/apps/api/src/app/auth/google.strategy.ts
@ -42,7 +42,7 @@ export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {

      done(null, user);
    } catch (error) {
-      Logger.error(error, 'GoogleStrategy');
+      Logger.error(error);
      done(error, false);
    }
  }
--- a/apps/api/src/app/auth/web-auth.service.ts
+++ b/apps/api/src/app/auth/web-auth.service.ts
@ -54,7 +54,7 @@ export class WebAuthService {
      rpName: 'Ghostfolio',
      rpID: this.rpID,
      userID: user.id,
-      userName: '',
+      userName: user.alias,
      timeout: 60000,
      attestationType: 'indirect',
      authenticatorSelection: {
@ -95,7 +95,7 @@ export class WebAuthService {
      };
      verification = await verifyRegistrationResponse(opts);
    } catch (error) {
-      Logger.error(error, 'WebAuthService');
+      Logger.error(error);
      throw new InternalServerErrorException(error.message);
    }

@ -193,7 +193,7 @@ export class WebAuthService {
      };
      verification = verifyAuthenticationResponse(opts);
    } catch (error) {
-      Logger.error(error, 'WebAuthService');
+      Logger.error(error);
      throw new InternalServerErrorException({ error: error.message });
    }

--- a/apps/api/src/app/benchmark/benchmark.controller.ts
+++ b/apps/api/src/app/benchmark/benchmark.controller.ts
@ -1,48 +0,0 @@
-import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
-import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
-import {
-  BenchmarkMarketDataDetails,
-  BenchmarkResponse
-} from '@ghostfolio/common/interfaces';
-import {
-  Controller,
-  Get,
-  Param,
-  UseGuards,
-  UseInterceptors
-} from '@nestjs/common';
-import { AuthGuard } from '@nestjs/passport';
-import { DataSource } from '@prisma/client';
-
-import { BenchmarkService } from './benchmark.service';
-
-@Controller('benchmark')
-export class BenchmarkController {
-  public constructor(private readonly benchmarkService: BenchmarkService) {}
-
-  @Get()
-  @UseInterceptors(TransformDataSourceInRequestInterceptor)
-  @UseInterceptors(TransformDataSourceInResponseInterceptor)
-  public async getBenchmark(): Promise<BenchmarkResponse> {
-    return {
-      benchmarks: await this.benchmarkService.getBenchmarks()
-    };
-  }
-
-  @Get(':dataSource/:symbol/:startDateString')
-  @UseInterceptors(TransformDataSourceInRequestInterceptor)
-  @UseGuards(AuthGuard('jwt'))
-  public async getBenchmarkMarketDataBySymbol(
-    @Param('dataSource') dataSource: DataSource,
-    @Param('startDateString') startDateString: string,
-    @Param('symbol') symbol: string
-  ): Promise<BenchmarkMarketDataDetails> {
-    const startDate = new Date(startDateString);
-
-    return this.benchmarkService.getMarketDataBySymbol({
-      dataSource,
-      startDate,
-      symbol
-    });
-  }
-}
--- a/apps/api/src/app/benchmark/benchmark.module.ts
+++ b/apps/api/src/app/benchmark/benchmark.module.ts
@ -1,27 +0,0 @@
-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
-import { SymbolModule } from '@ghostfolio/api/app/symbol/symbol.module';
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { MarketDataModule } from '@ghostfolio/api/services/market-data.module';
-import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
-import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';
-import { Module } from '@nestjs/common';
-
-import { BenchmarkController } from './benchmark.controller';
-import { BenchmarkService } from './benchmark.service';
-
-@Module({
-  controllers: [BenchmarkController],
-  exports: [BenchmarkService],
-  imports: [
-    ConfigurationModule,
-    DataProviderModule,
-    MarketDataModule,
-    PropertyModule,
-    RedisCacheModule,
-    SymbolModule,
-    SymbolProfileModule
-  ],
-  providers: [BenchmarkService]
-})
-export class BenchmarkModule {}
--- a/apps/api/src/app/benchmark/benchmark.service.spec.ts
+++ b/apps/api/src/app/benchmark/benchmark.service.spec.ts
@ -1,15 +0,0 @@
-import { BenchmarkService } from './benchmark.service';
-
-describe('BenchmarkService', () => {
-  let benchmarkService: BenchmarkService;
-
-  beforeAll(async () => {
-    benchmarkService = new BenchmarkService(null, null, null, null, null, null);
-  });
-
-  it('calculateChangeInPercentage', async () => {
-    expect(benchmarkService.calculateChangeInPercentage(1, 2)).toEqual(1);
-    expect(benchmarkService.calculateChangeInPercentage(2, 2)).toEqual(0);
-    expect(benchmarkService.calculateChangeInPercentage(2, 1)).toEqual(-0.5);
-  });
-});
--- a/apps/api/src/app/benchmark/benchmark.service.ts
+++ b/apps/api/src/app/benchmark/benchmark.service.ts
@ -1,205 +0,0 @@
-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
-import { SymbolService } from '@ghostfolio/api/app/symbol/symbol.service';
-import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
-import { MarketDataService } from '@ghostfolio/api/services/market-data.service';
-import { PropertyService } from '@ghostfolio/api/services/property/property.service';
-import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
-import {
-  MAX_CHART_ITEMS,
-  PROPERTY_BENCHMARKS
-} from '@ghostfolio/common/config';
-import { DATE_FORMAT } from '@ghostfolio/common/helper';
-import {
-  BenchmarkMarketDataDetails,
-  BenchmarkResponse,
-  UniqueAsset
-} from '@ghostfolio/common/interfaces';
-import { Injectable } from '@nestjs/common';
-import { SymbolProfile } from '@prisma/client';
-import Big from 'big.js';
-import { format } from 'date-fns';
-import ms from 'ms';
-
-@Injectable()
-export class BenchmarkService {
-  private readonly CACHE_KEY_BENCHMARKS = 'BENCHMARKS';
-
-  public constructor(
-    private readonly dataProviderService: DataProviderService,
-    private readonly marketDataService: MarketDataService,
-    private readonly propertyService: PropertyService,
-    private readonly redisCacheService: RedisCacheService,
-    private readonly symbolProfileService: SymbolProfileService,
-    private readonly symbolService: SymbolService
-  ) {}
-
-  public calculateChangeInPercentage(baseValue: number, currentValue: number) {
-    if (baseValue && currentValue) {
-      return new Big(currentValue).div(baseValue).minus(1).toNumber();
-    }
-
-    return 0;
-  }
-
-  public async getBenchmarks({ useCache = true } = {}): Promise<
-    BenchmarkResponse['benchmarks']
-  > {
-    let benchmarks: BenchmarkResponse['benchmarks'];
-
-    if (useCache) {
-      try {
-        benchmarks = JSON.parse(
-          await this.redisCacheService.get(this.CACHE_KEY_BENCHMARKS)
-        );
-
-        if (benchmarks) {
-          return benchmarks;
-        }
-      } catch {}
-    }
-
-    const benchmarkAssetProfiles = await this.getBenchmarkAssetProfiles();
-
-    const promises: Promise<number>[] = [];
-
-    const quotes = await this.dataProviderService.getQuotes(
-      benchmarkAssetProfiles.map(({ dataSource, symbol }) => {
-        return { dataSource, symbol };
-      })
-    );
-
-    for (const { dataSource, symbol } of benchmarkAssetProfiles) {
-      promises.push(this.marketDataService.getMax({ dataSource, symbol }));
-    }
-
-    const allTimeHighs = await Promise.all(promises);
-
-    benchmarks = allTimeHighs.map((allTimeHigh, index) => {
-      const { marketPrice } =
-        quotes[benchmarkAssetProfiles[index].symbol] ?? {};
-
-      let performancePercentFromAllTimeHigh = 0;
-
-      if (allTimeHigh && marketPrice) {
-        performancePercentFromAllTimeHigh = this.calculateChangeInPercentage(
-          allTimeHigh,
-          marketPrice
-        );
-      }
-
-      return {
-        marketCondition: this.getMarketCondition(
-          performancePercentFromAllTimeHigh
-        ),
-        name: benchmarkAssetProfiles[index].name,
-        performances: {
-          allTimeHigh: {
-            performancePercent: performancePercentFromAllTimeHigh
-          }
-        }
-      };
-    });
-
-    await this.redisCacheService.set(
-      this.CACHE_KEY_BENCHMARKS,
-      JSON.stringify(benchmarks),
-      ms('4 hours') / 1000
-    );
-
-    return benchmarks;
-  }
-
-  public async getBenchmarkAssetProfiles(): Promise<Partial<SymbolProfile>[]> {
-    const symbolProfileIds: string[] = (
-      ((await this.propertyService.getByKey(PROPERTY_BENCHMARKS)) as {
-        symbolProfileId: string;
-      }[]) ?? []
-    ).map(({ symbolProfileId }) => {
-      return symbolProfileId;
-    });
-
-    const assetProfiles =
-      await this.symbolProfileService.getSymbolProfilesByIds(symbolProfileIds);
-
-    return assetProfiles
-      .map(({ dataSource, id, name, symbol }) => {
-        return {
-          dataSource,
-          id,
-          name,
-          symbol
-        };
-      })
-      .sort((a, b) => a.name.localeCompare(b.name));
-  }
-
-  public async getMarketDataBySymbol({
-    dataSource,
-    startDate,
-    symbol
-  }: { startDate: Date } & UniqueAsset): Promise<BenchmarkMarketDataDetails> {
-    const [currentSymbolItem, marketDataItems] = await Promise.all([
-      this.symbolService.get({
-        dataGatheringItem: {
-          dataSource,
-          symbol
-        }
-      }),
-      this.marketDataService.marketDataItems({
-        orderBy: {
-          date: 'asc'
-        },
-        where: {
-          dataSource,
-          symbol,
-          date: {
-            gte: startDate
-          }
-        }
-      })
-    ]);
-
-    const step = Math.round(
-      marketDataItems.length / Math.min(marketDataItems.length, MAX_CHART_ITEMS)
-    );
-
-    const marketPriceAtStartDate = marketDataItems?.[0]?.marketPrice ?? 0;
-    const response = {
-      marketData: [
-        ...marketDataItems
-          .filter((marketDataItem, index) => {
-            return index % step === 0;
-          })
-          .map((marketDataItem) => {
-            return {
-              date: format(marketDataItem.date, DATE_FORMAT),
-              value:
-                marketPriceAtStartDate === 0
-                  ? 0
-                  : this.calculateChangeInPercentage(
-                      marketPriceAtStartDate,
-                      marketDataItem.marketPrice
-                    ) * 100
-            };
-          })
-      ]
-    };
-
-    if (currentSymbolItem?.marketPrice) {
-      response.marketData.push({
-        date: format(new Date(), DATE_FORMAT),
-        value:
-          this.calculateChangeInPercentage(
-            marketPriceAtStartDate,
-            currentSymbolItem.marketPrice
-          ) * 100
-      });
-    }
-
-    return response;
-  }
-
-  private getMarketCondition(aPerformanceInPercent: number) {
-    return aPerformanceInPercent <= -0.2 ? 'BEAR_MARKET' : 'NEUTRAL_MARKET';
-  }
-}
--- a/apps/api/src/app/cache/cache.controller.ts
+++ b/apps/api/src/app/cache/cache.controller.ts
@ -1,39 +1,25 @@
+import { CacheService } from '@ghostfolio/api/app/cache/cache.service';
 import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
-import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type { RequestWithUser } from '@ghostfolio/common/types';
-import {
-  Controller,
-  HttpException,
-  Inject,
-  Post,
-  UseGuards
-} from '@nestjs/common';
+import { Controller, Inject, Post, UseGuards } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
-import { StatusCodes, getReasonPhrase } from 'http-status-codes';

@Controller('cache')
 export class CacheController {
  public constructor(
+    private readonly cacheService: CacheService,
    private readonly redisCacheService: RedisCacheService,
    @Inject(REQUEST) private readonly request: RequestWithUser
-  ) {}
+  ) {
+    this.redisCacheService.reset();
+  }

  @Post('flush')
  @UseGuards(AuthGuard('jwt'))
  public async flushCache(): Promise<void> {
-    if (
-      !hasPermission(
-        this.request.user.permissions,
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
+    this.redisCacheService.reset();

-    return this.redisCacheService.reset();
+    return this.cacheService.flush();
  }
 }
--- a/apps/api/src/app/cache/cache.module.ts
+++ b/apps/api/src/app/cache/cache.module.ts
@ -1,3 +1,4 @@
+import { CacheService } from '@ghostfolio/api/app/cache/cache.service';
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
@ -10,6 +11,7 @@ import { Module } from '@nestjs/common';
 import { CacheController } from './cache.controller';

@Module({
+  exports: [CacheService],
  controllers: [CacheController],
  imports: [
    ConfigurationModule,
@ -19,6 +21,7 @@ import { CacheController } from './cache.controller';
    PrismaModule,
    RedisCacheModule,
    SymbolProfileModule
-  ]
+  ],
+  providers: [CacheService]
 })
 export class CacheModule {}
--- a/apps/api/src/app/cache/cache.service.ts
+++ b/apps/api/src/app/cache/cache.service.ts
@ -0,0 +1,15 @@
+import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
+import { Injectable } from '@nestjs/common';
+
+@Injectable()
+export class CacheService {
+  public constructor(
+    private readonly dataGaterhingService: DataGatheringService
+  ) {}
+
+  public async flush(): Promise<void> {
+    await this.dataGaterhingService.reset();
+
+    return;
+  }
+}
--- a/apps/api/src/app/export/export.controller.ts
+++ b/apps/api/src/app/export/export.controller.ts
@ -1,6 +1,13 @@
 import { Export } from '@ghostfolio/common/interfaces';
 import type { RequestWithUser } from '@ghostfolio/common/types';
-import { Controller, Get, Inject, Query, UseGuards } from '@nestjs/common';
+import {
+  Controller,
+  Get,
+  Headers,
+  Inject,
+  Query,
+  UseGuards
+} from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';

--- a/apps/api/src/app/export/export.service.ts
+++ b/apps/api/src/app/export/export.service.ts
@ -14,11 +14,12 @@ export class ExportService {
    activityIds?: string[];
    userId: string;
  }): Promise<Export> {
-    let activities = await this.prismaService.order.findMany({
+    let orders = await this.prismaService.order.findMany({
      orderBy: { date: 'desc' },
      select: {
        accountId: true,
-        comment: true,
+        currency: true,
+        dataSource: true,
        date: true,
        fee: true,
        id: true,
@ -31,20 +32,19 @@ export class ExportService {
    });

    if (activityIds) {
-      activities = activities.filter((activity) => {
-        return activityIds.includes(activity.id);
+      orders = orders.filter((order) => {
+        return activityIds.includes(order.id);
      });
    }

    return {
      meta: { date: new Date().toISOString(), version: environment.version },
-      activities: activities.map(
+      orders: orders.map(
        ({
          accountId,
-          comment,
+          currency,
          date,
          fee,
-          id,
          quantity,
          SymbolProfile,
          type,
@ -52,15 +52,13 @@ export class ExportService {
        }) => {
          return {
            accountId,
-            comment,
+            currency,
+            date,
            fee,
-            id,
            quantity,
            type,
            unitPrice,
-            currency: SymbolProfile.currency,
            dataSource: SymbolProfile.dataSource,
-            date: date.toISOString(),
            symbol: type === 'ITEM' ? SymbolProfile.name : SymbolProfile.symbol
          };
        }
--- a/apps/api/src/app/frontend.middleware.ts
+++ b/apps/api/src/app/frontend.middleware.ts
@ -1,141 +0,0 @@
-import * as fs from 'fs';
-import * as path from 'path';
-
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
-import { Injectable, NestMiddleware } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import { NextFunction, Request, Response } from 'express';
-
-@Injectable()
-export class FrontendMiddleware implements NestMiddleware {
-  public indexHtmlDe = '';
-  public indexHtmlEn = '';
-  public indexHtmlEs = '';
-  public indexHtmlIt = '';
-  public indexHtmlNl = '';
-  public isProduction: boolean;
-
-  public constructor(
-    private readonly configService: ConfigService,
-    private readonly configurationService: ConfigurationService
-  ) {
-    const NODE_ENV =
-      this.configService.get<'development' | 'production'>('NODE_ENV') ??
-      'development';
-
-    this.isProduction = NODE_ENV === 'production';
-
-    try {
-      this.indexHtmlDe = fs.readFileSync(
-        this.getPathOfIndexHtmlFile('de'),
-        'utf8'
-      );
-      this.indexHtmlEn = fs.readFileSync(
-        this.getPathOfIndexHtmlFile(DEFAULT_LANGUAGE_CODE),
-        'utf8'
-      );
-      this.indexHtmlEs = fs.readFileSync(
-        this.getPathOfIndexHtmlFile('es'),
-        'utf8'
-      );
-      this.indexHtmlIt = fs.readFileSync(
-        this.getPathOfIndexHtmlFile('it'),
-        'utf8'
-      );
-      this.indexHtmlNl = fs.readFileSync(
-        this.getPathOfIndexHtmlFile('nl'),
-        'utf8'
-      );
-    } catch {}
-  }
-
-  public use(req: Request, res: Response, next: NextFunction) {
-    let featureGraphicPath = 'assets/cover.png';
-
-    if (
-      req.path === '/en/blog/2022/08/500-stars-on-github' ||
-      req.path === '/en/blog/2022/08/500-stars-on-github/'
-    ) {
-      featureGraphicPath = 'assets/images/blog/500-stars-on-github.jpg';
-    }
-
-    if (
-      req.path.startsWith('/api/') ||
-      this.isFileRequest(req.url) ||
-      !this.isProduction
-    ) {
-      // Skip
-      next();
-    } else if (req.path === '/de' || req.path.startsWith('/de/')) {
-      res.send(
-        this.interpolate(this.indexHtmlDe, {
-          featureGraphicPath,
-          languageCode: 'de',
-          path: req.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    } else if (req.path === '/es' || req.path.startsWith('/es/')) {
-      res.send(
-        this.interpolate(this.indexHtmlEs, {
-          featureGraphicPath,
-          languageCode: 'es',
-          path: req.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    } else if (req.path === '/it' || req.path.startsWith('/it/')) {
-      res.send(
-        this.interpolate(this.indexHtmlIt, {
-          featureGraphicPath,
-          languageCode: 'it',
-          path: req.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    } else if (req.path === '/nl' || req.path.startsWith('/nl/')) {
-      res.send(
-        this.interpolate(this.indexHtmlNl, {
-          featureGraphicPath,
-          languageCode: 'nl',
-          path: req.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    } else {
-      res.send(
-        this.interpolate(this.indexHtmlEn, {
-          featureGraphicPath,
-          languageCode: DEFAULT_LANGUAGE_CODE,
-          path: req.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    }
-  }
-
-  private getPathOfIndexHtmlFile(aLocale: string) {
-    return path.join(__dirname, '..', 'client', aLocale, 'index.html');
-  }
-
-  private interpolate(template: string, context: any) {
-    return template.replace(/[$]{([^}]+)}/g, (_, objectPath) => {
-      const properties = objectPath.split('.');
-      return properties.reduce(
-        (previous, current) => previous?.[current],
-        context
-      );
-    });
-  }
-
-  private isFileRequest(filename: string) {
-    if (filename === '/assets/LICENSE') {
-      return true;
-    } else if (filename.includes('auth/ey')) {
-      return false;
-    }
-
-    return filename.split('.').pop() !== filename;
-  }
-}
--- a/apps/api/src/app/import/import-data.dto.ts
+++ b/apps/api/src/app/import/import-data.dto.ts
@ -1,4 +1,5 @@
 import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
+import { Order } from '@prisma/client';
 import { Type } from 'class-transformer';
 import { IsArray, ValidateNested } from 'class-validator';

@ -6,5 +7,5 @@ export class ImportDataDto {
  @IsArray()
  @Type(() => CreateOrderDto)
  @ValidateNested({ each: true })
-  activities: CreateOrderDto[];
+  orders: Order[];
 }
--- a/apps/api/src/app/import/import.controller.ts
+++ b/apps/api/src/app/import/import.controller.ts
@ -34,25 +34,13 @@ export class ImportController {
      );
    }

-    let maxActivitiesToImport = this.configurationService.get(
-      'MAX_ACTIVITIES_TO_IMPORT'
-    );
-
-    if (
-      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
-      this.request.user.subscription.type === 'Premium'
-    ) {
-      maxActivitiesToImport = Number.MAX_SAFE_INTEGER;
-    }
-
    try {
      return await this.importService.import({
-        maxActivitiesToImport,
-        activities: importData.activities,
+        orders: importData.orders,
        userId: this.request.user.id
      });
    } catch (error) {
-      Logger.error(error, ImportController);
+      Logger.error(error);

      throw new HttpException(
        {
--- a/apps/api/src/app/import/import.service.ts
+++ b/apps/api/src/app/import/import.service.ts
@ -1,9 +1,9 @@
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
-import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
 import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { Injectable } from '@nestjs/common';
+import { Order } from '@prisma/client';
 import { isSameDay, parseISO } from 'date-fns';

@Injectable()
@ -16,29 +16,23 @@ export class ImportService {
  ) {}

  public async import({
-    activities,
-    maxActivitiesToImport,
+    orders,
    userId
  }: {
-    activities: Partial<CreateOrderDto>[];
-    maxActivitiesToImport: number;
+    orders: Partial<Order>[];
    userId: string;
  }): Promise<void> {
-    for (const activity of activities) {
-      if (!activity.dataSource) {
-        if (activity.type === 'ITEM') {
-          activity.dataSource = 'MANUAL';
+    for (const order of orders) {
+      if (!order.dataSource) {
+        if (order.type === 'ITEM') {
+          order.dataSource = 'MANUAL';
        } else {
-          activity.dataSource = this.dataProviderService.getPrimaryDataSource();
+          order.dataSource = this.dataProviderService.getPrimaryDataSource();
        }
      }
    }

-    await this.validateActivities({
-      activities,
-      maxActivitiesToImport,
-      userId
-    });
+    await this.validateOrders({ orders, userId });

    const accountIds = (await this.accountService.getAccounts(userId)).map(
      (account) => {
@ -48,7 +42,6 @@ export class ImportService {

    for (const {
      accountId,
-      comment,
      currency,
      dataSource,
      date,
@ -57,11 +50,13 @@ export class ImportService {
      symbol,
      type,
      unitPrice
-    } of activities) {
+    } of orders) {
      await this.orderService.createOrder({
-        comment,
+        currency,
+        dataSource,
        fee,
        quantity,
+        symbol,
        type,
        unitPrice,
        userId,
@ -70,7 +65,6 @@ export class ImportService {
        SymbolProfile: {
          connectOrCreate: {
            create: {
-              currency,
              dataSource,
              symbol
            },
@ -87,21 +81,24 @@ export class ImportService {
    }
  }

-  private async validateActivities({
-    activities,
-    maxActivitiesToImport,
+  private async validateOrders({
+    orders,
    userId
  }: {
-    activities: Partial<CreateOrderDto>[];
-    maxActivitiesToImport: number;
+    orders: Partial<Order>[];
    userId: string;
  }) {
-    if (activities?.length > maxActivitiesToImport) {
-      throw new Error(`Too many activities (${maxActivitiesToImport} at most)`);
+    if (
+      orders?.length > this.configurationService.get('MAX_ORDERS_TO_IMPORT')
+    ) {
+      throw new Error(
+        `Too many transactions (${this.configurationService.get(
+          'MAX_ORDERS_TO_IMPORT'
+        )} at most)`
+      );
    }

-    const existingActivities = await this.orderService.orders({
-      include: { SymbolProfile: true },
+    const existingOrders = await this.orderService.orders({
      orderBy: { date: 'desc' },
      where: { userId }
    });
@ -109,38 +106,38 @@ export class ImportService {
    for (const [
      index,
      { currency, dataSource, date, fee, quantity, symbol, type, unitPrice }
-    ] of activities.entries()) {
-      const duplicateActivity = existingActivities.find((activity) => {
+    ] of orders.entries()) {
+      const duplicateOrder = existingOrders.find((order) => {
        return (
-          activity.SymbolProfile.currency === currency &&
-          activity.SymbolProfile.dataSource === dataSource &&
-          isSameDay(activity.date, parseISO(<string>(<unknown>date))) &&
-          activity.fee === fee &&
-          activity.quantity === quantity &&
-          activity.SymbolProfile.symbol === symbol &&
-          activity.type === type &&
-          activity.unitPrice === unitPrice
+          order.currency === currency &&
+          order.dataSource === dataSource &&
+          isSameDay(order.date, parseISO(<string>(<unknown>date))) &&
+          order.fee === fee &&
+          order.quantity === quantity &&
+          order.symbol === symbol &&
+          order.type === type &&
+          order.unitPrice === unitPrice
        );
      });

-      if (duplicateActivity) {
-        throw new Error(`activities.${index} is a duplicate activity`);
+      if (duplicateOrder) {
+        throw new Error(`orders.${index} is a duplicate transaction`);
      }

      if (dataSource !== 'MANUAL') {
-        const quotes = await this.dataProviderService.getQuotes([
+        const result = await this.dataProviderService.get([
          { dataSource, symbol }
        ]);

-        if (quotes[symbol] === undefined) {
+        if (result[symbol] === undefined) {
          throw new Error(
-            `activities.${index}.symbol ("${symbol}") is not valid for the specified data source ("${dataSource}")`
+            `orders.${index}.symbol ("${symbol}") is not valid for the specified data source ("${dataSource}")`
          );
        }

-        if (quotes[symbol].currency !== currency) {
+        if (result[symbol].currency !== currency) {
          throw new Error(
-            `activities.${index}.currency ("${currency}") does not match with "${quotes[symbol].currency}"`
+            `orders.${index}.currency ("${currency}") does not match with "${result[symbol].currency}"`
          );
        }
      }
--- a/apps/api/src/app/info/info.controller.ts
+++ b/apps/api/src/app/info/info.controller.ts
@ -1,6 +1,5 @@
-import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
 import { InfoItem } from '@ghostfolio/common/interfaces';
-import { Controller, Get, UseInterceptors } from '@nestjs/common';
+import { Controller, Get } from '@nestjs/common';

 import { InfoService } from './info.service';

@ -9,7 +8,6 @@ export class InfoController {
  public constructor(private readonly infoService: InfoService) {}

  @Get()
-  @UseInterceptors(TransformDataSourceInResponseInterceptor)
  public async getInfo(): Promise<InfoItem> {
    return this.infoService.get();
  }
--- a/apps/api/src/app/info/info.module.ts
+++ b/apps/api/src/app/info/info.module.ts
@ -1,4 +1,3 @@
-import { BenchmarkModule } from '@ghostfolio/api/app/benchmark/benchmark.module';
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
@ -7,7 +6,6 @@ import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-d
 import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
 import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';
-import { TagModule } from '@ghostfolio/api/services/tag/tag.module';
 import { Module } from '@nestjs/common';
 import { JwtModule } from '@nestjs/jwt';

@ -17,7 +15,6 @@ import { InfoService } from './info.service';
@Module({
  controllers: [InfoController],
  imports: [
-    BenchmarkModule,
    ConfigurationModule,
    DataGatheringModule,
    DataProviderModule,
@ -29,8 +26,7 @@ import { InfoService } from './info.service';
    PrismaModule,
    PropertyModule,
    RedisCacheModule,
-    SymbolProfileModule,
-    TagModule
+    SymbolProfileModule
  ],
  providers: [InfoService]
 })
--- a/apps/api/src/app/info/info.service.ts
+++ b/apps/api/src/app/info/info.service.ts
@ -1,10 +1,9 @@
-import { BenchmarkService } from '@ghostfolio/api/app/benchmark/benchmark.service';
 import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
+import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
-import { TagService } from '@ghostfolio/api/services/tag/tag.service';
 import {
  DEMO_USER_ID,
  PROPERTY_IS_READ_ONLY_MODE,
@ -13,10 +12,7 @@ import {
  PROPERTY_SYSTEM_MESSAGE,
  ghostfolioFearAndGreedIndexDataSource
 } from '@ghostfolio/common/config';
-import {
-  encodeDataSource,
-  extractNumberFromString
-} from '@ghostfolio/common/helper';
+import { encodeDataSource } from '@ghostfolio/common/helper';
 import { InfoItem } from '@ghostfolio/common/interfaces';
 import { Statistics } from '@ghostfolio/common/interfaces/statistics.interface';
 import { Subscription } from '@ghostfolio/common/interfaces/subscription.interface';
@ -24,7 +20,6 @@ import { permissions } from '@ghostfolio/common/permissions';
 import { Injectable, Logger } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import * as bent from 'bent';
-import * as cheerio from 'cheerio';
 import { subDays } from 'date-fns';

@Injectable()
@ -32,14 +27,13 @@ export class InfoService {
  private static CACHE_KEY_STATISTICS = 'STATISTICS';

  public constructor(
-    private readonly benchmarkService: BenchmarkService,
    private readonly configurationService: ConfigurationService,
    private readonly exchangeRateDataService: ExchangeRateDataService,
+    private readonly dataGatheringService: DataGatheringService,
    private readonly jwtService: JwtService,
    private readonly prismaService: PrismaService,
    private readonly propertyService: PropertyService,
-    private readonly redisCacheService: RedisCacheService,
-    private readonly tagService: TagService
+    private readonly redisCacheService: RedisCacheService
  ) {}

  public async get(): Promise<InfoItem> {
@ -58,17 +52,9 @@ export class InfoService {
    }

    if (this.configurationService.get('ENABLE_FEATURE_FEAR_AND_GREED_INDEX')) {
-      if (
-        this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') === true
-      ) {
-        info.fearAndGreedDataSource = encodeDataSource(
-          ghostfolioFearAndGreedIndexDataSource
-        );
-      } else {
-        info.fearAndGreedDataSource = ghostfolioFearAndGreedIndexDataSource;
-      }
-
-      globalPermissions.push(permissions.enableFearAndGreedIndex);
+      info.fearAndGreedDataSource = encodeDataSource(
+        ghostfolioFearAndGreedIndexDataSource
+      );
    }

    if (this.configurationService.get('ENABLE_FEATURE_IMPORT')) {
@ -109,13 +95,11 @@ export class InfoService {
      isReadOnlyMode,
      platforms,
      systemMessage,
-      baseCurrency: this.configurationService.get('BASE_CURRENCY'),
-      benchmarks: await this.benchmarkService.getBenchmarkAssetProfiles(),
      currencies: this.exchangeRateDataService.getCurrencies(),
      demoAuthToken: this.getDemoAuthToken(),
+      lastDataGathering: await this.getLastDataGathering(),
      statistics: await this.getStatistics(),
-      subscriptions: await this.getSubscriptions(),
-      tags: await this.tagService.get()
+      subscriptions: await this.getSubscriptions()
    };
  }

@ -145,10 +129,10 @@ export class InfoService {
    });
  }

-  private async countDockerHubPulls(): Promise<number> {
+  private async countGitHubContributors(): Promise<number> {
    try {
      const get = bent(
-        `https://hub.docker.com/v2/repositories/ghostfolio/ghostfolio`,
+        `https://api.github.com/repos/ghostfolio/ghostfolio/contributors`,
        'GET',
        'json',
        200,
@ -157,35 +141,10 @@ export class InfoService {
        }
      );

-      const { pull_count } = await get();
-      return pull_count;
+      const contributors = await get();
+      return contributors?.length;
    } catch (error) {
-      Logger.error(error, 'InfoService');
-
-      return undefined;
-    }
-  }
-
-  private async countGitHubContributors(): Promise<number> {
-    try {
-      const get = bent(
-        'https://github.com/ghostfolio/ghostfolio',
-        'GET',
-        'string',
-        200,
-        {}
-      );
-
-      const html = await get();
-      const $ = cheerio.load(html);
-
-      return extractNumberFromString(
-        $(
-          `a[href="/ghostfolio/ghostfolio/graphs/contributors"] .Counter`
-        ).text()
-      );
-    } catch (error) {
-      Logger.error(error, 'InfoService');
+      Logger.error(error);

      return undefined;
    }
@ -206,7 +165,7 @@ export class InfoService {
      const { stargazers_count } = await get();
      return stargazers_count;
    } catch (error) {
-      Logger.error(error, 'InfoService');
+      Logger.error(error);

      return undefined;
    }
@ -246,6 +205,13 @@ export class InfoService {
    });
  }

+  private async getLastDataGathering() {
+    const lastDataGathering =
+      await this.dataGatheringService.getLastDataGathering();
+
+    return lastDataGathering ?? null;
+  }
+
  private async getStatistics() {
    if (!this.configurationService.get('ENABLE_FEATURE_STATISTICS')) {
      return undefined;
@ -266,8 +232,6 @@ export class InfoService {
    const activeUsers1d = await this.countActiveUsers(1);
    const activeUsers30d = await this.countActiveUsers(30);
    const newUsers30d = await this.countNewUsers(30);
-
-    const dockerHubPulls = await this.countDockerHubPulls();
    const gitHubContributors = await this.countGitHubContributors();
    const gitHubStargazers = await this.countGitHubStargazers();
    const slackCommunityUsers = await this.countSlackCommunityUsers();
@ -275,7 +239,6 @@ export class InfoService {
    statistics = {
      activeUsers1d,
      activeUsers30d,
-      dockerHubPulls,
      gitHubContributors,
      gitHubStargazers,
      newUsers30d,
--- a/apps/api/src/app/order/create-order.dto.ts
+++ b/apps/api/src/app/order/create-order.dto.ts
@ -1,47 +1,23 @@
+import { DataSource, Type } from '@prisma/client';
 import {
-  AssetClass,
-  AssetSubClass,
-  DataSource,
-  Tag,
-  Type
-} from '@prisma/client';
-import { Transform, TransformFnParams } from 'class-transformer';
-import {
-  IsArray,
  IsEnum,
  IsISO8601,
  IsNumber,
  IsOptional,
  IsString
 } from 'class-validator';
-import { isString } from 'lodash';

 export class CreateOrderDto {
-  @IsOptional()
  @IsString()
-  accountId?: string;
-
  @IsOptional()
-  @IsEnum(AssetClass, { each: true })
-  assetClass?: AssetClass;
-
-  @IsOptional()
-  @IsEnum(AssetSubClass, { each: true })
-  assetSubClass?: AssetSubClass;
-
-  @IsOptional()
-  @IsString()
-  @Transform(({ value }: TransformFnParams) =>
-    isString(value) ? value.trim() : value
-  )
-  comment?: string;
+  accountId: string;

  @IsString()
  currency: string;

-  @IsOptional()
  @IsEnum(DataSource, { each: true })
-  dataSource?: DataSource;
+  @IsOptional()
+  dataSource: DataSource;

  @IsISO8601()
  date: string;
@ -55,10 +31,6 @@ export class CreateOrderDto {
  @IsString()
  symbol: string;

-  @IsArray()
-  @IsOptional()
-  tags?: Tag[];
-
  @IsEnum(Type, { each: true })
  type: Type;

--- a/apps/api/src/app/order/order.controller.ts
+++ b/apps/api/src/app/order/order.controller.ts
@ -1,10 +1,8 @@
 import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { nullifyValuesInObjects } from '@ghostfolio/api/helper/object.helper';
-import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response.interceptor';
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
 import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
 import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
-import { Filter } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
@ -18,7 +16,6 @@ import {
  Param,
  Post,
  Put,
-  Query,
  UseGuards,
  UseInterceptors
 } from '@nestjs/common';
@ -45,12 +42,8 @@ export class OrderController {
  @Delete(':id')
  @UseGuards(AuthGuard('jwt'))
  public async deleteOrder(@Param('id') id: string): Promise<OrderModel> {
-    const order = await this.orderService.order({ id });
-
    if (
-      !hasPermission(this.request.user.permissions, permissions.deleteOrder) ||
-      !order ||
-      order.userId !== this.request.user.id
+      !hasPermission(this.request.user.permissions, permissions.deleteOrder)
    ) {
      throw new HttpException(
        getReasonPhrase(StatusCodes.FORBIDDEN),
@ -59,58 +52,30 @@ export class OrderController {
    }

    return this.orderService.deleteOrder({
-      id
+      id_userId: {
+        id,
+        userId: this.request.user.id
+      }
    });
  }

  @Get()
  @UseGuards(AuthGuard('jwt'))
-  @UseInterceptors(RedactValuesInResponseInterceptor)
  @UseInterceptors(TransformDataSourceInResponseInterceptor)
  public async getAllOrders(
-    @Headers('impersonation-id') impersonationId,
-    @Query('accounts') filterByAccounts?: string,
-    @Query('assetClasses') filterByAssetClasses?: string,
-    @Query('tags') filterByTags?: string
+    @Headers('impersonation-id') impersonationId
  ): Promise<Activities> {
-    const accountIds = filterByAccounts?.split(',') ?? [];
-    const assetClasses = filterByAssetClasses?.split(',') ?? [];
-    const tagIds = filterByTags?.split(',') ?? [];
-
-    const filters: Filter[] = [
-      ...accountIds.map((accountId) => {
-        return <Filter>{
-          id: accountId,
-          type: 'ACCOUNT'
-        };
-      }),
-      ...assetClasses.map((assetClass) => {
-        return <Filter>{
-          id: assetClass,
-          type: 'ASSET_CLASS'
-        };
-      }),
-      ...tagIds.map((tagId) => {
-        return <Filter>{
-          id: tagId,
-          type: 'TAG'
-        };
-      })
-    ];
-
    const impersonationUserId =
      await this.impersonationService.validateImpersonationId(
        impersonationId,
        this.request.user.id
      );
-    const userCurrency = this.request.user.Settings.settings.baseCurrency;
+    const userCurrency = this.request.user.Settings.currency;

    let activities = await this.orderService.getOrders({
-      filters,
      userCurrency,
      includeDrafts: true,
-      userId: impersonationUserId || this.request.user.id,
-      withExcludedAccounts: true
+      userId: impersonationUserId || this.request.user.id
    });

    if (
@ -149,7 +114,6 @@ export class OrderController {
      SymbolProfile: {
        connectOrCreate: {
          create: {
-            currency: data.currency,
            dataSource: data.dataSource,
            symbol: data.symbol
          },
@ -170,15 +134,23 @@ export class OrderController {
  @UseGuards(AuthGuard('jwt'))
  @UseInterceptors(TransformDataSourceInRequestInterceptor)
  public async update(@Param('id') id: string, @Body() data: UpdateOrderDto) {
+    if (
+      !hasPermission(this.request.user.permissions, permissions.updateOrder)
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
    const originalOrder = await this.orderService.order({
-      id
+      id_userId: {
+        id,
+        userId: this.request.user.id
+      }
    });

-    if (
-      !hasPermission(this.request.user.permissions, permissions.updateOrder) ||
-      !originalOrder ||
-      originalOrder.userId !== this.request.user.id
-    ) {
+    if (!originalOrder) {
      throw new HttpException(
        getReasonPhrase(StatusCodes.FORBIDDEN),
        StatusCodes.FORBIDDEN
@ -199,23 +171,13 @@ export class OrderController {
            id_userId: { id: accountId, userId: this.request.user.id }
          }
        },
-        SymbolProfile: {
-          connect: {
-            dataSource_symbol: {
-              dataSource: data.dataSource,
-              symbol: data.symbol
-            }
-          },
-          update: {
-            assetClass: data.assetClass,
-            assetSubClass: data.assetSubClass,
-            name: data.symbol
-          }
-        },
        User: { connect: { id: this.request.user.id } }
      },
      where: {
-        id
+        id_userId: {
+          id,
+          userId: this.request.user.id
+        }
      }
    });
  }
--- a/apps/api/src/app/order/order.service.ts
+++ b/apps/api/src/app/order/order.service.ts
@ -1,27 +1,14 @@
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
+import { CacheService } from '@ghostfolio/api/app/cache/cache.service';
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
-import {
-  GATHER_ASSET_PROFILE_PROCESS,
-  GATHER_ASSET_PROFILE_PROCESS_OPTIONS
-} from '@ghostfolio/common/config';
-import { Filter } from '@ghostfolio/common/interfaces';
 import { OrderWithAccount } from '@ghostfolio/common/types';
 import { Injectable } from '@nestjs/common';
-import {
-  AssetClass,
-  AssetSubClass,
-  DataSource,
-  Order,
-  Prisma,
-  Tag,
-  Type as TypeOfOrder
-} from '@prisma/client';
+import { DataSource, Order, Prisma, Type as TypeOfOrder } from '@prisma/client';
 import Big from 'big.js';
 import { endOfToday, isAfter } from 'date-fns';
-import { groupBy } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';

 import { Activity } from './interfaces/activities.interface';
@ -30,8 +17,9 @@ import { Activity } from './interfaces/activities.interface';
 export class OrderService {
  public constructor(
    private readonly accountService: AccountService,
-    private readonly dataGatheringService: DataGatheringService,
+    private readonly cacheService: CacheService,
    private readonly exchangeRateDataService: ExchangeRateDataService,
+    private readonly dataGatheringService: DataGatheringService,
    private readonly prismaService: PrismaService,
    private readonly symbolProfileService: SymbolProfileService
  ) {}
@ -65,16 +53,7 @@ export class OrderService {
  }

  public async createOrder(
-    data: Prisma.OrderCreateInput & {
-      accountId?: string;
-      assetClass?: AssetClass;
-      assetSubClass?: AssetSubClass;
-      currency?: string;
-      dataSource?: DataSource;
-      symbol?: string;
-      tags?: Tag[];
-      userId: string;
-    }
+    data: Prisma.OrderCreateInput & { accountId?: string; userId: string }
  ): Promise<Order> {
    const defaultAccount = (
      await this.accountService.getAccounts(data.userId)
@ -82,8 +61,6 @@ export class OrderService {
      return account.isDefault === true;
    });

-    const tags = data.tags ?? [];
-
    let Account = {
      connect: {
        id_userId: {
@ -94,17 +71,15 @@ export class OrderService {
    };

    if (data.type === 'ITEM') {
-      const assetClass = data.assetClass;
-      const assetSubClass = data.assetSubClass;
-      const currency = data.SymbolProfile.connectOrCreate.create.currency;
+      const currency = data.currency;
      const dataSource: DataSource = 'MANUAL';
      const id = uuidv4();
      const name = data.SymbolProfile.connectOrCreate.create.symbol;

      Account = undefined;
+      data.dataSource = dataSource;
      data.id = id;
-      data.SymbolProfile.connectOrCreate.create.assetClass = assetClass;
-      data.SymbolProfile.connectOrCreate.create.assetSubClass = assetSubClass;
+      data.symbol = null;
      data.SymbolProfile.connectOrCreate.create.currency = currency;
      data.SymbolProfile.connectOrCreate.create.dataSource = dataSource;
      data.SymbolProfile.connectOrCreate.create.name = name;
@ -118,40 +93,29 @@ export class OrderService {
        data.SymbolProfile.connectOrCreate.create.symbol.toUpperCase();
    }

-    await this.dataGatheringService.addJobToQueue(
-      GATHER_ASSET_PROFILE_PROCESS,
-      {
-        dataSource: data.SymbolProfile.connectOrCreate.create.dataSource,
-        symbol: data.SymbolProfile.connectOrCreate.create.symbol
-      },
-      GATHER_ASSET_PROFILE_PROCESS_OPTIONS
-    );
-
    const isDraft = isAfter(data.date as Date, endOfToday());

    if (!isDraft) {
      // Gather symbol data of order in the background, if not draft
      this.dataGatheringService.gatherSymbols([
        {
-          dataSource: data.SymbolProfile.connectOrCreate.create.dataSource,
+          dataSource: data.dataSource,
          date: <Date>data.date,
          symbol: data.SymbolProfile.connectOrCreate.create.symbol
        }
      ]);
    }

+    this.dataGatheringService.gatherProfileData([
+      {
+        dataSource: data.dataSource,
+        symbol: data.SymbolProfile.connectOrCreate.create.symbol
+      }
+    ]);
+
+    await this.cacheService.flush();
+
    delete data.accountId;
-    delete data.assetClass;
-    delete data.assetSubClass;
-
-    if (!data.comment) {
-      delete data.comment;
-    }
-
-    delete data.currency;
-    delete data.dataSource;
-    delete data.symbol;
-    delete data.tags;
    delete data.userId;

    const orderData: Prisma.OrderCreateInput = data;
@ -160,12 +124,7 @@ export class OrderService {
      data: {
        ...orderData,
        Account,
-        isDraft,
-        tags: {
-          connect: tags.map(({ id }) => {
-            return { id };
-          })
-        }
+        isDraft
      }
    });
  }
@ -185,81 +144,22 @@ export class OrderService {
  }

  public async getOrders({
-    filters,
    includeDrafts = false,
    types,
    userCurrency,
-    userId,
-    withExcludedAccounts = false
+    userId
  }: {
-    filters?: Filter[];
    includeDrafts?: boolean;
    types?: TypeOfOrder[];
    userCurrency: string;
    userId: string;
-    withExcludedAccounts?: boolean;
  }): Promise<Activity[]> {
    const where: Prisma.OrderWhereInput = { userId };

-    const {
-      ACCOUNT: filtersByAccount,
-      ASSET_CLASS: filtersByAssetClass,
-      TAG: filtersByTag
-    } = groupBy(filters, (filter) => {
-      return filter.type;
-    });
-
-    if (filtersByAccount?.length > 0) {
-      where.accountId = {
-        in: filtersByAccount.map(({ id }) => {
-          return id;
-        })
-      };
-    }
-
    if (includeDrafts === false) {
      where.isDraft = false;
    }

-    if (filtersByAssetClass?.length > 0) {
-      where.SymbolProfile = {
-        OR: [
-          {
-            AND: [
-              {
-                OR: filtersByAssetClass.map(({ id }) => {
-                  return { assetClass: AssetClass[id] };
-                })
-              },
-              {
-                OR: [
-                  { SymbolProfileOverrides: { is: null } },
-                  { SymbolProfileOverrides: { assetClass: null } }
-                ]
-              }
-            ]
-          },
-          {
-            SymbolProfileOverrides: {
-              OR: filtersByAssetClass.map(({ id }) => {
-                return { assetClass: AssetClass[id] };
-              })
-            }
-          }
-        ]
-      };
-    }
-
-    if (filtersByTag?.length > 0) {
-      where.tags = {
-        some: {
-          OR: filtersByTag.map(({ id }) => {
-            return { id };
-          })
-        }
-      };
-    }
-
    if (types) {
      where.OR = types.map((type) => {
        return {
@ -281,96 +181,66 @@ export class OrderService {
            }
          },
          // eslint-disable-next-line @typescript-eslint/naming-convention
-          SymbolProfile: true,
-          tags: true
+          SymbolProfile: true
        },
        orderBy: { date: 'asc' }
      })
-    )
-      .filter((order) => {
-        return withExcludedAccounts || order.Account?.isExcluded === false;
-      })
-      .map((order) => {
-        const value = new Big(order.quantity).mul(order.unitPrice).toNumber();
+    ).map((order) => {
+      const value = new Big(order.quantity).mul(order.unitPrice).toNumber();

-        return {
-          ...order,
+      return {
+        ...order,
+        value,
+        feeInBaseCurrency: this.exchangeRateDataService.toCurrency(
+          order.fee,
+          order.currency,
+          userCurrency
+        ),
+        valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
          value,
-          feeInBaseCurrency: this.exchangeRateDataService.toCurrency(
-            order.fee,
-            order.SymbolProfile.currency,
-            userCurrency
-          ),
-          valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
-            value,
-            order.SymbolProfile.currency,
-            userCurrency
-          )
-        };
-      });
+          order.currency,
+          userCurrency
+        )
+      };
+    });
  }

-  public async updateOrder({
-    data,
-    where
-  }: {
-    data: Prisma.OrderUpdateInput & {
-      assetClass?: AssetClass;
-      assetSubClass?: AssetSubClass;
-      currency?: string;
-      dataSource?: DataSource;
-      symbol?: string;
-      tags?: Tag[];
-    };
+  public async updateOrder(params: {
    where: Prisma.OrderWhereUniqueInput;
+    data: Prisma.OrderUpdateInput;
  }): Promise<Order> {
+    const { data, where } = params;
+
    if (data.Account.connect.id_userId.id === null) {
      delete data.Account;
    }

-    if (!data.comment) {
-      data.comment = null;
-    }
-
-    const tags = data.tags ?? [];
-
-    let isDraft = false;
-
    if (data.type === 'ITEM') {
-      delete data.SymbolProfile.connect;
-    } else {
-      delete data.SymbolProfile.update;
+      const name = data.symbol;

-      isDraft = isAfter(data.date as Date, endOfToday());
-
-      if (!isDraft) {
-        // Gather symbol data of order in the background, if not draft
-        this.dataGatheringService.gatherSymbols([
-          {
-            dataSource: data.SymbolProfile.connect.dataSource_symbol.dataSource,
-            date: <Date>data.date,
-            symbol: data.SymbolProfile.connect.dataSource_symbol.symbol
-          }
-        ]);
-      }
+      data.symbol = null;
+      data.SymbolProfile = { update: { name } };
    }

-    delete data.assetClass;
-    delete data.assetSubClass;
-    delete data.currency;
-    delete data.dataSource;
-    delete data.symbol;
-    delete data.tags;
+    const isDraft = isAfter(data.date as Date, endOfToday());
+
+    if (!isDraft) {
+      // Gather symbol data of order in the background, if not draft
+      this.dataGatheringService.gatherSymbols([
+        {
+          dataSource: <DataSource>data.dataSource,
+          date: <Date>data.date,
+          symbol: <string>data.symbol
+        }
+      ]);
+    }
+
+    await this.cacheService.flush();

    return this.prismaService.order.update({
      data: {
        ...data,
-        isDraft,
-        tags: {
-          connect: tags.map(({ id }) => {
-            return { id };
-          })
-        }
+        isDraft
      },
      where
    });
--- a/apps/api/src/app/order/update-order.dto.ts
+++ b/apps/api/src/app/order/update-order.dto.ts
@ -1,40 +1,10 @@
-import {
-  AssetClass,
-  AssetSubClass,
-  DataSource,
-  Tag,
-  Type
-} from '@prisma/client';
-import { Transform, TransformFnParams } from 'class-transformer';
-import {
-  IsArray,
-  IsEnum,
-  IsISO8601,
-  IsNumber,
-  IsOptional,
-  IsString
-} from 'class-validator';
-import { isString } from 'lodash';
+import { DataSource, Type } from '@prisma/client';
+import { IsISO8601, IsNumber, IsOptional, IsString } from 'class-validator';

 export class UpdateOrderDto {
  @IsOptional()
  @IsString()
-  accountId?: string;
-
-  @IsEnum(AssetClass, { each: true })
-  @IsOptional()
-  assetClass?: AssetClass;
-
-  @IsEnum(AssetSubClass, { each: true })
-  @IsOptional()
-  assetSubClass?: AssetSubClass;
-
-  @IsOptional()
-  @IsString()
-  @Transform(({ value }: TransformFnParams) =>
-    isString(value) ? value.trim() : value
-  )
-  comment?: string;
+  accountId: string;

  @IsString()
  currency: string;
@ -57,10 +27,6 @@ export class UpdateOrderDto {
  @IsString()
  symbol: string;

-  @IsArray()
-  @IsOptional()
-  tags?: Tag[];
-
  @IsString()
  type: Type;

--- a/apps/api/src/app/portfolio/current-rate.service.mock.ts
+++ b/apps/api/src/app/portfolio/current-rate.service.mock.ts
@ -1,7 +1,6 @@
 import { parseDate, resetHours } from '@ghostfolio/common/helper';
 import { addDays, endOfDay, isBefore, isSameDay } from 'date-fns';

-import { GetValueObject } from './interfaces/get-value-object.interface';
 import { GetValuesParams } from './interfaces/get-values-params.interface';

 function mockGetValue(symbol: string, date: Date) {
@ -21,24 +20,14 @@ function mockGetValue(symbol: string, date: Date) {

      return { marketPrice: 0 };

-    case 'NOVN.SW':
-      if (isSameDay(parseDate('2022-04-11'), date)) {
-        return { marketPrice: 87.8 };
-      }
-
-      return { marketPrice: 0 };
-
    default:
      return { marketPrice: 0 };
  }
 }

 export const CurrentRateServiceMock = {
-  getValues: ({
-    dataGatheringItems,
-    dateQuery
-  }: GetValuesParams): Promise<GetValueObject[]> => {
-    const result: GetValueObject[] = [];
+  getValues: ({ dataGatheringItems, dateQuery }: GetValuesParams) => {
+    const result = [];
    if (dateQuery.lt) {
      for (
        let date = resetHours(dateQuery.gte);
@ -48,10 +37,8 @@ export const CurrentRateServiceMock = {
        for (const dataGatheringItem of dataGatheringItems) {
          result.push({
            date,
-            marketPriceInBaseCurrency: mockGetValue(
-              dataGatheringItem.symbol,
-              date
-            ).marketPrice,
+            marketPrice: mockGetValue(dataGatheringItem.symbol, date)
+              .marketPrice,
            symbol: dataGatheringItem.symbol
          });
        }
@ -61,10 +48,8 @@ export const CurrentRateServiceMock = {
        for (const dataGatheringItem of dataGatheringItems) {
          result.push({
            date,
-            marketPriceInBaseCurrency: mockGetValue(
-              dataGatheringItem.symbol,
-              date
-            ).marketPrice,
+            marketPrice: mockGetValue(dataGatheringItem.symbol, date)
+              .marketPrice,
            symbol: dataGatheringItem.symbol
          });
        }
--- a/apps/api/src/app/portfolio/current-rate.service.spec.ts
+++ b/apps/api/src/app/portfolio/current-rate.service.spec.ts
@ -4,7 +4,6 @@ import { MarketDataService } from '@ghostfolio/api/services/market-data.service'
 import { DataSource, MarketData } from '@prisma/client';

 import { CurrentRateService } from './current-rate.service';
-import { GetValueObject } from './interfaces/get-value-object.interface';

 jest.mock('@ghostfolio/api/services/market-data.service', () => {
  return {
@ -74,12 +73,7 @@ describe('CurrentRateService', () => {

  beforeAll(async () => {
    dataProviderService = new DataProviderService(null, [], null);
-    exchangeRateDataService = new ExchangeRateDataService(
-      null,
-      null,
-      null,
-      null
-    );
+    exchangeRateDataService = new ExchangeRateDataService(null, null, null);
    marketDataService = new MarketDataService(null);

    await exchangeRateDataService.initialize();
@ -102,15 +96,15 @@ describe('CurrentRateService', () => {
        },
        userCurrency: 'CHF'
      })
-    ).toMatchObject<GetValueObject[]>([
+    ).toMatchObject([
      {
        date: undefined,
-        marketPriceInBaseCurrency: 1841.823902,
+        marketPrice: 1841.823902,
        symbol: 'AMZN'
      },
      {
        date: undefined,
-        marketPriceInBaseCurrency: 1847.839966,
+        marketPrice: 1847.839966,
        symbol: 'AMZN'
      }
    ]);
--- a/apps/api/src/app/portfolio/current-rate.service.ts
+++ b/apps/api/src/app/portfolio/current-rate.service.ts
@ -28,25 +28,30 @@ export class CurrentRateService {
      (!dateQuery.gte || isBefore(dateQuery.gte, new Date())) &&
      (!dateQuery.in || this.containsToday(dateQuery.in));

-    const promises: Promise<GetValueObject[]>[] = [];
+    const promises: Promise<
+      {
+        date: Date;
+        marketPrice: number;
+        symbol: string;
+      }[]
+    >[] = [];

    if (includeToday) {
      const today = resetHours(new Date());
      promises.push(
        this.dataProviderService
-          .getQuotes(dataGatheringItems)
+          .get(dataGatheringItems)
          .then((dataResultProvider) => {
-            const result: GetValueObject[] = [];
+            const result = [];
            for (const dataGatheringItem of dataGatheringItems) {
              result.push({
                date: today,
-                marketPriceInBaseCurrency:
-                  this.exchangeRateDataService.toCurrency(
-                    dataResultProvider?.[dataGatheringItem.symbol]
-                      ?.marketPrice ?? 0,
-                    dataResultProvider?.[dataGatheringItem.symbol]?.currency,
-                    userCurrency
-                  ),
+                marketPrice: this.exchangeRateDataService.toCurrency(
+                  dataResultProvider?.[dataGatheringItem.symbol]?.marketPrice ??
+                    0,
+                  dataResultProvider?.[dataGatheringItem.symbol]?.currency,
+                  userCurrency
+                ),
                symbol: dataGatheringItem.symbol
              });
            }
@ -69,12 +74,11 @@ export class CurrentRateService {
          return data.map((marketDataItem) => {
            return {
              date: marketDataItem.date,
-              marketPriceInBaseCurrency:
-                this.exchangeRateDataService.toCurrency(
-                  marketDataItem.marketPrice,
-                  currencies[marketDataItem.symbol],
-                  userCurrency
-                ),
+              marketPrice: this.exchangeRateDataService.toCurrency(
+                marketDataItem.marketPrice,
+                currencies[marketDataItem.symbol],
+                userCurrency
+              ),
              symbol: marketDataItem.symbol
            };
          });
--- a/apps/api/src/app/portfolio/interfaces/current-positions.interface.ts
+++ b/apps/api/src/app/portfolio/interfaces/current-positions.interface.ts
@ -1,7 +1,8 @@
-import { ResponseError, TimelinePosition } from '@ghostfolio/common/interfaces';
+import { TimelinePosition } from '@ghostfolio/common/interfaces';
 import Big from 'big.js';

-export interface CurrentPositions extends ResponseError {
+export interface CurrentPositions {
+  hasErrors: boolean;
  positions: TimelinePosition[];
  grossPerformance: Big;
  grossPerformancePercentage: Big;
--- a/apps/api/src/app/portfolio/interfaces/get-value-object.interface.ts
+++ b/apps/api/src/app/portfolio/interfaces/get-value-object.interface.ts
@ -1,5 +1,5 @@
 export interface GetValueObject {
  date: Date;
-  marketPriceInBaseCurrency: number;
+  marketPrice: number;
  symbol: string;
 }
--- a/apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.ts
+++ b/apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.ts
@ -1,9 +1,5 @@
-import {
-  EnhancedSymbolProfile,
-  HistoricalDataItem
-} from '@ghostfolio/common/interfaces';
+import { EnhancedSymbolProfile } from '@ghostfolio/api/services/interfaces/symbol-profile.interface';
 import { OrderWithAccount } from '@ghostfolio/common/types';
-import { Tag } from '@prisma/client';

 export interface PortfolioPositionDetail {
  averagePrice: number;
@ -20,7 +16,6 @@ export interface PortfolioPositionDetail {
  orders: OrderWithAccount[];
  quantity: number;
  SymbolProfile: EnhancedSymbolProfile;
-  tags: Tag[];
  transactionCount: number;
  value: number;
 }
@ -30,3 +25,10 @@ export interface HistoricalDataContainer {
  isAllTimeLow: boolean;
  items: HistoricalDataItem[];
 }
+
+export interface HistoricalDataItem {
+  averagePrice?: number;
+  date: string;
+  grossPerformancePercent?: number;
+  value: number;
+}
--- a/apps/api/src/app/portfolio/portfolio-calculator-new-baln-buy-and-sell.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-new-baln-buy-and-sell.spec.ts
@ -3,7 +3,7 @@ import { parseDate } from '@ghostfolio/common/helper';
 import Big from 'big.js';

 import { CurrentRateServiceMock } from './current-rate.service.mock';
-import { PortfolioCalculator } from './portfolio-calculator';
+import { PortfolioCalculatorNew } from './portfolio-calculator-new';

 jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  return {
@ -14,7 +14,7 @@ jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  };
 });

-describe('PortfolioCalculator', () => {
+describe('PortfolioCalculatorNew', () => {
  let currentRateService: CurrentRateService;

  beforeEach(() => {
@ -23,7 +23,7 @@ describe('PortfolioCalculator', () => {

  describe('get current positions', () => {
    it.only('with BALN.SW buy and sell', async () => {
-      const portfolioCalculator = new PortfolioCalculator({
+      const portfolioCalculatorNew = new PortfolioCalculatorNew({
        currentRateService,
        currency: 'CHF',
        orders: [
@ -52,25 +52,20 @@ describe('PortfolioCalculator', () => {
        ]
      });

-      portfolioCalculator.computeTransactionPoints();
+      portfolioCalculatorNew.computeTransactionPoints();

      const spy = jest
        .spyOn(Date, 'now')
        .mockImplementation(() => parseDate('2021-12-18').getTime());

-      const currentPositions = await portfolioCalculator.getCurrentPositions(
+      const currentPositions = await portfolioCalculatorNew.getCurrentPositions(
        parseDate('2021-11-22')
      );

-      const investments = portfolioCalculator.getInvestments();
-
-      const investmentsByMonth = portfolioCalculator.getInvestmentsByMonth();
-
      spy.mockRestore();

      expect(currentPositions).toEqual({
        currentValue: new Big('0'),
-        errors: [],
        grossPerformance: new Big('-12.6'),
        grossPerformancePercentage: new Big('-0.0440867739678096571'),
        hasErrors: false,
@ -95,15 +90,6 @@ describe('PortfolioCalculator', () => {
        ],
        totalInvestment: new Big('0')
      });
-
-      expect(investments).toEqual([
-        { date: '2021-11-22', investment: new Big('285.8') },
-        { date: '2021-11-30', investment: new Big('0') }
-      ]);
-
-      expect(investmentsByMonth).toEqual([
-        { date: '2021-11-01', investment: new Big('12.6') }
-      ]);
    });
  });
 });
--- a/apps/api/src/app/portfolio/portfolio-calculator-new-baln-buy.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-new-baln-buy.spec.ts
@ -3,7 +3,7 @@ import { parseDate } from '@ghostfolio/common/helper';
 import Big from 'big.js';

 import { CurrentRateServiceMock } from './current-rate.service.mock';
-import { PortfolioCalculator } from './portfolio-calculator';
+import { PortfolioCalculatorNew } from './portfolio-calculator-new';

 jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  return {
@ -14,7 +14,7 @@ jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  };
 });

-describe('PortfolioCalculator', () => {
+describe('PortfolioCalculatorNew', () => {
  let currentRateService: CurrentRateService;

  beforeEach(() => {
@ -23,7 +23,7 @@ describe('PortfolioCalculator', () => {

  describe('get current positions', () => {
    it.only('with BALN.SW buy', async () => {
-      const portfolioCalculator = new PortfolioCalculator({
+      const portfolioCalculatorNew = new PortfolioCalculatorNew({
        currentRateService,
        currency: 'CHF',
        orders: [
@ -41,25 +41,20 @@ describe('PortfolioCalculator', () => {
        ]
      });

-      portfolioCalculator.computeTransactionPoints();
+      portfolioCalculatorNew.computeTransactionPoints();

      const spy = jest
        .spyOn(Date, 'now')
        .mockImplementation(() => parseDate('2021-12-18').getTime());

-      const currentPositions = await portfolioCalculator.getCurrentPositions(
+      const currentPositions = await portfolioCalculatorNew.getCurrentPositions(
        parseDate('2021-11-30')
      );

-      const investments = portfolioCalculator.getInvestments();
-
-      const investmentsByMonth = portfolioCalculator.getInvestmentsByMonth();
-
      spy.mockRestore();

      expect(currentPositions).toEqual({
        currentValue: new Big('297.8'),
-        errors: [],
        grossPerformance: new Big('24.6'),
        grossPerformancePercentage: new Big('0.09004392386530014641'),
        hasErrors: false,
@ -84,14 +79,6 @@ describe('PortfolioCalculator', () => {
        ],
        totalInvestment: new Big('273.2')
      });
-
-      expect(investments).toEqual([
-        { date: '2021-11-30', investment: new Big('273.2') }
-      ]);
-
-      expect(investmentsByMonth).toEqual([
-        { date: '2021-11-01', investment: new Big('273.2') }
-      ]);
    });
  });
 });
--- a/apps/api/src/app/portfolio/portfolio-calculator-new-no-orders.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-new-no-orders.spec.ts
@ -3,7 +3,7 @@ import { parseDate } from '@ghostfolio/common/helper';
 import Big from 'big.js';

 import { CurrentRateServiceMock } from './current-rate.service.mock';
-import { PortfolioCalculator } from './portfolio-calculator';
+import { PortfolioCalculatorNew } from './portfolio-calculator-new';

 jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  return {
@ -14,7 +14,7 @@ jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  };
 });

-describe('PortfolioCalculator', () => {
+describe('PortfolioCalculatorNew', () => {
  let currentRateService: CurrentRateService;

  beforeEach(() => {
@ -23,26 +23,22 @@ describe('PortfolioCalculator', () => {

  describe('get current positions', () => {
    it('with no orders', async () => {
-      const portfolioCalculator = new PortfolioCalculator({
+      const portfolioCalculatorNew = new PortfolioCalculatorNew({
        currentRateService,
        currency: 'CHF',
        orders: []
      });

-      portfolioCalculator.computeTransactionPoints();
+      portfolioCalculatorNew.computeTransactionPoints();

      const spy = jest
        .spyOn(Date, 'now')
        .mockImplementation(() => parseDate('2021-12-18').getTime());

-      const currentPositions = await portfolioCalculator.getCurrentPositions(
+      const currentPositions = await portfolioCalculatorNew.getCurrentPositions(
        new Date()
      );

-      const investments = portfolioCalculator.getInvestments();
-
-      const investmentsByMonth = portfolioCalculator.getInvestmentsByMonth();
-
      spy.mockRestore();

      expect(currentPositions).toEqual({
@ -55,10 +51,6 @@ describe('PortfolioCalculator', () => {
        positions: [],
        totalInvestment: new Big(0)
      });
-
-      expect(investments).toEqual([]);
-
-      expect(investmentsByMonth).toEqual([]);
    });
  });
 });
--- a/apps/api/src/app/portfolio/portfolio-calculator-new.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-new.spec.ts
@ -0,0 +1,73 @@
+import Big from 'big.js';
+
+import { CurrentRateService } from './current-rate.service';
+import { PortfolioCalculatorNew } from './portfolio-calculator-new';
+
+describe('PortfolioCalculatorNew', () => {
+  let currentRateService: CurrentRateService;
+
+  beforeEach(() => {
+    currentRateService = new CurrentRateService(null, null, null);
+  });
+
+  describe('annualized performance percentage', () => {
+    const portfolioCalculatorNew = new PortfolioCalculatorNew({
+      currentRateService,
+      currency: 'USD',
+      orders: []
+    });
+
+    it('Get annualized performance', async () => {
+      expect(
+        portfolioCalculatorNew
+          .getAnnualizedPerformancePercent({
+            daysInMarket: NaN, // differenceInDays of date-fns returns NaN for the same day
+            netPerformancePercent: new Big(0)
+          })
+          .toNumber()
+      ).toEqual(0);
+
+      expect(
+        portfolioCalculatorNew
+          .getAnnualizedPerformancePercent({
+            daysInMarket: 0,
+            netPerformancePercent: new Big(0)
+          })
+          .toNumber()
+      ).toEqual(0);
+
+      /**
+       * Source: https://www.readyratios.com/reference/analysis/annualized_rate.html
+       */
+      expect(
+        portfolioCalculatorNew
+          .getAnnualizedPerformancePercent({
+            daysInMarket: 65, // < 1 year
+            netPerformancePercent: new Big(0.1025)
+          })
+          .toNumber()
+      ).toBeCloseTo(0.729705);
+
+      expect(
+        portfolioCalculatorNew
+          .getAnnualizedPerformancePercent({
+            daysInMarket: 365, // 1 year
+            netPerformancePercent: new Big(0.05)
+          })
+          .toNumber()
+      ).toBeCloseTo(0.05);
+
+      /**
+       * Source: https://www.investopedia.com/terms/a/annualized-total-return.asp#annualized-return-formula-and-calculation
+       */
+      expect(
+        portfolioCalculatorNew
+          .getAnnualizedPerformancePercent({
+            daysInMarket: 575, // > 1 year
+            netPerformancePercent: new Big(0.2374)
+          })
+          .toNumber()
+      ).toBeCloseTo(0.145);
+    });
+  });
+});
--- a/apps/api/src/app/portfolio/portfolio-calculator-new.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-new.ts
@ -0,0 +1,958 @@
+import { TimelineInfoInterface } from '@ghostfolio/api/app/portfolio/interfaces/timeline-info.interface';
+import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';
+import { DATE_FORMAT, parseDate, resetHours } from '@ghostfolio/common/helper';
+import { TimelinePosition } from '@ghostfolio/common/interfaces';
+import { Logger } from '@nestjs/common';
+import { Type as TypeOfOrder } from '@prisma/client';
+import Big from 'big.js';
+import {
+  addDays,
+  addMilliseconds,
+  addMonths,
+  addYears,
+  endOfDay,
+  format,
+  isAfter,
+  isBefore,
+  max,
+  min
+} from 'date-fns';
+import { first, flatten, isNumber, sortBy } from 'lodash';
+
+import { CurrentRateService } from './current-rate.service';
+import { CurrentPositions } from './interfaces/current-positions.interface';
+import { GetValueObject } from './interfaces/get-value-object.interface';
+import { PortfolioOrderItem } from './interfaces/portfolio-calculator.interface';
+import { PortfolioOrder } from './interfaces/portfolio-order.interface';
+import { TimelinePeriod } from './interfaces/timeline-period.interface';
+import {
+  Accuracy,
+  TimelineSpecification
+} from './interfaces/timeline-specification.interface';
+import { TransactionPointSymbol } from './interfaces/transaction-point-symbol.interface';
+import { TransactionPoint } from './interfaces/transaction-point.interface';
+
+export class PortfolioCalculatorNew {
+  private static readonly ENABLE_LOGGING = false;
+
+  private currency: string;
+  private currentRateService: CurrentRateService;
+  private orders: PortfolioOrder[];
+  private transactionPoints: TransactionPoint[];
+
+  public constructor({
+    currency,
+    currentRateService,
+    orders
+  }: {
+    currency: string;
+    currentRateService: CurrentRateService;
+    orders: PortfolioOrder[];
+  }) {
+    this.currency = currency;
+    this.currentRateService = currentRateService;
+    this.orders = orders;
+
+    this.orders.sort((a, b) => a.date.localeCompare(b.date));
+  }
+
+  public computeTransactionPoints() {
+    this.transactionPoints = [];
+    const symbols: { [symbol: string]: TransactionPointSymbol } = {};
+
+    let lastDate: string = null;
+    let lastTransactionPoint: TransactionPoint = null;
+    for (const order of this.orders) {
+      const currentDate = order.date;
+
+      let currentTransactionPointItem: TransactionPointSymbol;
+      const oldAccumulatedSymbol = symbols[order.symbol];
+
+      const factor = this.getFactor(order.type);
+      const unitPrice = new Big(order.unitPrice);
+      if (oldAccumulatedSymbol) {
+        const newQuantity = order.quantity
+          .mul(factor)
+          .plus(oldAccumulatedSymbol.quantity);
+        currentTransactionPointItem = {
+          currency: order.currency,
+          dataSource: order.dataSource,
+          fee: order.fee.plus(oldAccumulatedSymbol.fee),
+          firstBuyDate: oldAccumulatedSymbol.firstBuyDate,
+          investment: newQuantity.eq(0)
+            ? new Big(0)
+            : unitPrice
+                .mul(order.quantity)
+                .mul(factor)
+                .plus(oldAccumulatedSymbol.investment),
+          quantity: newQuantity,
+          symbol: order.symbol,
+          transactionCount: oldAccumulatedSymbol.transactionCount + 1
+        };
+      } else {
+        currentTransactionPointItem = {
+          currency: order.currency,
+          dataSource: order.dataSource,
+          fee: order.fee,
+          firstBuyDate: order.date,
+          investment: unitPrice.mul(order.quantity).mul(factor),
+          quantity: order.quantity.mul(factor),
+          symbol: order.symbol,
+          transactionCount: 1
+        };
+      }
+
+      symbols[order.symbol] = currentTransactionPointItem;
+
+      const items = lastTransactionPoint?.items ?? [];
+      const newItems = items.filter(
+        (transactionPointItem) => transactionPointItem.symbol !== order.symbol
+      );
+      newItems.push(currentTransactionPointItem);
+      newItems.sort((a, b) => a.symbol.localeCompare(b.symbol));
+      if (lastDate !== currentDate || lastTransactionPoint === null) {
+        lastTransactionPoint = {
+          date: currentDate,
+          items: newItems
+        };
+        this.transactionPoints.push(lastTransactionPoint);
+      } else {
+        lastTransactionPoint.items = newItems;
+      }
+      lastDate = currentDate;
+    }
+  }
+
+  public getAnnualizedPerformancePercent({
+    daysInMarket,
+    netPerformancePercent
+  }: {
+    daysInMarket: number;
+    netPerformancePercent: Big;
+  }): Big {
+    if (isNumber(daysInMarket) && daysInMarket > 0) {
+      const exponent = new Big(365).div(daysInMarket).toNumber();
+      return new Big(
+        Math.pow(netPerformancePercent.plus(1).toNumber(), exponent)
+      ).minus(1);
+    }
+
+    return new Big(0);
+  }
+
+  public getTransactionPoints(): TransactionPoint[] {
+    return this.transactionPoints;
+  }
+
+  public setTransactionPoints(transactionPoints: TransactionPoint[]) {
+    this.transactionPoints = transactionPoints;
+  }
+
+  public async getCurrentPositions(start: Date): Promise<CurrentPositions> {
+    if (!this.transactionPoints?.length) {
+      return {
+        currentValue: new Big(0),
+        hasErrors: false,
+        grossPerformance: new Big(0),
+        grossPerformancePercentage: new Big(0),
+        netPerformance: new Big(0),
+        netPerformancePercentage: new Big(0),
+        positions: [],
+        totalInvestment: new Big(0)
+      };
+    }
+
+    const lastTransactionPoint =
+      this.transactionPoints[this.transactionPoints.length - 1];
+
+    // use Date.now() to use the mock for today
+    const today = new Date(Date.now());
+
+    let firstTransactionPoint: TransactionPoint = null;
+    let firstIndex = this.transactionPoints.length;
+    const dates = [];
+    const dataGatheringItems: IDataGatheringItem[] = [];
+    const currencies: { [symbol: string]: string } = {};
+
+    dates.push(resetHours(start));
+    for (const item of this.transactionPoints[firstIndex - 1].items) {
+      dataGatheringItems.push({
+        dataSource: item.dataSource,
+        symbol: item.symbol
+      });
+      currencies[item.symbol] = item.currency;
+    }
+    for (let i = 0; i < this.transactionPoints.length; i++) {
+      if (
+        !isBefore(parseDate(this.transactionPoints[i].date), start) &&
+        firstTransactionPoint === null
+      ) {
+        firstTransactionPoint = this.transactionPoints[i];
+        firstIndex = i;
+      }
+      if (firstTransactionPoint !== null) {
+        dates.push(resetHours(parseDate(this.transactionPoints[i].date)));
+      }
+    }
+
+    dates.push(resetHours(today));
+
+    const marketSymbols = await this.currentRateService.getValues({
+      currencies,
+      dataGatheringItems,
+      dateQuery: {
+        in: dates
+      },
+      userCurrency: this.currency
+    });
+
+    const marketSymbolMap: {
+      [date: string]: { [symbol: string]: Big };
+    } = {};
+
+    for (const marketSymbol of marketSymbols) {
+      const date = format(marketSymbol.date, DATE_FORMAT);
+      if (!marketSymbolMap[date]) {
+        marketSymbolMap[date] = {};
+      }
+      if (marketSymbol.marketPrice) {
+        marketSymbolMap[date][marketSymbol.symbol] = new Big(
+          marketSymbol.marketPrice
+        );
+      }
+    }
+
+    const todayString = format(today, DATE_FORMAT);
+
+    if (firstIndex > 0) {
+      firstIndex--;
+    }
+    const initialValues: { [symbol: string]: Big } = {};
+
+    const positions: TimelinePosition[] = [];
+    let hasAnySymbolMetricsErrors = false;
+
+    for (const item of lastTransactionPoint.items) {
+      const marketValue = marketSymbolMap[todayString]?.[item.symbol];
+
+      const {
+        grossPerformance,
+        grossPerformancePercentage,
+        hasErrors,
+        initialValue,
+        netPerformance,
+        netPerformancePercentage
+      } = this.getSymbolMetrics({
+        marketSymbolMap,
+        start,
+        symbol: item.symbol
+      });
+
+      hasAnySymbolMetricsErrors = hasAnySymbolMetricsErrors || hasErrors;
+      initialValues[item.symbol] = initialValue;
+
+      positions.push({
+        averagePrice: item.quantity.eq(0)
+          ? new Big(0)
+          : item.investment.div(item.quantity),
+        currency: item.currency,
+        dataSource: item.dataSource,
+        firstBuyDate: item.firstBuyDate,
+        grossPerformance: !hasErrors ? grossPerformance ?? null : null,
+        grossPerformancePercentage: !hasErrors
+          ? grossPerformancePercentage ?? null
+          : null,
+        investment: item.investment,
+        marketPrice: marketValue?.toNumber() ?? null,
+        netPerformance: !hasErrors ? netPerformance ?? null : null,
+        netPerformancePercentage: !hasErrors
+          ? netPerformancePercentage ?? null
+          : null,
+        quantity: item.quantity,
+        symbol: item.symbol,
+        transactionCount: item.transactionCount
+      });
+    }
+
+    const overall = this.calculateOverallPerformance(positions, initialValues);
+
+    return {
+      ...overall,
+      positions,
+      hasErrors: hasAnySymbolMetricsErrors || overall.hasErrors
+    };
+  }
+
+  public getInvestments(): { date: string; investment: Big }[] {
+    if (this.transactionPoints.length === 0) {
+      return [];
+    }
+
+    return this.transactionPoints.map((transactionPoint) => {
+      return {
+        date: transactionPoint.date,
+        investment: transactionPoint.items.reduce(
+          (investment, transactionPointSymbol) =>
+            investment.plus(transactionPointSymbol.investment),
+          new Big(0)
+        )
+      };
+    });
+  }
+
+  public async calculateTimeline(
+    timelineSpecification: TimelineSpecification[],
+    endDate: string
+  ): Promise<TimelineInfoInterface> {
+    if (timelineSpecification.length === 0) {
+      return {
+        maxNetPerformance: new Big(0),
+        minNetPerformance: new Big(0),
+        timelinePeriods: []
+      };
+    }
+
+    const startDate = timelineSpecification[0].start;
+    const start = parseDate(startDate);
+    const end = parseDate(endDate);
+
+    const timelinePeriodPromises: Promise<TimelineInfoInterface>[] = [];
+    let i = 0;
+    let j = -1;
+    for (
+      let currentDate = start;
+      !isAfter(currentDate, end);
+      currentDate = this.addToDate(
+        currentDate,
+        timelineSpecification[i].accuracy
+      )
+    ) {
+      if (this.isNextItemActive(timelineSpecification, currentDate, i)) {
+        i++;
+      }
+      while (
+        j + 1 < this.transactionPoints.length &&
+        !isAfter(parseDate(this.transactionPoints[j + 1].date), currentDate)
+      ) {
+        j++;
+      }
+
+      let periodEndDate = currentDate;
+      if (timelineSpecification[i].accuracy === 'day') {
+        let nextEndDate = end;
+        if (j + 1 < this.transactionPoints.length) {
+          nextEndDate = parseDate(this.transactionPoints[j + 1].date);
+        }
+        periodEndDate = min([
+          addMonths(currentDate, 3),
+          max([currentDate, nextEndDate])
+        ]);
+      }
+      const timePeriodForDates = this.getTimePeriodForDate(
+        j,
+        currentDate,
+        endOfDay(periodEndDate)
+      );
+      currentDate = periodEndDate;
+      if (timePeriodForDates != null) {
+        timelinePeriodPromises.push(timePeriodForDates);
+      }
+    }
+
+    const timelineInfoInterfaces: TimelineInfoInterface[] = await Promise.all(
+      timelinePeriodPromises
+    );
+    const minNetPerformance = timelineInfoInterfaces
+      .map((timelineInfo) => timelineInfo.minNetPerformance)
+      .filter((performance) => performance !== null)
+      .reduce((minPerformance, current) => {
+        if (minPerformance.lt(current)) {
+          return minPerformance;
+        } else {
+          return current;
+        }
+      });
+
+    const maxNetPerformance = timelineInfoInterfaces
+      .map((timelineInfo) => timelineInfo.maxNetPerformance)
+      .filter((performance) => performance !== null)
+      .reduce((maxPerformance, current) => {
+        if (maxPerformance.gt(current)) {
+          return maxPerformance;
+        } else {
+          return current;
+        }
+      });
+
+    const timelinePeriods = timelineInfoInterfaces.map(
+      (timelineInfo) => timelineInfo.timelinePeriods
+    );
+
+    return {
+      maxNetPerformance,
+      minNetPerformance,
+      timelinePeriods: flatten(timelinePeriods)
+    };
+  }
+
+  private calculateOverallPerformance(
+    positions: TimelinePosition[],
+    initialValues: { [symbol: string]: Big }
+  ) {
+    let currentValue = new Big(0);
+    let grossPerformance = new Big(0);
+    let grossPerformancePercentage = new Big(0);
+    let hasErrors = false;
+    let netPerformance = new Big(0);
+    let netPerformancePercentage = new Big(0);
+    let sumOfWeights = new Big(0);
+    let totalInvestment = new Big(0);
+
+    for (const currentPosition of positions) {
+      if (currentPosition.marketPrice) {
+        currentValue = currentValue.plus(
+          new Big(currentPosition.marketPrice).mul(currentPosition.quantity)
+        );
+      } else {
+        hasErrors = true;
+      }
+
+      totalInvestment = totalInvestment.plus(currentPosition.investment);
+
+      if (currentPosition.grossPerformance) {
+        grossPerformance = grossPerformance.plus(
+          currentPosition.grossPerformance
+        );
+
+        netPerformance = netPerformance.plus(currentPosition.netPerformance);
+      } else if (!currentPosition.quantity.eq(0)) {
+        hasErrors = true;
+      }
+
+      if (currentPosition.grossPerformancePercentage) {
+        // Use the average from the initial value and the current investment as
+        // a weight
+        const weight = (initialValues[currentPosition.symbol] ?? new Big(0))
+          .plus(currentPosition.investment)
+          .div(2);
+
+        sumOfWeights = sumOfWeights.plus(weight);
+
+        grossPerformancePercentage = grossPerformancePercentage.plus(
+          currentPosition.grossPerformancePercentage.mul(weight)
+        );
+
+        netPerformancePercentage = netPerformancePercentage.plus(
+          currentPosition.netPerformancePercentage.mul(weight)
+        );
+      } else if (!currentPosition.quantity.eq(0)) {
+        Logger.warn(
+          `Missing initial value for symbol ${currentPosition.symbol} at ${currentPosition.firstBuyDate}`
+        );
+        hasErrors = true;
+      }
+    }
+
+    if (sumOfWeights.gt(0)) {
+      grossPerformancePercentage = grossPerformancePercentage.div(sumOfWeights);
+      netPerformancePercentage = netPerformancePercentage.div(sumOfWeights);
+    } else {
+      grossPerformancePercentage = new Big(0);
+      netPerformancePercentage = new Big(0);
+    }
+
+    return {
+      currentValue,
+      grossPerformance,
+      grossPerformancePercentage,
+      hasErrors,
+      netPerformance,
+      netPerformancePercentage,
+      totalInvestment
+    };
+  }
+
+  private async getTimePeriodForDate(
+    j: number,
+    startDate: Date,
+    endDate: Date
+  ): Promise<TimelineInfoInterface> {
+    let investment: Big = new Big(0);
+    let fees: Big = new Big(0);
+
+    const marketSymbolMap: {
+      [date: string]: { [symbol: string]: Big };
+    } = {};
+    if (j >= 0) {
+      const currencies: { [name: string]: string } = {};
+      const dataGatheringItems: IDataGatheringItem[] = [];
+
+      for (const item of this.transactionPoints[j].items) {
+        currencies[item.symbol] = item.currency;
+        dataGatheringItems.push({
+          dataSource: item.dataSource,
+          symbol: item.symbol
+        });
+        investment = investment.plus(item.investment);
+        fees = fees.plus(item.fee);
+      }
+
+      let marketSymbols: GetValueObject[] = [];
+      if (dataGatheringItems.length > 0) {
+        try {
+          marketSymbols = await this.currentRateService.getValues({
+            currencies,
+            dataGatheringItems,
+            dateQuery: {
+              gte: startDate,
+              lt: endOfDay(endDate)
+            },
+            userCurrency: this.currency
+          });
+        } catch (error) {
+          Logger.error(
+            `Failed to fetch info for date ${startDate} with exception`,
+            error
+          );
+          return null;
+        }
+      }
+
+      for (const marketSymbol of marketSymbols) {
+        const date = format(marketSymbol.date, DATE_FORMAT);
+        if (!marketSymbolMap[date]) {
+          marketSymbolMap[date] = {};
+        }
+        if (marketSymbol.marketPrice) {
+          marketSymbolMap[date][marketSymbol.symbol] = new Big(
+            marketSymbol.marketPrice
+          );
+        }
+      }
+    }
+
+    const results: TimelinePeriod[] = [];
+    let maxNetPerformance: Big = null;
+    let minNetPerformance: Big = null;
+    for (
+      let currentDate = startDate;
+      isBefore(currentDate, endDate);
+      currentDate = addDays(currentDate, 1)
+    ) {
+      let value = new Big(0);
+      const currentDateAsString = format(currentDate, DATE_FORMAT);
+      let invalid = false;
+      if (j >= 0) {
+        for (const item of this.transactionPoints[j].items) {
+          if (
+            !marketSymbolMap[currentDateAsString]?.hasOwnProperty(item.symbol)
+          ) {
+            invalid = true;
+            break;
+          }
+          value = value.plus(
+            item.quantity.mul(marketSymbolMap[currentDateAsString][item.symbol])
+          );
+        }
+      }
+      if (!invalid) {
+        const grossPerformance = value.minus(investment);
+        const netPerformance = grossPerformance.minus(fees);
+        if (
+          minNetPerformance === null ||
+          minNetPerformance.gt(netPerformance)
+        ) {
+          minNetPerformance = netPerformance;
+        }
+        if (
+          maxNetPerformance === null ||
+          maxNetPerformance.lt(netPerformance)
+        ) {
+          maxNetPerformance = netPerformance;
+        }
+
+        const result = {
+          grossPerformance,
+          investment,
+          netPerformance,
+          value,
+          date: currentDateAsString
+        };
+        results.push(result);
+      }
+    }
+
+    return {
+      maxNetPerformance,
+      minNetPerformance,
+      timelinePeriods: results
+    };
+  }
+
+  private getFactor(type: TypeOfOrder) {
+    let factor: number;
+
+    switch (type) {
+      case 'BUY':
+        factor = 1;
+        break;
+      case 'SELL':
+        factor = -1;
+        break;
+      default:
+        factor = 0;
+        break;
+    }
+
+    return factor;
+  }
+
+  private addToDate(date: Date, accuracy: Accuracy): Date {
+    switch (accuracy) {
+      case 'day':
+        return addDays(date, 1);
+      case 'month':
+        return addMonths(date, 1);
+      case 'year':
+        return addYears(date, 1);
+    }
+  }
+
+  private getSymbolMetrics({
+    marketSymbolMap,
+    start,
+    symbol
+  }: {
+    marketSymbolMap: {
+      [date: string]: { [symbol: string]: Big };
+    };
+    start: Date;
+    symbol: string;
+  }) {
+    let orders: PortfolioOrderItem[] = this.orders.filter((order) => {
+      return order.symbol === symbol;
+    });
+
+    if (orders.length <= 0) {
+      return {
+        hasErrors: false,
+        initialValue: new Big(0),
+        netPerformance: new Big(0),
+        netPerformancePercentage: new Big(0),
+        grossPerformance: new Big(0),
+        grossPerformancePercentage: new Big(0)
+      };
+    }
+
+    const dateOfFirstTransaction = new Date(first(orders).date);
+    const endDate = new Date(Date.now());
+
+    const unitPriceAtStartDate =
+      marketSymbolMap[format(start, DATE_FORMAT)]?.[symbol];
+
+    const unitPriceAtEndDate =
+      marketSymbolMap[format(endDate, DATE_FORMAT)]?.[symbol];
+
+    if (
+      !unitPriceAtEndDate ||
+      (!unitPriceAtStartDate && isBefore(dateOfFirstTransaction, start))
+    ) {
+      return {
+        hasErrors: true,
+        initialValue: new Big(0),
+        netPerformance: new Big(0),
+        netPerformancePercentage: new Big(0),
+        grossPerformance: new Big(0),
+        grossPerformancePercentage: new Big(0)
+      };
+    }
+
+    let averagePriceAtEndDate = new Big(0);
+    let averagePriceAtStartDate = new Big(0);
+    let feesAtStartDate = new Big(0);
+    let fees = new Big(0);
+    let grossPerformance = new Big(0);
+    let grossPerformanceAtStartDate = new Big(0);
+    let grossPerformanceFromSells = new Big(0);
+    let initialValue: Big;
+    let lastAveragePrice = new Big(0);
+    let lastTransactionInvestment = new Big(0);
+    let lastValueOfInvestmentBeforeTransaction = new Big(0);
+    let maxTotalInvestment = new Big(0);
+    let timeWeightedGrossPerformancePercentage = new Big(1);
+    let timeWeightedNetPerformancePercentage = new Big(1);
+    let totalInvestment = new Big(0);
+    let totalInvestmentWithGrossPerformanceFromSell = new Big(0);
+    let totalUnits = new Big(0);
+
+    // Add a synthetic order at the start and the end date
+    orders.push({
+      symbol,
+      currency: null,
+      date: format(start, DATE_FORMAT),
+      dataSource: null,
+      fee: new Big(0),
+      itemType: 'start',
+      name: '',
+      quantity: new Big(0),
+      type: TypeOfOrder.BUY,
+      unitPrice: unitPriceAtStartDate
+    });
+
+    orders.push({
+      symbol,
+      currency: null,
+      date: format(endDate, DATE_FORMAT),
+      dataSource: null,
+      fee: new Big(0),
+      itemType: 'end',
+      name: '',
+      quantity: new Big(0),
+      type: TypeOfOrder.BUY,
+      unitPrice: unitPriceAtEndDate
+    });
+
+    // Sort orders so that the start and end placeholder order are at the right
+    // position
+    orders = sortBy(orders, (order) => {
+      let sortIndex = new Date(order.date);
+
+      if (order.itemType === 'start') {
+        sortIndex = addMilliseconds(sortIndex, -1);
+      }
+
+      if (order.itemType === 'end') {
+        sortIndex = addMilliseconds(sortIndex, 1);
+      }
+
+      return sortIndex.getTime();
+    });
+
+    const indexOfStartOrder = orders.findIndex((order) => {
+      return order.itemType === 'start';
+    });
+
+    const indexOfEndOrder = orders.findIndex((order) => {
+      return order.itemType === 'end';
+    });
+
+    for (let i = 0; i < orders.length; i += 1) {
+      const order = orders[i];
+
+      if (order.itemType === 'start') {
+        // Take the unit price of the order as the market price if there are no
+        // orders of this symbol before the start date
+        order.unitPrice =
+          indexOfStartOrder === 0
+            ? orders[i + 1]?.unitPrice
+            : unitPriceAtStartDate;
+      }
+
+      // Calculate the average start price as soon as any units are held
+      if (
+        averagePriceAtStartDate.eq(0) &&
+        i >= indexOfStartOrder &&
+        totalUnits.gt(0)
+      ) {
+        averagePriceAtStartDate = totalInvestment.div(totalUnits);
+      }
+
+      const valueOfInvestmentBeforeTransaction = totalUnits.mul(
+        order.unitPrice
+      );
+
+      const transactionInvestment = order.quantity
+        .mul(order.unitPrice)
+        .mul(this.getFactor(order.type));
+
+      totalInvestment = totalInvestment.plus(transactionInvestment);
+
+      if (totalInvestment.gt(maxTotalInvestment)) {
+        maxTotalInvestment = totalInvestment;
+      }
+
+      if (i === indexOfEndOrder && totalUnits.gt(0)) {
+        averagePriceAtEndDate = totalInvestment.div(totalUnits);
+      }
+
+      if (i >= indexOfStartOrder && !initialValue) {
+        if (
+          i === indexOfStartOrder &&
+          !valueOfInvestmentBeforeTransaction.eq(0)
+        ) {
+          initialValue = valueOfInvestmentBeforeTransaction;
+        } else if (transactionInvestment.gt(0)) {
+          initialValue = transactionInvestment;
+        }
+      }
+
+      fees = fees.plus(order.fee);
+
+      totalUnits = totalUnits.plus(
+        order.quantity.mul(this.getFactor(order.type))
+      );
+
+      const valueOfInvestment = totalUnits.mul(order.unitPrice);
+
+      const grossPerformanceFromSell =
+        order.type === TypeOfOrder.SELL
+          ? order.unitPrice.minus(lastAveragePrice).mul(order.quantity)
+          : new Big(0);
+
+      grossPerformanceFromSells = grossPerformanceFromSells.plus(
+        grossPerformanceFromSell
+      );
+
+      totalInvestmentWithGrossPerformanceFromSell =
+        totalInvestmentWithGrossPerformanceFromSell
+          .plus(transactionInvestment)
+          .plus(grossPerformanceFromSell);
+
+      lastAveragePrice = totalUnits.eq(0)
+        ? new Big(0)
+        : totalInvestmentWithGrossPerformanceFromSell.div(totalUnits);
+
+      const newGrossPerformance = valueOfInvestment
+        .minus(totalInvestmentWithGrossPerformanceFromSell)
+        .plus(grossPerformanceFromSells);
+
+      if (
+        i > indexOfStartOrder &&
+        !lastValueOfInvestmentBeforeTransaction
+          .plus(lastTransactionInvestment)
+          .eq(0)
+      ) {
+        const grossHoldingPeriodReturn = valueOfInvestmentBeforeTransaction
+          .minus(
+            lastValueOfInvestmentBeforeTransaction.plus(
+              lastTransactionInvestment
+            )
+          )
+          .div(
+            lastValueOfInvestmentBeforeTransaction.plus(
+              lastTransactionInvestment
+            )
+          );
+
+        timeWeightedGrossPerformancePercentage =
+          timeWeightedGrossPerformancePercentage.mul(
+            new Big(1).plus(grossHoldingPeriodReturn)
+          );
+
+        const netHoldingPeriodReturn = valueOfInvestmentBeforeTransaction
+          .minus(fees.minus(feesAtStartDate))
+          .minus(
+            lastValueOfInvestmentBeforeTransaction.plus(
+              lastTransactionInvestment
+            )
+          )
+          .div(
+            lastValueOfInvestmentBeforeTransaction.plus(
+              lastTransactionInvestment
+            )
+          );
+
+        timeWeightedNetPerformancePercentage =
+          timeWeightedNetPerformancePercentage.mul(
+            new Big(1).plus(netHoldingPeriodReturn)
+          );
+      }
+
+      grossPerformance = newGrossPerformance;
+
+      lastTransactionInvestment = transactionInvestment;
+
+      lastValueOfInvestmentBeforeTransaction =
+        valueOfInvestmentBeforeTransaction;
+
+      if (order.itemType === 'start') {
+        feesAtStartDate = fees;
+        grossPerformanceAtStartDate = grossPerformance;
+      }
+    }
+
+    timeWeightedGrossPerformancePercentage =
+      timeWeightedGrossPerformancePercentage.minus(1);
+
+    timeWeightedNetPerformancePercentage =
+      timeWeightedNetPerformancePercentage.minus(1);
+
+    const totalGrossPerformance = grossPerformance.minus(
+      grossPerformanceAtStartDate
+    );
+
+    const totalNetPerformance = grossPerformance
+      .minus(grossPerformanceAtStartDate)
+      .minus(fees.minus(feesAtStartDate));
+
+    const grossPerformancePercentage =
+      averagePriceAtStartDate.eq(0) ||
+      averagePriceAtEndDate.eq(0) ||
+      orders[indexOfStartOrder].unitPrice.eq(0)
+        ? totalGrossPerformance.div(maxTotalInvestment)
+        : unitPriceAtEndDate
+            .div(averagePriceAtEndDate)
+            .div(
+              orders[indexOfStartOrder].unitPrice.div(averagePriceAtStartDate)
+            )
+            .minus(1);
+
+    const feesPerUnit = totalUnits.gt(0)
+      ? fees.minus(feesAtStartDate).div(totalUnits)
+      : new Big(0);
+
+    const netPerformancePercentage =
+      averagePriceAtStartDate.eq(0) ||
+      averagePriceAtEndDate.eq(0) ||
+      orders[indexOfStartOrder].unitPrice.eq(0)
+        ? totalNetPerformance.div(maxTotalInvestment)
+        : unitPriceAtEndDate
+            .minus(feesPerUnit)
+            .div(averagePriceAtEndDate)
+            .div(
+              orders[indexOfStartOrder].unitPrice.div(averagePriceAtStartDate)
+            )
+            .minus(1);
+
+    if (PortfolioCalculatorNew.ENABLE_LOGGING) {
+      console.log(
+        `
+        ${symbol}
+        Unit price: ${orders[indexOfStartOrder].unitPrice.toFixed(
+          2
+        )} -> ${unitPriceAtEndDate.toFixed(2)}
+        Average price: ${averagePriceAtStartDate.toFixed(
+          2
+        )} -> ${averagePriceAtEndDate.toFixed(2)}
+        Max. total investment: ${maxTotalInvestment.toFixed(2)}
+        Gross performance: ${totalGrossPerformance.toFixed(
+          2
+        )} / ${grossPerformancePercentage.mul(100).toFixed(2)}%
+        Fees per unit: ${feesPerUnit.toFixed(2)}
+        Net performance: ${totalNetPerformance.toFixed(
+          2
+        )} / ${netPerformancePercentage.mul(100).toFixed(2)}%`
+      );
+    }
+
+    return {
+      initialValue,
+      grossPerformancePercentage,
+      netPerformancePercentage,
+      hasErrors: totalUnits.gt(0) && (!initialValue || !unitPriceAtEndDate),
+      netPerformance: totalNetPerformance,
+      grossPerformance: totalGrossPerformance
+    };
+  }
+
+  private isNextItemActive(
+    timelineSpecification: TimelineSpecification[],
+    currentDate: Date,
+    i: number
+  ) {
+    return (
+      i + 1 < timelineSpecification.length &&
+      !isBefore(currentDate, parseDate(timelineSpecification[i + 1].start))
+    );
+  }
+}
--- a/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
@ -1,110 +0,0 @@
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { parseDate } from '@ghostfolio/common/helper';
-import Big from 'big.js';
-
-import { CurrentRateServiceMock } from './current-rate.service.mock';
-import { PortfolioCalculator } from './portfolio-calculator';
-
-jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
-  return {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    CurrentRateService: jest.fn().mockImplementation(() => {
-      return CurrentRateServiceMock;
-    })
-  };
-});
-
-describe('PortfolioCalculator', () => {
-  let currentRateService: CurrentRateService;
-
-  beforeEach(() => {
-    currentRateService = new CurrentRateService(null, null, null);
-  });
-
-  describe('get current positions', () => {
-    it.only('with BALN.SW buy and sell', async () => {
-      const portfolioCalculator = new PortfolioCalculator({
-        currentRateService,
-        currency: 'CHF',
-        orders: [
-          {
-            currency: 'CHF',
-            date: '2022-03-07',
-            dataSource: 'YAHOO',
-            fee: new Big(1.3),
-            name: 'Novartis AG',
-            quantity: new Big(2),
-            symbol: 'NOVN.SW',
-            type: 'BUY',
-            unitPrice: new Big(75.8)
-          },
-          {
-            currency: 'CHF',
-            date: '2022-04-08',
-            dataSource: 'YAHOO',
-            fee: new Big(2.95),
-            name: 'Novartis AG',
-            quantity: new Big(1),
-            symbol: 'NOVN.SW',
-            type: 'SELL',
-            unitPrice: new Big(85.73)
-          }
-        ]
-      });
-
-      portfolioCalculator.computeTransactionPoints();
-
-      const spy = jest
-        .spyOn(Date, 'now')
-        .mockImplementation(() => parseDate('2022-04-11').getTime());
-
-      const currentPositions = await portfolioCalculator.getCurrentPositions(
-        parseDate('2022-03-07')
-      );
-
-      const investments = portfolioCalculator.getInvestments();
-
-      const investmentsByMonth = portfolioCalculator.getInvestmentsByMonth();
-
-      spy.mockRestore();
-
-      expect(currentPositions).toEqual({
-        currentValue: new Big('87.8'),
-        errors: [],
-        grossPerformance: new Big('21.93'),
-        grossPerformancePercentage: new Big('0.14465699208443271768'),
-        hasErrors: false,
-        netPerformance: new Big('17.68'),
-        netPerformancePercentage: new Big('0.11662269129287598945'),
-        positions: [
-          {
-            averagePrice: new Big('75.80'),
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            firstBuyDate: '2022-03-07',
-            grossPerformance: new Big('21.93'),
-            grossPerformancePercentage: new Big('0.14465699208443271768'),
-            investment: new Big('75.80'),
-            netPerformance: new Big('17.68'),
-            netPerformancePercentage: new Big('0.11662269129287598945'),
-            marketPrice: 87.8,
-            quantity: new Big('1'),
-            symbol: 'NOVN.SW',
-            transactionCount: 2
-          }
-        ],
-        totalInvestment: new Big('75.80')
-      });
-
-      expect(investments).toEqual([
-        { date: '2022-03-07', investment: new Big('151.6') },
-        { date: '2022-04-08', investment: new Big('75.8') }
-      ]);
-
-      expect(investmentsByMonth).toEqual([
-        { date: '2022-03-01', investment: new Big('151.6') },
-        { date: '2022-04-01', investment: new Big('-85.73') }
-      ]);
-    });
-  });
-});
--- a/apps/api/src/app/portfolio/portfolio-calculator.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator.spec.ts
--- a/apps/api/src/app/portfolio/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator.ts
--- a/apps/api/src/app/portfolio/portfolio-service.strategy.ts
+++ b/apps/api/src/app/portfolio/portfolio-service.strategy.ts
@ -0,0 +1,25 @@
+import type { RequestWithUser } from '@ghostfolio/common/types';
+import { Inject, Injectable } from '@nestjs/common';
+import { REQUEST } from '@nestjs/core';
+
+import { PortfolioService } from './portfolio.service';
+import { PortfolioServiceNew } from './portfolio.service-new';
+
+@Injectable()
+export class PortfolioServiceStrategy {
+  public constructor(
+    private readonly portfolioService: PortfolioService,
+    private readonly portfolioServiceNew: PortfolioServiceNew,
+    @Inject(REQUEST) private readonly request: RequestWithUser
+  ) {}
+
+  public get() {
+    if (
+      this.request.user?.Settings?.settings?.['isNewCalculationEngine'] === true
+    ) {
+      return this.portfolioServiceNew;
+    }
+
+    return this.portfolioService;
+  }
+}
--- a/apps/api/src/app/portfolio/portfolio.controller.ts
+++ b/apps/api/src/app/portfolio/portfolio.controller.ts
@ -4,28 +4,22 @@ import {
  hasNotDefinedValuesInObject,
  nullifyValuesInObject
 } from '@ghostfolio/api/helper/object.helper';
-import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response.interceptor';
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
 import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
+import { baseCurrency } from '@ghostfolio/common/config';
 import { parseDate } from '@ghostfolio/common/helper';
 import {
-  Filter,
  PortfolioChart,
  PortfolioDetails,
  PortfolioInvestments,
-  PortfolioPerformanceResponse,
+  PortfolioPerformance,
  PortfolioPublicDetails,
  PortfolioReport,
  PortfolioSummary
 } from '@ghostfolio/common/interfaces';
-import { InvestmentItem } from '@ghostfolio/common/interfaces/investment-item.interface';
-import type {
-  DateRange,
-  GroupBy,
-  RequestWithUser
-} from '@ghostfolio/common/types';
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
  Controller,
  Get,
@ -35,8 +29,7 @@ import {
  Param,
  Query,
  UseGuards,
-  UseInterceptors,
-  Version
+  UseInterceptors
 } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
@ -44,22 +37,18 @@ import { StatusCodes, getReasonPhrase } from 'http-status-codes';

 import { PortfolioPositionDetail } from './interfaces/portfolio-position-detail.interface';
 import { PortfolioPositions } from './interfaces/portfolio-positions.interface';
-import { PortfolioService } from './portfolio.service';
+import { PortfolioServiceStrategy } from './portfolio-service.strategy';

@Controller('portfolio')
 export class PortfolioController {
-  private baseCurrency: string;
-
  public constructor(
    private readonly accessService: AccessService,
    private readonly configurationService: ConfigurationService,
    private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly portfolioService: PortfolioService,
+    private readonly portfolioServiceStrategy: PortfolioServiceStrategy,
    @Inject(REQUEST) private readonly request: RequestWithUser,
    private readonly userService: UserService
-  ) {
-    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
-  }
+  ) {}

  @Get('chart')
  @UseGuards(AuthGuard('jwt'))
@ -67,10 +56,9 @@ export class PortfolioController {
    @Headers('impersonation-id') impersonationId: string,
    @Query('range') range
  ): Promise<PortfolioChart> {
-    const historicalDataContainer = await this.portfolioService.getChart(
-      impersonationId,
-      range
-    );
+    const historicalDataContainer = await this.portfolioServiceStrategy
+      .get()
+      .getChart(impersonationId, range);

    let chartData = historicalDataContainer.items;

@ -112,65 +100,32 @@ export class PortfolioController {

  @Get('details')
  @UseGuards(AuthGuard('jwt'))
-  @UseInterceptors(RedactValuesInResponseInterceptor)
  @UseInterceptors(TransformDataSourceInResponseInterceptor)
  public async getDetails(
    @Headers('impersonation-id') impersonationId: string,
-    @Query('accounts') filterByAccounts?: string,
-    @Query('assetClasses') filterByAssetClasses?: string,
-    @Query('range') range?: DateRange,
-    @Query('tags') filterByTags?: string
+    @Query('range') range
  ): Promise<PortfolioDetails & { hasError: boolean }> {
+    if (
+      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
+      this.request.user.subscription.type === 'Basic'
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
    let hasError = false;

-    const accountIds = filterByAccounts?.split(',') ?? [];
-    const assetClasses = filterByAssetClasses?.split(',') ?? [];
-    const tagIds = filterByTags?.split(',') ?? [];
-
-    const filters: Filter[] = [
-      ...accountIds.map((accountId) => {
-        return <Filter>{
-          id: accountId,
-          type: 'ACCOUNT'
-        };
-      }),
-      ...assetClasses.map((assetClass) => {
-        return <Filter>{
-          id: assetClass,
-          type: 'ASSET_CLASS'
-        };
-      }),
-      ...tagIds.map((tagId) => {
-        return <Filter>{
-          id: tagId,
-          type: 'TAG'
-        };
-      })
-    ];
-
-    let portfolioSummary: PortfolioSummary;
-
-    const {
-      accounts,
-      filteredValueInBaseCurrency,
-      filteredValueInPercentage,
-      hasErrors,
-      holdings,
-      summary,
-      totalValueInBaseCurrency
-    } = await this.portfolioService.getDetails(
-      impersonationId,
-      this.request.user.id,
-      range,
-      filters
-    );
+    const { accounts, holdings, hasErrors } =
+      await this.portfolioServiceStrategy
+        .get()
+        .getDetails(impersonationId, this.request.user.id, range);

    if (hasErrors || hasNotDefinedValuesInObject(holdings)) {
      hasError = true;
    }

-    portfolioSummary = summary;
-
    if (
      impersonationId ||
      this.userService.isRestrictedView(this.request.user)
@ -186,7 +141,7 @@ export class PortfolioController {
          return this.exchangeRateDataService.toCurrency(
            portfolioPosition.quantity * portfolioPosition.marketPrice,
            portfolioPosition.currency,
-            this.request.user.Settings.settings.baseCurrency
+            this.request.user.Settings.currency
          );
        })
        .reduce((a, b) => a + b, 0);
@ -204,57 +159,15 @@ export class PortfolioController {
        accounts[name].current = current / totalValue;
        accounts[name].original = original / totalInvestment;
      }
-
-      portfolioSummary = nullifyValuesInObject(summary, [
-        'cash',
-        'committedFunds',
-        'currentGrossPerformance',
-        'currentNetPerformance',
-        'currentValue',
-        'dividend',
-        'emergencyFund',
-        'excludedAccountsAndActivities',
-        'fees',
-        'items',
-        'netWorth',
-        'totalBuy',
-        'totalSell'
-      ]);
    }

-    let hasDetails = true;
-    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
-      hasDetails = this.request.user.subscription.type === 'Premium';
-    }
-
-    for (const [symbol, portfolioPosition] of Object.entries(holdings)) {
-      holdings[symbol] = {
-        ...portfolioPosition,
-        assetClass: hasDetails ? portfolioPosition.assetClass : undefined,
-        assetSubClass: hasDetails ? portfolioPosition.assetSubClass : undefined,
-        countries: hasDetails ? portfolioPosition.countries : [],
-        currency: hasDetails ? portfolioPosition.currency : undefined,
-        markets: hasDetails ? portfolioPosition.markets : undefined,
-        sectors: hasDetails ? portfolioPosition.sectors : []
-      };
-    }
-
-    return {
-      accounts,
-      filteredValueInBaseCurrency,
-      filteredValueInPercentage,
-      hasError,
-      holdings,
-      totalValueInBaseCurrency,
-      summary: hasDetails ? portfolioSummary : undefined
-    };
+    return { accounts, hasError, holdings };
  }

  @Get('investments')
  @UseGuards(AuthGuard('jwt'))
  public async getInvestments(
-    @Headers('impersonation-id') impersonationId: string,
-    @Query('groupBy') groupBy?: GroupBy
+    @Headers('impersonation-id') impersonationId: string
  ): Promise<PortfolioInvestments> {
    if (
      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
@ -266,16 +179,9 @@ export class PortfolioController {
      );
    }

-    let investments: InvestmentItem[];
-
-    if (groupBy === 'month') {
-      investments = await this.portfolioService.getInvestments(
-        impersonationId,
-        'month'
-      );
-    } else {
-      investments = await this.portfolioService.getInvestments(impersonationId);
-    }
+    let investments = await this.portfolioServiceStrategy
+      .get()
+      .getInvestments(impersonationId);

    if (
      impersonationId ||
@ -297,19 +203,16 @@ export class PortfolioController {

  @Get('performance')
  @UseGuards(AuthGuard('jwt'))
-  @UseInterceptors(TransformDataSourceInResponseInterceptor)
  public async getPerformance(
    @Headers('impersonation-id') impersonationId: string,
    @Query('range') range
-  ): Promise<PortfolioPerformanceResponse> {
-    const performanceInformation = await this.portfolioService.getPerformance(
-      impersonationId,
-      range
-    );
+  ): Promise<{ hasErrors: boolean; performance: PortfolioPerformance }> {
+    const performanceInformation = await this.portfolioServiceStrategy
+      .get()
+      .getPerformance(impersonationId, range);

    if (
      impersonationId ||
-      this.request.user.Settings.settings.viewMode === 'ZEN' ||
      this.userService.isRestrictedView(this.request.user)
    ) {
      performanceInformation.performance = nullifyValuesInObject(
@ -321,35 +224,6 @@ export class PortfolioController {
    return performanceInformation;
  }

-  @Get('performance')
-  @UseGuards(AuthGuard('jwt'))
-  @UseInterceptors(TransformDataSourceInResponseInterceptor)
-  @Version('2')
-  public async getPerformanceV2(
-    @Headers('impersonation-id') impersonationId: string,
-    @Query('range') dateRange
-  ): Promise<PortfolioPerformanceResponse> {
-    const performanceInformation = await this.portfolioService.getPerformanceV2(
-      {
-        dateRange,
-        impersonationId
-      }
-    );
-
-    if (
-      impersonationId ||
-      this.request.user.Settings.settings.viewMode === 'ZEN' ||
-      this.userService.isRestrictedView(this.request.user)
-    ) {
-      performanceInformation.performance = nullifyValuesInObject(
-        performanceInformation.performance,
-        ['currentGrossPerformance', 'currentNetPerformance', 'currentValue']
-      );
-    }
-
-    return performanceInformation;
-  }
-
  @Get('positions')
  @UseGuards(AuthGuard('jwt'))
  @UseInterceptors(TransformDataSourceInResponseInterceptor)
@ -357,10 +231,9 @@ export class PortfolioController {
    @Headers('impersonation-id') impersonationId: string,
    @Query('range') range
  ): Promise<PortfolioPositions> {
-    const result = await this.portfolioService.getPositions(
-      impersonationId,
-      range
-    );
+    const result = await this.portfolioServiceStrategy
+      .get()
+      .getPositions(impersonationId, range);

    if (
      impersonationId ||
@ -400,48 +273,75 @@ export class PortfolioController {
      hasDetails = user.subscription.type === 'Premium';
    }

-    const { holdings } = await this.portfolioService.getDetails(
-      access.userId,
-      access.userId,
-      'max',
-      [{ id: 'EQUITY', type: 'ASSET_CLASS' }]
-    );
+    const { holdings } = await this.portfolioServiceStrategy
+      .get()
+      .getDetails(access.userId, access.userId);

    const portfolioPublicDetails: PortfolioPublicDetails = {
      hasDetails,
-      alias: access.alias,
      holdings: {}
    };

    const totalValue = Object.values(holdings)
+      .filter((holding) => {
+        return holding.assetClass === 'EQUITY';
+      })
      .map((portfolioPosition) => {
        return this.exchangeRateDataService.toCurrency(
          portfolioPosition.quantity * portfolioPosition.marketPrice,
          portfolioPosition.currency,
-          this.request.user?.Settings?.settings.baseCurrency ??
-            this.baseCurrency
+          this.request.user?.Settings?.currency ?? baseCurrency
        );
      })
      .reduce((a, b) => a + b, 0);

    for (const [symbol, portfolioPosition] of Object.entries(holdings)) {
-      portfolioPublicDetails.holdings[symbol] = {
-        allocationCurrent: portfolioPosition.value / totalValue,
-        countries: hasDetails ? portfolioPosition.countries : [],
-        currency: hasDetails ? portfolioPosition.currency : undefined,
-        markets: hasDetails ? portfolioPosition.markets : undefined,
-        name: portfolioPosition.name,
-        netPerformancePercent: portfolioPosition.netPerformancePercent,
-        sectors: hasDetails ? portfolioPosition.sectors : [],
-        symbol: portfolioPosition.symbol,
-        url: portfolioPosition.url,
-        value: portfolioPosition.value / totalValue
-      };
+      if (portfolioPosition.assetClass === 'EQUITY') {
+        portfolioPublicDetails.holdings[symbol] = {
+          allocationCurrent: portfolioPosition.allocationCurrent,
+          countries: hasDetails ? portfolioPosition.countries : [],
+          currency: portfolioPosition.currency,
+          name: portfolioPosition.name,
+          sectors: hasDetails ? portfolioPosition.sectors : [],
+          value: portfolioPosition.value / totalValue
+        };
+      }
    }

    return portfolioPublicDetails;
  }

+  @Get('summary')
+  @UseGuards(AuthGuard('jwt'))
+  public async getSummary(
+    @Headers('impersonation-id') impersonationId
+  ): Promise<PortfolioSummary> {
+    let summary = await this.portfolioServiceStrategy
+      .get()
+      .getSummary(impersonationId);
+
+    if (
+      impersonationId ||
+      this.userService.isRestrictedView(this.request.user)
+    ) {
+      summary = nullifyValuesInObject(summary, [
+        'cash',
+        'committedFunds',
+        'currentGrossPerformance',
+        'currentNetPerformance',
+        'currentValue',
+        'dividend',
+        'fees',
+        'items',
+        'netWorth',
+        'totalBuy',
+        'totalSell'
+      ]);
+    }
+
+    return summary;
+  }
+
  @Get('position/:dataSource/:symbol')
  @UseInterceptors(TransformDataSourceInRequestInterceptor)
  @UseInterceptors(TransformDataSourceInResponseInterceptor)
@ -451,11 +351,9 @@ export class PortfolioController {
    @Param('dataSource') dataSource,
    @Param('symbol') symbol
  ): Promise<PortfolioPositionDetail> {
-    let position = await this.portfolioService.getPosition(
-      dataSource,
-      impersonationId,
-      symbol
-    );
+    let position = await this.portfolioServiceStrategy
+      .get()
+      .getPosition(dataSource, impersonationId, symbol);

    if (position) {
      if (
@ -496,6 +394,6 @@ export class PortfolioController {
      );
    }

-    return await this.portfolioService.getReport(impersonationId);
+    return await this.portfolioServiceStrategy.get().getReport(impersonationId);
  }
 }
--- a/apps/api/src/app/portfolio/portfolio.module.ts
+++ b/apps/api/src/app/portfolio/portfolio.module.ts
@ -13,13 +13,15 @@ import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.mod
 import { Module } from '@nestjs/common';

 import { CurrentRateService } from './current-rate.service';
+import { PortfolioServiceStrategy } from './portfolio-service.strategy';
 import { PortfolioController } from './portfolio.controller';
 import { PortfolioService } from './portfolio.service';
+import { PortfolioServiceNew } from './portfolio.service-new';
 import { RulesService } from './rules.service';

@Module({
  controllers: [PortfolioController],
-  exports: [PortfolioService],
+  exports: [PortfolioServiceStrategy],
  imports: [
    AccessModule,
    ConfigurationModule,
@ -37,6 +39,8 @@ import { RulesService } from './rules.service';
    AccountService,
    CurrentRateService,
    PortfolioService,
+    PortfolioServiceNew,
+    PortfolioServiceStrategy,
    RulesService
  ]
 })
--- a/apps/api/src/app/portfolio/portfolio.service-new.ts
+++ b/apps/api/src/app/portfolio/portfolio.service-new.ts
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
--- a/apps/api/src/app/portfolio/rules.service.ts
+++ b/apps/api/src/app/portfolio/rules.service.ts
@ -1,6 +1,5 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { Rule } from '@ghostfolio/api/models/rule';
-import { UserSettings } from '@ghostfolio/common/interfaces';
 import { Injectable } from '@nestjs/common';

@Injectable()
@ -9,7 +8,7 @@ export class RulesService {

  public async evaluate<T extends RuleSettings>(
    aRules: Rule<T>[],
-    aUserSettings: UserSettings
+    aUserSettings: { baseCurrency: string }
  ) {
    return aRules
      .filter((rule) => {
--- a/apps/api/src/app/redis-cache/redis-cache.module.ts
+++ b/apps/api/src/app/redis-cache/redis-cache.module.ts
@ -1,6 +1,7 @@
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { CacheManagerOptions, CacheModule, Module } from '@nestjs/common';
+import { CacheModule, Module } from '@nestjs/common';
+import { ConfigModule, ConfigService } from '@nestjs/config';
 import * as redisStore from 'cache-manager-redis-store';

 import { RedisCacheService } from './redis-cache.service';
@ -8,18 +9,15 @@ import { RedisCacheService } from './redis-cache.service';
@Module({
  imports: [
    CacheModule.registerAsync({
-      imports: [ConfigurationModule],
-      inject: [ConfigurationService],
-      useFactory: async (configurationService: ConfigurationService) => {
-        return <CacheManagerOptions>{
-          host: configurationService.get('REDIS_HOST'),
-          max: configurationService.get('MAX_ITEM_IN_CACHE'),
-          password: configurationService.get('REDIS_PASSWORD'),
-          port: configurationService.get('REDIS_PORT'),
-          store: redisStore,
-          ttl: configurationService.get('CACHE_TTL')
-        };
-      }
+      imports: [ConfigModule],
+      inject: [ConfigService],
+      useFactory: async (configurationService: ConfigurationService) => ({
+        host: configurationService.get('REDIS_HOST'),
+        max: configurationService.get('MAX_ITEM_IN_CACHE'),
+        port: configurationService.get('REDIS_PORT'),
+        store: redisStore,
+        ttl: configurationService.get('CACHE_TTL')
+      })
    }),
    ConfigurationModule
  ],
--- a/apps/api/src/app/subscription/subscription.controller.ts
+++ b/apps/api/src/app/subscription/subscription.controller.ts
@ -1,9 +1,6 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
-import {
-  DEFAULT_LANGUAGE_CODE,
-  PROPERTY_COUPONS
-} from '@ghostfolio/common/config';
+import { PROPERTY_COUPONS } from '@ghostfolio/common/config';
 import { Coupon } from '@ghostfolio/common/interfaces';
 import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
@ -49,25 +46,22 @@ export class SubscriptionController {
      ((await this.propertyService.getByKey(PROPERTY_COUPONS)) as Coupon[]) ??
      [];

-    const coupon = coupons.find((currentCoupon) => {
-      return currentCoupon.code === couponCode;
+    const isValid = coupons.some((coupon) => {
+      return coupon.code === couponCode;
    });

-    if (coupon === undefined) {
+    if (!isValid) {
      throw new HttpException(
        getReasonPhrase(StatusCodes.BAD_REQUEST),
        StatusCodes.BAD_REQUEST
      );
    }

-    await this.subscriptionService.createSubscription({
-      duration: coupon.duration,
-      userId: this.request.user.id
-    });
+    await this.subscriptionService.createSubscription(this.request.user.id);

    // Destroy coupon
-    coupons = coupons.filter((currentCoupon) => {
-      return currentCoupon.code !== couponCode;
+    coupons = coupons.filter((coupon) => {
+      return coupon.code !== couponCode;
    });
    await this.propertyService.put({
      key: PROPERTY_COUPONS,
@ -75,8 +69,7 @@ export class SubscriptionController {
    });

    Logger.log(
-      `Subscription for user '${this.request.user.id}' has been created with a coupon for ${coupon.duration}`,
-      'SubscriptionController'
+      `Subscription for user '${this.request.user.id}' has been created with coupon`
    );

    return {
@ -91,16 +84,9 @@ export class SubscriptionController {
      req.query.checkoutSessionId
    );

-    Logger.log(
-      `Subscription for user '${userId}' has been created via Stripe`,
-      'SubscriptionController'
-    );
+    Logger.log(`Subscription for user '${userId}' has been created via Stripe`);

-    res.redirect(
-      `${this.configurationService.get(
-        'ROOT_URL'
-      )}/${DEFAULT_LANGUAGE_CODE}/account`
-    );
+    res.redirect(`${this.configurationService.get('ROOT_URL')}/account`);
  }

  @Post('stripe/checkout-session')
@ -115,7 +101,7 @@ export class SubscriptionController {
        userId: this.request.user.id
      });
    } catch (error) {
-      Logger.error(error, 'SubscriptionController');
+      Logger.error(error);

      throw new HttpException(
        getReasonPhrase(StatusCodes.BAD_REQUEST),
--- a/apps/api/src/app/subscription/subscription.service.ts
+++ b/apps/api/src/app/subscription/subscription.service.ts
@ -1,11 +1,9 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
 import { SubscriptionType } from '@ghostfolio/common/types/subscription.type';
 import { Injectable, Logger } from '@nestjs/common';
-import { Subscription } from '@prisma/client';
-import { addMilliseconds, isBefore } from 'date-fns';
-import ms, { StringValue } from 'ms';
+import { Subscription, User } from '@prisma/client';
+import { addDays, isBefore } from 'date-fns';
 import Stripe from 'stripe';

@Injectable()
@ -34,9 +32,7 @@ export class SubscriptionService {
    userId: string;
  }) {
    const checkoutSessionCreateParams: Stripe.Checkout.SessionCreateParams = {
-      cancel_url: `${this.configurationService.get(
-        'ROOT_URL'
-      )}/${DEFAULT_LANGUAGE_CODE}/account`,
+      cancel_url: `${this.configurationService.get('ROOT_URL')}/account`,
      client_reference_id: userId,
      line_items: [
        {
@ -48,7 +44,7 @@ export class SubscriptionService {
      payment_method_types: ['card'],
      success_url: `${this.configurationService.get(
        'ROOT_URL'
-      )}/api/v1/subscription/stripe/callback?checkoutSessionId={CHECKOUT_SESSION_ID}`
+      )}/api/subscription/stripe/callback?checkoutSessionId={CHECKOUT_SESSION_ID}`
    };

    if (couponId) {
@ -68,19 +64,13 @@ export class SubscriptionService {
    };
  }

-  public async createSubscription({
-    duration = '1 year',
-    userId
-  }: {
-    duration?: StringValue;
-    userId: string;
-  }) {
+  public async createSubscription(aUserId: string) {
    await this.prismaService.subscription.create({
      data: {
-        expiresAt: addMilliseconds(new Date(), ms(duration)),
+        expiresAt: addDays(new Date(), 365),
        User: {
          connect: {
-            id: userId
+            id: aUserId
          }
        }
      }
@ -93,7 +83,7 @@ export class SubscriptionService {
        aCheckoutSessionId
      );

-      await this.createSubscription({ userId: session.client_reference_id });
+      await this.createSubscription(session.client_reference_id);

      await this.stripe.customers.update(session.customer as string, {
        description: session.client_reference_id
@ -101,7 +91,7 @@ export class SubscriptionService {

      return session.client_reference_id;
    } catch (error) {
-      Logger.error(error, 'SubscriptionService');
+      Logger.error(error);
    }
  }

--- a/apps/api/src/app/symbol/interfaces/symbol-item.interface.ts
+++ b/apps/api/src/app/symbol/interfaces/symbol-item.interface.ts
@ -1,7 +1,9 @@
-import { HistoricalDataItem, UniqueAsset } from '@ghostfolio/common/interfaces';
+import { HistoricalDataItem } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position-detail.interface';
+import { DataSource } from '@prisma/client';

-export interface SymbolItem extends UniqueAsset {
+export interface SymbolItem {
  currency: string;
+  dataSource: DataSource;
  historicalData: HistoricalDataItem[];
  marketPrice: number;
 }
--- a/apps/api/src/app/symbol/symbol.controller.ts
+++ b/apps/api/src/app/symbol/symbol.controller.ts
@ -46,6 +46,7 @@ export class SymbolController {
   * Must be after /lookup
   */
  @Get(':dataSource/:symbol')
+  @UseGuards(AuthGuard('jwt'))
  @UseInterceptors(TransformDataSourceInRequestInterceptor)
  @UseInterceptors(TransformDataSourceInResponseInterceptor)
  public async getSymbolData(
--- a/apps/api/src/app/symbol/symbol.service.ts
+++ b/apps/api/src/app/symbol/symbol.service.ts
@ -1,3 +1,4 @@
+import { HistoricalDataItem } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position-detail.interface';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import {
  IDataGatheringItem,
@ -5,7 +6,6 @@ import {
 } from '@ghostfolio/api/services/interfaces/interfaces';
 import { MarketDataService } from '@ghostfolio/api/services/market-data.service';
 import { DATE_FORMAT } from '@ghostfolio/common/helper';
-import { HistoricalDataItem } from '@ghostfolio/common/interfaces';
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource } from '@prisma/client';
 import { format, subDays } from 'date-fns';
@ -27,10 +27,8 @@ export class SymbolService {
    dataGatheringItem: IDataGatheringItem;
    includeHistoricalData?: number;
  }): Promise<SymbolItem> {
-    const quotes = await this.dataProviderService.getQuotes([
-      dataGatheringItem
-    ]);
-    const { currency, marketPrice } = quotes[dataGatheringItem.symbol] ?? {};
+    const response = await this.dataProviderService.get([dataGatheringItem]);
+    const { currency, marketPrice } = response[dataGatheringItem.symbol] ?? {};

    if (dataGatheringItem.dataSource && marketPrice) {
      let historicalData: HistoricalDataItem[] = [];
@ -55,8 +53,7 @@ export class SymbolService {
        currency,
        historicalData,
        marketPrice,
-        dataSource: dataGatheringItem.dataSource,
-        symbol: dataGatheringItem.symbol
+        dataSource: dataGatheringItem.dataSource
      };
    }

@ -96,7 +93,7 @@ export class SymbolService {
      results.items = items;
      return results;
    } catch (error) {
-      Logger.error(error, 'SymbolService');
+      Logger.error(error);

      throw error;
    }
--- a/apps/api/src/app/user/interfaces/access.interface.ts
+++ b/apps/api/src/app/user/interfaces/access.interface.ts
@ -0,0 +1,4 @@
+export interface Access {
+  alias?: string;
+  id: string;
+}
--- a/apps/api/src/app/user/interfaces/user-settings-params.interface.ts
+++ b/apps/api/src/app/user/interfaces/user-settings-params.interface.ts
@ -0,0 +1,7 @@
+import { ViewMode } from '@prisma/client';
+
+export interface UserSettingsParams {
+  currency?: string;
+  userId: string;
+  viewMode?: ViewMode;
+}
--- a/apps/api/src/app/user/interfaces/user-settings.interface.ts
+++ b/apps/api/src/app/user/interfaces/user-settings.interface.ts
@ -0,0 +1,3 @@
+export interface UserSettings {
+  isRestrictedView?: boolean;
+}
--- a/apps/api/src/app/user/update-user-setting.dto.ts
+++ b/apps/api/src/app/user/update-user-setting.dto.ts
@ -1,50 +1,11 @@
-import type { DateRange, ViewMode } from '@ghostfolio/common/types';
-import {
-  IsBoolean,
-  IsIn,
-  IsNumber,
-  IsOptional,
-  IsString
-} from 'class-validator';
+import { IsBoolean, IsOptional } from 'class-validator';

 export class UpdateUserSettingDto {
-  @IsOptional()
-  @IsString()
-  baseCurrency?: string;
-
-  @IsString()
-  @IsOptional()
-  benchmark?: string;
-
-  @IsIn(<DateRange[]>['1d', '1y', '5y', 'max', 'ytd'])
-  @IsOptional()
-  dateRange?: DateRange;
-
-  @IsNumber()
-  @IsOptional()
-  emergencyFund?: number;
-
  @IsBoolean()
  @IsOptional()
-  isExperimentalFeatures?: boolean;
+  isNewCalculationEngine?: boolean;

  @IsBoolean()
  @IsOptional()
  isRestrictedView?: boolean;
-
-  @IsString()
-  @IsOptional()
-  language?: string;
-
-  @IsString()
-  @IsOptional()
-  locale?: string;
-
-  @IsNumber()
-  @IsOptional()
-  savingsRate?: number;
-
-  @IsIn(<ViewMode[]>['DEFAULT', 'ZEN'])
-  @IsOptional()
-  viewMode?: ViewMode;
 }
--- a/apps/api/src/app/user/update-user-settings.dto.ts
+++ b/apps/api/src/app/user/update-user-settings.dto.ts
@ -0,0 +1,10 @@
+import { ViewMode } from '@prisma/client';
+import { IsString } from 'class-validator';
+
+export class UpdateUserSettingsDto {
+  @IsString()
+  baseCurrency: string;
+
+  @IsString()
+  viewMode: ViewMode;
+}
--- a/apps/api/src/app/user/user.controller.ts
+++ b/apps/api/src/app/user/user.controller.ts
@ -1,15 +1,18 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { PROPERTY_IS_READ_ONLY_MODE } from '@ghostfolio/common/config';
-import { User, UserSettings } from '@ghostfolio/common/interfaces';
-import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import { User } from '@ghostfolio/common/interfaces';
+import {
+  hasPermission,
+  hasRole,
+  permissions
+} from '@ghostfolio/common/permissions';
 import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
  Body,
  Controller,
  Delete,
  Get,
-  Headers,
  HttpException,
  Inject,
  Param,
@ -20,19 +23,22 @@ import {
 import { REQUEST } from '@nestjs/core';
 import { JwtService } from '@nestjs/jwt';
 import { AuthGuard } from '@nestjs/passport';
+import { Provider, Role } from '@prisma/client';
 import { User as UserModel } from '@prisma/client';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
-import { size } from 'lodash';

 import { UserItem } from './interfaces/user-item.interface';
+import { UserSettingsParams } from './interfaces/user-settings-params.interface';
+import { UserSettings } from './interfaces/user-settings.interface';
 import { UpdateUserSettingDto } from './update-user-setting.dto';
+import { UpdateUserSettingsDto } from './update-user-settings.dto';
 import { UserService } from './user.service';

@Controller('user')
 export class UserController {
  public constructor(
    private readonly configurationService: ConfigurationService,
-    private readonly jwtService: JwtService,
+    private jwtService: JwtService,
    private readonly propertyService: PropertyService,
    @Inject(REQUEST) private readonly request: RequestWithUser,
    private readonly userService: UserService
@ -58,13 +64,8 @@ export class UserController {

  @Get()
  @UseGuards(AuthGuard('jwt'))
-  public async getUser(
-    @Headers('accept-language') acceptLanguage: string
-  ): Promise<User> {
-    return this.userService.getUser(
-      this.request.user,
-      acceptLanguage?.split(',')?.[0]
-    );
+  public async getUser(@Param('id') id: string): Promise<User> {
+    return this.userService.getUser(this.request.user);
  }

  @Post()
@ -101,12 +102,6 @@ export class UserController {
  @UseGuards(AuthGuard('jwt'))
  public async updateUserSetting(@Body() data: UpdateUserSettingDto) {
    if (
-      size(data) === 1 &&
-      (data.benchmark || data.dateRange) &&
-      this.request.user.role === 'DEMO'
-    ) {
-      // Allow benchmark or date range change for demo user
-    } else if (
      !hasPermission(
        this.request.user.permissions,
        permissions.updateUserSettings
@ -124,7 +119,7 @@ export class UserController {
    };

    for (const key in userSettings) {
-      if (userSettings[key] === false || userSettings[key] === null) {
+      if (userSettings[key] === false) {
        delete userSettings[key];
      }
    }
@ -134,4 +129,33 @@ export class UserController {
      userId: this.request.user.id
    });
  }
+
+  @Put('settings')
+  @UseGuards(AuthGuard('jwt'))
+  public async updateUserSettings(@Body() data: UpdateUserSettingsDto) {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.updateUserSettings
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    const userSettings: UserSettingsParams = {
+      currency: data.baseCurrency,
+      userId: this.request.user.id
+    };
+
+    if (
+      hasPermission(this.request.user.permissions, permissions.updateViewMode)
+    ) {
+      userSettings.viewMode = data.viewMode;
+    }
+
+    return await this.userService.updateUserSettings(userSettings);
+  }
 }
--- a/apps/api/src/app/user/user.module.ts
+++ b/apps/api/src/app/user/user.module.ts
@ -2,7 +2,6 @@ import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscriptio
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
 import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
-import { TagModule } from '@ghostfolio/api/services/tag/tag.module';
 import { Module } from '@nestjs/common';
 import { JwtModule } from '@nestjs/jwt';

@ -20,8 +19,7 @@ import { UserService } from './user.service';
    }),
    PrismaModule,
    PropertyModule,
-    SubscriptionModule,
-    TagModule
+    SubscriptionModule
  ],
  providers: [UserService]
 })
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@ -2,21 +2,23 @@ import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscripti
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
-import { TagService } from '@ghostfolio/api/services/tag/tag.service';
-import { PROPERTY_IS_READ_ONLY_MODE, locale } from '@ghostfolio/common/config';
 import {
-  User as IUser,
-  UserSettings,
-  UserWithSettings
-} from '@ghostfolio/common/interfaces';
+  PROPERTY_IS_READ_ONLY_MODE,
+  baseCurrency,
+  locale
+} from '@ghostfolio/common/config';
+import { User as IUser, UserWithSettings } from '@ghostfolio/common/interfaces';
 import {
  getPermissions,
  hasRole,
  permissions
 } from '@ghostfolio/common/permissions';
+import { SubscriptionType } from '@ghostfolio/common/types/subscription.type';
 import { Injectable } from '@nestjs/common';
-import { Prisma, Role, User } from '@prisma/client';
-import { sortBy } from 'lodash';
+import { Prisma, Provider, Role, User, ViewMode } from '@prisma/client';
+
+import { UserSettingsParams } from './interfaces/user-settings-params.interface';
+import { UserSettings } from './interfaces/user-settings.interface';

 const crypto = require('crypto');

@ -24,53 +26,46 @@ const crypto = require('crypto');
 export class UserService {
  public static DEFAULT_CURRENCY = 'USD';

-  private baseCurrency: string;
-
  public constructor(
    private readonly configurationService: ConfigurationService,
    private readonly prismaService: PrismaService,
    private readonly propertyService: PropertyService,
-    private readonly subscriptionService: SubscriptionService,
-    private readonly tagService: TagService
-  ) {
-    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
-  }
+    private readonly subscriptionService: SubscriptionService
+  ) {}

-  public async getUser(
-    { Account, id, permissions, Settings, subscription }: UserWithSettings,
-    aLocale = locale
-  ): Promise<IUser> {
+  public async getUser({
+    Account,
+    alias,
+    id,
+    permissions,
+    Settings,
+    subscription
+  }: UserWithSettings): Promise<IUser> {
    const access = await this.prismaService.access.findMany({
      include: {
        User: true
      },
-      orderBy: { alias: 'asc' },
+      orderBy: { User: { alias: 'asc' } },
      where: { GranteeUser: { id } }
    });
-    let tags = await this.tagService.getByUser(id);
-
-    if (
-      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
-      subscription.type === 'Basic'
-    ) {
-      tags = [];
-    }

    return {
+      alias,
      id,
      permissions,
      subscription,
-      tags,
      access: access.map((accessItem) => {
        return {
-          alias: accessItem.alias,
+          alias: accessItem.User.alias,
          id: accessItem.id
        };
      }),
      accounts: Account,
      settings: {
        ...(<UserSettings>Settings.settings),
-        locale: (<UserSettings>Settings.settings)?.locale ?? aLocale
+        locale,
+        baseCurrency: Settings?.currency ?? UserService.DEFAULT_CURRENCY,
+        viewMode: Settings?.viewMode ?? ViewMode.DEFAULT
      }
    };
  }
@ -88,81 +83,23 @@ export class UserService {
  }

  public isRestrictedView(aUser: UserWithSettings) {
-    return aUser.Settings.settings.isRestrictedView ?? false;
+    return (aUser.Settings.settings as UserSettings)?.isRestrictedView ?? false;
  }

  public async user(
    userWhereUniqueInput: Prisma.UserWhereUniqueInput
  ): Promise<UserWithSettings | null> {
-    const {
-      accessToken,
-      Account,
-      authChallenge,
-      createdAt,
-      id,
-      provider,
-      role,
-      Settings,
-      Subscription,
-      thirdPartyId,
-      updatedAt
-    } = await this.prismaService.user.findUnique({
+    const userFromDatabase = await this.prismaService.user.findUnique({
      include: { Account: true, Settings: true, Subscription: true },
      where: userWhereUniqueInput
    });

-    const user: UserWithSettings = {
-      accessToken,
-      Account,
-      authChallenge,
-      createdAt,
-      id,
-      provider,
-      role,
-      Settings,
-      thirdPartyId,
-      updatedAt
-    };
+    const user: UserWithSettings = userFromDatabase;

-    if (user?.Settings) {
-      if (!user.Settings.settings) {
-        user.Settings.settings = {};
-      }
-    } else if (user) {
-      // Set default settings if needed
-      user.Settings = {
-        settings: {},
-        updatedAt: new Date(),
-        userId: user?.id
-      };
-    }
+    let currentPermissions = getPermissions(userFromDatabase.role);

-    // Set default value for base currency
-    if (!(user.Settings.settings as UserSettings)?.baseCurrency) {
-      (user.Settings.settings as UserSettings).baseCurrency =
-        UserService.DEFAULT_CURRENCY;
-    }
-
-    // Set default value for date range
-    (user.Settings.settings as UserSettings).dateRange =
-      (user.Settings.settings as UserSettings).viewMode === 'ZEN'
-        ? 'max'
-        : (user.Settings.settings as UserSettings)?.dateRange ?? 'max';
-
-    // Set default value for view mode
-    if (!(user.Settings.settings as UserSettings).viewMode) {
-      (user.Settings.settings as UserSettings).viewMode = 'DEFAULT';
-    }
-
-    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
-      user.subscription =
-        this.subscriptionService.getSubscription(Subscription);
-    }
-
-    let currentPermissions = getPermissions(user.role);
-
-    if (user.subscription?.type === 'Premium') {
-      currentPermissions.push(permissions.reportDataGlitch);
+    if (this.configurationService.get('ENABLE_FEATURE_FEAR_AND_GREED_INDEX')) {
+      currentPermissions.push(permissions.accessFearAndGreedIndex);
    }

    if (this.configurationService.get('ENABLE_FEATURE_READ_ONLY_MODE')) {
@ -185,10 +122,36 @@ export class UserService {
      }
    }

-    user.Account = sortBy(user.Account, (account) => {
-      return account.name;
-    });
-    user.permissions = currentPermissions.sort();
+    user.permissions = currentPermissions;
+
+    if (userFromDatabase?.Settings) {
+      if (!userFromDatabase.Settings.currency) {
+        // Set default currency if needed
+        userFromDatabase.Settings.currency = UserService.DEFAULT_CURRENCY;
+      }
+    } else if (userFromDatabase) {
+      // Set default settings if needed
+      userFromDatabase.Settings = {
+        currency: UserService.DEFAULT_CURRENCY,
+        settings: null,
+        updatedAt: new Date(),
+        userId: userFromDatabase?.id,
+        viewMode: ViewMode.DEFAULT
+      };
+    }
+
+    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
+      user.subscription = this.subscriptionService.getSubscription(
+        userFromDatabase?.Subscription
+      );
+
+      if (user.subscription.type === SubscriptionType.Basic) {
+        user.permissions = user.permissions.filter((permission) => {
+          return permission !== permissions.updateViewMode;
+        });
+        user.Settings.viewMode = ViewMode.ZEN;
+      }
+    }

    return user;
  }
@ -227,16 +190,14 @@ export class UserService {
        ...data,
        Account: {
          create: {
-            currency: this.baseCurrency,
+            currency: baseCurrency,
            isDefault: true,
            name: 'Default Account'
          }
        },
        Settings: {
          create: {
-            settings: {
-              currency: this.baseCurrency
-            }
+            currency: baseCurrency
          }
        }
      }
@ -310,7 +271,7 @@ export class UserService {
    userId: string;
    userSettings: UserSettings;
  }) {
-    const settings = userSettings as unknown as Prisma.JsonObject;
+    const settings = userSettings as Prisma.JsonObject;

    await this.prismaService.settings.upsert({
      create: {
@ -332,6 +293,33 @@ export class UserService {
    return;
  }

+  public async updateUserSettings({
+    currency,
+    userId,
+    viewMode
+  }: UserSettingsParams) {
+    await this.prismaService.settings.upsert({
+      create: {
+        currency,
+        User: {
+          connect: {
+            id: userId
+          }
+        },
+        viewMode
+      },
+      update: {
+        currency,
+        viewMode
+      },
+      where: {
+        userId: userId
+      }
+    });
+
+    return;
+  }
+
  private getRandomString(length: number) {
    const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
    const result = [];
--- a/apps/client/src/app/pages/demo/demo-page.html
+++ b/apps/client/src/app/pages/demo/demo-page.html
--- a/apps/api/src/assets/countries/developed-markets.json
+++ b/apps/api/src/assets/countries/developed-markets.json
@ -1,26 +0,0 @@
-[
-  "AT",
-  "AU",
-  "BE",
-  "CA",
-  "CH",
-  "DE",
-  "DK",
-  "ES",
-  "FI",
-  "FR",
-  "GB",
-  "HK",
-  "IE",
-  "IL",
-  "IT",
-  "JP",
-  "LU",
-  "NL",
-  "NO",
-  "NZ",
-  "PT",
-  "SE",
-  "SG",
-  "US"
-]
--- a/apps/api/src/assets/countries/emerging-markets.json
+++ b/apps/api/src/assets/countries/emerging-markets.json
@ -1,28 +0,0 @@
-[
-  "AE",
-  "BR",
-  "CL",
-  "CN",
-  "CO",
-  "CY",
-  "CZ",
-  "EG",
-  "GR",
-  "HK",
-  "HU",
-  "ID",
-  "IN",
-  "KR",
-  "KW",
-  "MX",
-  "MY",
-  "PE",
-  "PH",
-  "PL",
-  "QA",
-  "SA",
-  "TH",
-  "TR",
-  "TW",
-  "ZA"
-]
--- a/apps/api/src/assets/cryptocurrencies/cryptocurrencies.json
+++ b/apps/api/src/assets/cryptocurrencies/cryptocurrencies.json
--- a/apps/api/src/assets/cryptocurrencies/custom.json
+++ b/apps/api/src/assets/cryptocurrencies/custom.json
@ -1,7 +0,0 @@
-{
-  "LUNA1": "Terra",
-  "LUNA2": "Terra",
-  "SGB1": "Songbird",
-  "UNI1": "Uniswap",
-  "UST": "TerraUSD"
-}
--- a/apps/api/src/interceptors/redact-values-in-response.interceptor.ts
+++ b/apps/api/src/interceptors/redact-values-in-response.interceptor.ts
@ -1,58 +0,0 @@
-import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
-import {
-  CallHandler,
-  ExecutionContext,
-  Injectable,
-  NestInterceptor
-} from '@nestjs/common';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-@Injectable()
-export class RedactValuesInResponseInterceptor<T>
-  implements NestInterceptor<T, any>
-{
-  public constructor() {}
-
-  public intercept(
-    context: ExecutionContext,
-    next: CallHandler<T>
-  ): Observable<any> {
-    return next.handle().pipe(
-      map((data: any) => {
-        const request = context.switchToHttp().getRequest();
-        const hasImpersonationId = !!request.headers?.['impersonation-id'];
-
-        if (hasImpersonationId) {
-          if (data.accounts) {
-            for (const accountId of Object.keys(data.accounts)) {
-              if (data.accounts[accountId]?.balance !== undefined) {
-                data.accounts[accountId].balance = null;
-              }
-            }
-          }
-
-          if (data.activities) {
-            data.activities = data.activities.map((activity: Activity) => {
-              if (activity.Account?.balance !== undefined) {
-                activity.Account.balance = null;
-              }
-
-              return activity;
-            });
-          }
-
-          if (data.filteredValueInBaseCurrency) {
-            data.filteredValueInBaseCurrency = null;
-          }
-
-          if (data.totalValueInBaseCurrency) {
-            data.totalValueInBaseCurrency = null;
-          }
-        }
-
-        return data;
-      })
-    );
-  }
-}
--- a/apps/api/src/interceptors/transform-data-source-in-response.interceptor.ts
+++ b/apps/api/src/interceptors/transform-data-source-in-response.interceptor.ts
@ -5,7 +5,6 @@ import {
  Injectable,
  NestInterceptor
 } from '@nestjs/common';
-import { isArray } from 'lodash';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';

@ -33,29 +32,15 @@ export class TransformDataSourceInResponseInterceptor<T>
              activity.SymbolProfile.dataSource = encodeDataSource(
                activity.SymbolProfile.dataSource
              );
+              activity.dataSource = encodeDataSource(activity.dataSource);
              return activity;
            });
          }

-          if (isArray(data.benchmarks)) {
-            data.benchmarks.map((benchmark) => {
-              benchmark.dataSource = encodeDataSource(benchmark.dataSource);
-              return benchmark;
-            });
-          }
-
          if (data.dataSource) {
            data.dataSource = encodeDataSource(data.dataSource);
          }

-          if (data.errors) {
-            for (const error of data.errors) {
-              if (error.dataSource) {
-                error.dataSource = encodeDataSource(error.dataSource);
-              }
-            }
-          }
-
          if (data.holdings) {
            for (const symbol of Object.keys(data.holdings)) {
              if (data.holdings[symbol].dataSource) {
@ -73,6 +58,13 @@ export class TransformDataSourceInResponseInterceptor<T>
            });
          }

+          if (data.orders) {
+            data.orders.map((order) => {
+              order.dataSource = encodeDataSource(order.dataSource);
+              return order;
+            });
+          }
+
          if (data.positions) {
            data.positions.map((position) => {
              position.dataSource = encodeDataSource(position.dataSource);
--- a/apps/api/src/main.ts
+++ b/apps/api/src/main.ts
@ -1,30 +1,14 @@
-import { Logger, ValidationPipe, VersioningType } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
+import { Logger, ValidationPipe } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';

 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';

 async function bootstrap() {
-  const configApp = await NestFactory.create(AppModule);
-  const configService = configApp.get<ConfigService>(ConfigService);
-
-  const NODE_ENV =
-    configService.get<'development' | 'production'>('NODE_ENV') ??
-    'development';
-
-  const app = await NestFactory.create(AppModule, {
-    logger:
-      NODE_ENV === 'production'
-        ? ['error', 'log', 'warn']
-        : ['debug', 'error', 'log', 'verbose', 'warn']
-  });
+  const app = await NestFactory.create(AppModule);
  app.enableCors();
-  app.enableVersioning({
-    defaultVersion: '1',
-    type: VersioningType.URI
-  });
-  app.setGlobalPrefix('api');
+  const globalPrefix = 'api';
+  app.setGlobalPrefix(globalPrefix);
  app.useGlobalPipes(
    new ValidationPipe({
      forbidNonWhitelisted: true,
@ -33,11 +17,10 @@ async function bootstrap() {
    })
  );

-  const HOST = configService.get<string>('HOST') || '0.0.0.0';
-  const PORT = configService.get<number>('PORT') || 3333;
-  await app.listen(PORT, HOST, () => {
+  const port = process.env.PORT || 3333;
+  await app.listen(port, () => {
    logLogo();
-    Logger.log(`Listening at http://${HOST}:${PORT}`);
+    Logger.log(`Listening at http://localhost:${port}`);
    Logger.log('');
  });
 }
--- a/apps/api/src/models/interfaces/rule.interface.ts
+++ b/apps/api/src/models/interfaces/rule.interface.ts
@ -1,5 +1,5 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
-import { UserSettings } from '@ghostfolio/common/interfaces';
+import { UserSettings } from '@ghostfolio/api/models/interfaces/user-settings.interface';

 import { EvaluationResult } from './evaluation-result.interface';

--- a/apps/api/src/models/interfaces/user-settings.interface.ts
+++ b/apps/api/src/models/interfaces/user-settings.interface.ts
@ -0,0 +1,3 @@
+export interface UserSettings {
+  baseCurrency: string;
+}
--- a/apps/api/src/models/rule.ts
+++ b/apps/api/src/models/rule.ts
@ -1,7 +1,8 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
+import { UserSettings } from '@ghostfolio/api/models/interfaces/user-settings.interface';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { groupBy } from '@ghostfolio/common/helper';
-import { TimelinePosition, UserSettings } from '@ghostfolio/common/interfaces';
+import { TimelinePosition } from '@ghostfolio/common/interfaces';

 import { EvaluationResult } from './interfaces/evaluation-result.interface';
 import { RuleInterface } from './interfaces/rule.interface';
--- a/apps/api/src/models/rules/account-cluster-risk/current-investment.ts
+++ b/apps/api/src/models/rules/account-cluster-risk/current-investment.ts
@ -1,9 +1,9 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
+import { UserSettings } from '@ghostfolio/api/models/interfaces/user-settings.interface';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import {
  PortfolioDetails,
-  PortfolioPosition,
-  UserSettings
+  PortfolioPosition
 } from '@ghostfolio/common/interfaces';

 import { Rule } from '../../rule';
--- a/apps/api/src/models/rules/account-cluster-risk/initial-investment.ts
+++ b/apps/api/src/models/rules/account-cluster-risk/initial-investment.ts
@ -1,10 +1,10 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
+import { UserSettings } from '@ghostfolio/api/models/interfaces/user-settings.interface';
 import {
  PortfolioDetails,
-  PortfolioPosition,
-  UserSettings
+  PortfolioPosition
 } from '@ghostfolio/common/interfaces';
+import { ExchangeRateDataService } from 'apps/api/src/services/exchange-rate-data.service';

 import { Rule } from '../../rule';

--- a/apps/api/src/models/rules/account-cluster-risk/single-account.ts
+++ b/apps/api/src/models/rules/account-cluster-risk/single-account.ts
@ -1,6 +1,7 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { PortfolioDetails, UserSettings } from '@ghostfolio/common/interfaces';
+import { UserSettings } from '@ghostfolio/api/models/interfaces/user-settings.interface';
+import { PortfolioDetails } from '@ghostfolio/common/interfaces';
+import { ExchangeRateDataService } from 'apps/api/src/services/exchange-rate-data.service';

 import { Rule } from '../../rule';

--- a/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
+++ b/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
@ -1,7 +1,7 @@
 import { CurrentPositions } from '@ghostfolio/api/app/portfolio/interfaces/current-positions.interface';
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
+import { UserSettings } from '@ghostfolio/api/models/interfaces/user-settings.interface';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { UserSettings } from '@ghostfolio/common/interfaces';

 import { Rule } from '../../rule';

--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`custom: ['https://www.buymeacoffee.com/ghostfolio']`