diff --git a/.codeclimate.yml b/.codeclimate.yml
index fd65fd830a..801ada6c4e 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -14,7 +14,7 @@ plugins:
   markdownlint:
     enabled: true
   scss-lint:
-    enabled: true
+    enabled: false
 exclude_patterns:
 - "config/"
 - "db/"
diff --git a/.gitignore b/.gitignore
index 21c2a5101c..b34c80c94b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,6 @@ environment.dev.ts
 #v1
 *.iml
 docs/src
-lib
 tools/test-backend/config/mock.config.json
 tools/.coverage-karma/
 dev-certs/*
@@ -81,6 +80,7 @@ deploy/ci/travis/temp/
 deploy/kubernetes/console/imagelist.txt
 
 .dist/
+dist-devkit/
 deploy/uaa/tmp/
 src/backend/*/vendor/
 .v8flags*
@@ -96,8 +96,9 @@ src/jetstream/config.properties
 src/jetstream/db/dbconf.yml
 src/jetstream/plugins/monocular/chart-repo/chartrepo
 
-# Customisations
-
+# Customisations - these can be removed in the future
+# Left in for now to prevent these files being checked-in, if they are still present
+# from a previous checkout
 src/frontend/packages/core/favicon.ico
 src/frontend/packages/core/sass/custom.scss
 src/frontend/packages/core/assets/eula.html
@@ -110,6 +111,9 @@ src/frontend/packages/core/assets/custom
 src/frontend/packages/core/sass/custom
 src/frontend/packages/core/src/index.html
 
+# Customisation - generated import module
+src/frontend/packages/core/src/_custom-import.module.ts
+
 # Prebuild package
 
 stratos-frontend-prebuild.zip
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 576954b97b..161b42c8ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -155,7 +155,7 @@ Details:
 
 ## 2.6.1
 
-[Full Changelog](https://github.com/cloudfoundry/stratos/compare/2.6.0...2.6.1)
+[Full Changelog](https://github.com/SUSE/stratos/compare/2.6.0...2.6.1)
 
 This release contains a few fixes:
 
@@ -182,7 +182,7 @@ This release contains two fixes listed below.
 
 ## 2.5.3
 
-[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.5.2...2.5.3)
+[Full Changelog](https://github.com/suse/stratos/compare/2.5.2...2.5.3)
 
 This release contains a number of fixes and improvements:
 
@@ -200,7 +200,7 @@ This release contains a number of fixes and improvements:
 
 ## 2.5.2
 
-[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.5.1...2.5.2)
+[Full Changelog](https://github.com/suse/stratos/compare/2.5.1...2.5.2)
 
 This release contains a number of fixes and improvements:
 
@@ -222,7 +222,7 @@ This release contains a number of fixes and improvements:
 
 ## 2.5.1
 
-[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.5.0...2.5.1)
+[Full Changelog](https://github.com/suse/stratos/compare/2.5.0...2.5.1)
 
 This release contains a number of fixes and improvements:
 
diff --git a/angular.json b/angular.json
index 75d6a32748..caa3bceaa9 100644
--- a/angular.json
+++ b/angular.json
@@ -4,14 +4,17 @@
   "newProjectRoot": "src/frontend/packages",
   "projects": {
     "stratos": {
-      "root": "",
+      "root": "src/frontend/packages",
       "sourceRoot": "src/frontend/packages",
       "projectType": "application",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-builders/custom-webpack:browser",
           "options": {
-            "aot": true,
+            "customWebpackConfig": {
+              "path": "./dist-devkit/build/main.js"
+            },
+            "indexTransform": "./dist-devkit/build/index.transform.js",
             "preserveSymlinks": true,
             "outputPath": "dist",
             "index": "src/frontend/packages/core/src/index.html",
@@ -36,10 +39,6 @@
           },
           "configurations": {
             "production": {
-              "budgets": [{
-                "type": "anyComponentStyle",
-                "maximumWarning": "6kb"
-              }],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -57,7 +56,7 @@
           }
         },
         "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
+          "builder": "@angular-builders/custom-webpack:dev-server",
           "options": {
             "aot": true,
             "sslCert": "dev-ssl/server.crt",
@@ -94,36 +93,37 @@
         }
       }
     },
+    "theme": {
+      "root": "src/frontend/packages/theme/",
+      "sourceRoot": "",
+      "projectType": "library",
+      "architect": {
+        "build": {
+          "builder": "./dist-devkit:stratos-theme",
+          "options": {
+            "outputPath": "dist/theme"
+          }
+        }
+      }
+    },
     "core": {
       "root": "src/frontend/packages/core/",
-      "sourceRoot": "src/frontend/packages/core/src",
-      "projectType": "application",
+      "sourceRoot": "src/frontend/packages/core",
+      "projectType": "library",
       "prefix": "app",
       "schematics": {},
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
-            "aot": true,
             "preserveSymlinks": true,
             "outputPath": "dist/core",
             "index": "src/frontend/packages/core/src/index.html",
             "main": "src/frontend/packages/core/src/main.ts",
             "polyfills": "src/frontend/packages/core/src/polyfills.ts",
             "tsConfig": "src/frontend/packages/core/tsconfig.app.json",
-            "assets": [
-              "src/frontend/packages/core/favicon.ico",
-              "src/frontend/packages/core/assets",
-              {
-                "glob": "**/*",
-                "input": "custom-src/frontend/assets/custom",
-                "output": "/core/assets/custom"
-              }
-            ],
-            "styles": [
-              "src/frontend/packages/core/src/styles.css",
-              "src/frontend/packages/cf-autoscaler/src/styles.css"
-            ],
+            "assets": [],
+            "styles": [],
             "scripts": []
           },
           "configurations": {
@@ -148,23 +148,6 @@
             }
           }
         },
-        "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
-          "options": {
-            "browserTarget": "core:build"
-          },
-          "configurations": {
-            "production": {
-              "browserTarget": "core:build:production"
-            }
-          }
-        },
-        "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
-          "options": {
-            "browserTarget": "core:build"
-          }
-        },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
@@ -253,6 +236,37 @@
         }
       }
     },
+    "shared": {
+      "root": "src/frontend/packages/shared",
+      "sourceRoot": "src/frontend/packages/shared/src",
+      "projectType": "library",
+      "prefix": "lib",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-ng-packagr:build",
+          "options": {
+            "tsConfig": "src/frontend/packages/shared/tsconfig.lib.json",
+            "project": "src/frontend/packages/shared/ng-package.json"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/frontend/packages/shared/src/test.ts",
+            "tsConfig": "src/frontend/packages/shared/tsconfig.spec.json",
+            "karmaConfig": "src/frontend/packages/shared/karma.conf.js"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": ["src/tsconfig.json"],
+            "tslintConfig": "src/frontend/packages/shared/tslint.json",
+            "files": ["src/frontend/packages/shared/src/**/*.ts"]
+          }
+        }
+      }
+    },
     "cloud-foundry": {
       "root": "src/frontend/packages/cloud-foundry",
       "sourceRoot": "src/frontend/packages/cloud-foundry/src",
@@ -349,8 +363,5 @@
     "@schematics/angular:directive": {
       "prefix": "app"
     }
-  },
-  "cli": {
-    "_defaultCollection": "@nrwl/angular"
   }
 }
diff --git a/build/customize-build.js b/build/customize-build.js
deleted file mode 100644
index fb98297c18..0000000000
--- a/build/customize-build.js
+++ /dev/null
@@ -1,316 +0,0 @@
-/**
- * Gulp build file for applying cutomizations
- */
-
-/* eslint-disable angular/log,no-console,no-process-env,angular/json-functions,no-sync */
-(function () {
-  'use strict';
-
-  var gulp = require('gulp');
-  var path = require('path');
-  var fs = require('fs-extra');
-  var yaml = require('js-yaml');
-  var replace = require('replace-in-file');
-  var execSync = require('child_process').execSync;
-
-  const CUSTOM_YAML_MANIFEST = path.resolve(__dirname, '../src/frontend/packages/core/misc/custom/custom.yaml');
-  const INDEX_TEMPLATE = path.resolve(__dirname, '../src/frontend/packages/core/misc/custom/index.html');
-  const INDEX_HTML = path.resolve(__dirname, '../src/frontend/packages/core/src/index.html');
-  const CUSTOM_METADATA = path.resolve(__dirname, '../custom-src/stratos.yaml');
-  const GIT_FOLDER = path.resolve(__dirname, '../.git');
-  const GIT_METADATA = path.resolve(__dirname, '../.stratos-git-metadata.json');
-  const INDEX_LOADING_HTML_CUSTOM = path.resolve(__dirname, '../custom-src/frontend/loading.html');
-  const INDEX_LOADING_HTML_DEFAULT = path.resolve(__dirname, '../src/frontend/packages/core/misc/custom/loading.html');
-  const INDEX_LOADING_CSS_CUSTOM = path.resolve(__dirname, '../custom-src/frontend/loading.css');
-  const INDEX_LOADING_CSS_DEFAULT = path.resolve(__dirname, '../src/frontend/packages/core/misc/custom/loading.css');
-
-  // Apply any customizations
-  // Symlink customizations of the default resources for Stratos
-  gulp.task('customize', function (cb) {
-    doShowVersions()
-    doCustomize(false);
-    doGenerateIndexHtml(true);
-    console.log('Finished applying customizations')
-    cb();
-  });
-
-  // Apply defaults instead of any customizations that are available in custom-src
-  gulp.task('customize-default', function (cb) {
-    doCustomize(true);
-    doGenerateIndexHtml(false);
-    console.log('Finished applying default customizations')
-    cb();
-  });
-
-  // Remove all customizations (removes all symlinks as if customize had not been run)
-  gulp.task('customize-reset', function (cb) {
-    doCustomize(true, true);
-    doGenerateIndexHtml(false);
-    console.log('Finished resetting customizations')
-    cb();
-  });
-
-  // Store git metadata so we have it when we are running the the non-git world (Docker)
-  gulp.task('store-git-metadata', function (cb) {
-    storeGitRepositoryMetadata();
-    cb();
-  });
-
-  function doShowVersions() {
-    console.log('Node Version: ' + process.versions.node || 'N/A');
-    try {
-      var response = execSync('npm --v');
-      var npmVersion = response.toString().trim();
-      console.log('NPM Version : ' + npmVersion || 'N/A');
-    } catch (e) {
-      console.log('NPM Version : N/A');
-    }
-  }
-
-  function doCustomize(forceDefaults, reset) {
-    var msg = !forceDefaults ? 'Checking for and applying customizations' : 'Removing customizations and applying defaults';
-    var msg = !reset ? msg : 'Removing all customizations';
-    console.log(msg);
-    var customConfig;
-
-    try {
-      customConfig = yaml.safeLoad(fs.readFileSync(CUSTOM_YAML_MANIFEST, 'utf8'));
-    } catch (e) {
-      console.log('Could not read custom.yaml file');
-      console.log(e);
-      process.exit(1);
-    }
-
-    const baseFolder = path.resolve(__dirname, '../src/frontend/packages/core');
-    const customBaseFolder = path.resolve(__dirname, '../custom-src/frontend');
-    doCustomizeFiles(forceDefaults, reset, customConfig, baseFolder, customBaseFolder);
-    doCustomizeFolders(forceDefaults, reset, customConfig, baseFolder, customBaseFolder);
-    doCustomizeCreateModule(forceDefaults, reset, customConfig, baseFolder, customBaseFolder);
-
-    const backendBaseFolder = path.resolve(__dirname, '../src/jetstream/plugins');
-    const backendCustomBaseFolder = path.resolve(__dirname, '../custom-src/jetstream');
-
-    // There are no defaults for the backend - its the same as removing all of the custom plugins that are there
-    doCustomizeBackend(forceDefaults || reset, backendBaseFolder, backendCustomBaseFolder);
-  };
-
-  function doCustomizeFiles(forceDefaults, reset, customConfig, baseFolder, customBaseFolder) {
-    // This is where we find the default files, if there are no customizations
-    const defaultSrcFolder = path.resolve(__dirname, '../src/frontend/packages/core/misc/custom');
-    // Symlink custom files
-    Object.keys(customConfig.files).forEach(file => {
-      const dest = customConfig.files[file];
-
-      var srcFile = path.join(defaultSrcFolder, file);
-      const destFile = path.join(baseFolder, dest);
-      const customSrcFile = path.join(customBaseFolder, dest);
-
-      // Use the custom file if there is one
-      if (!forceDefaults && fs.existsSync(customSrcFile)) {
-        srcFile = customSrcFile;
-      }
-
-      // Doing an exists check on a symlink will tell if the link dest exists, not the link itself
-      // So try and delete anyway and catch any exception
-      try {
-        const existingLink = fs.readlinkSync(destFile);
-        fs.unlinkSync(destFile);
-      } catch (e) { }
-
-      if (!reset) {
-        fs.symlinkSync(srcFile, destFile);
-        console.log('  + Linking file   : ' + srcFile + ' ==> ' + destFile);
-      }
-    })
-
-  }
-
-  function doCustomizeFolders(forceDefaults, reset, customConfig, baseFolder, customBaseFolder) {
-    // Symlink custom app folders if they are present
-    customConfig.folders.forEach(folder => {
-      var parts = folder.split(':')
-      var src = parts[0];
-      var dest = src;
-      if (parts.length > 1) {
-        dest = parts[1];
-      }
-      var destFolder = path.join(baseFolder, dest);
-      var srcFolder = path.join(customBaseFolder, src);
-      if (fs.existsSync(destFolder)) {
-        fs.unlinkSync(destFolder);
-      }
-      if (!reset && fs.existsSync(srcFolder)) {
-        fs.symlinkSync(srcFolder, destFolder);
-        console.log('  + Linking folder : ' + srcFolder + ' ==> ' + destFolder);
-      }
-    });
-  }
-
-  // Copy the correct custom module to either import the supplied custom module or provide an empty module
-  function doCustomizeCreateModule(forceDefaults, reset, customConfig, baseFolder, customBaseFolder) {
-    const defaultSrcFolder = path.resolve(__dirname, '../src/frontend/packages/core/misc/custom');
-    const destFile = path.join(baseFolder, 'src/custom-import.module.ts');
-    const customModuleFile = path.join(baseFolder, 'src/custom/custom.module.ts');
-    const customRoutingModuleFile = path.join(baseFolder, 'src/custom/custom-routing.module.ts');
-
-    // Delete the existing file if it exists
-    if (fs.existsSync(destFile)) {
-      fs.unlinkSync(destFile)
-    }
-
-    if (!reset) {
-      let srcFile = 'custom.module.ts_';
-      if (fs.existsSync(customModuleFile)) {
-        srcFile = 'custom-src.module.ts_';
-        if (fs.existsSync(customRoutingModuleFile)) {
-          srcFile = 'custom-src-routing.module.ts_';
-          console.log('  + Found custom module with routing');
-        } else {
-          console.log('  + Found custom module without routing');
-        }
-        } else {
-        console.log('  + No custom module found - linking empty custom module');
-      }
-      fs.copySync(path.join(defaultSrcFolder, srcFile), destFile);
-      console.log('  + Copying file   : ' + path.join(defaultSrcFolder, srcFile) + ' ==> ' + destFile);
-    }
-  }
-
-  function doCustomizeBackend(reset, baseFolder, customBaseFolder) {
-    // Symlink custom backend plugin folders if they are present
-    // Get all of the sub-folders in the custom-src/backend folder and symlink
-
-    // Update the git metadata if we can
-    storeGitRepositoryMetadata();
-
-    // Remove all existing symlinks first
-    var existing = fs.readdirSync(baseFolder);
-    existing.forEach(file => {
-      var pluginPath = path.join(baseFolder, file);
-      var stats = fs.lstatSync(pluginPath);
-      if (stats.isSymbolicLink()) {
-        fs.unlinkSync(pluginPath);
-      }
-    })
-
-    if (reset) {
-      // If we are reseting then we are done, just return now
-      return;
-    }
-
-    // Check if we have a customization folder
-    if (!fs.existsSync(customBaseFolder)) {
-      return;
-    }
-
-    // Symlink any custom plugins
-    var plugins = fs.readdirSync(customBaseFolder);
-    plugins.forEach(file => {
-      var srcFolder = path.join(customBaseFolder, file);
-      var stats = fs.statSync(srcFolder);
-      var destFolder = path.join(baseFolder, file);
-      if (stats.isDirectory()) {
-        if (fs.existsSync(destFolder)) {
-          fs.unlinkSync(destFolder);
-        }
-        fs.symlinkSync(srcFolder, destFolder);
-      }
-    })
-  }
-
-  // Generate index.html from template
-  function doGenerateIndexHtml(customize) {
-
-    console.log('  + Generating index.html');
-    // Copy the default
-    fs.copySync(INDEX_TEMPLATE, INDEX_HTML);
-
-    // Read custom metadata if we are customizing and the file is present 
-    var metadata = {};
-    if (customize && fs.existsSync(CUSTOM_METADATA)) {
-      try {
-        metadata = yaml.safeLoad(fs.readFileSync(CUSTOM_METADATA, 'utf8'));
-      } catch (e) {
-        console.log('Could not read stratos.yaml file');
-        console.log(e);
-        process.exit(1);
-      }
-    }
-
-    if (metadata.title) {
-      console.log('  + Overridding title to: "' + metadata.title + '"');
-    }
-
-    // Patch different page title if there is one
-    var title = metadata.title || 'Stratos';
-    replace.sync({ files: INDEX_HTML, from: /@@TITLE@@/g, to: title });
-
-    // Read in the stored Git metadata if it is there, default to empty metadata
-    var gitMetadata = {
-      project: process.env.project || process.env.STRATOS_PROJECT || '',
-      branch: process.env.branch || process.env.STRATOS_BRANCH || '',
-      commit: process.env.commit || process.env.STRATOS_COMMIT || ''
-    };
-
-    if (fs.existsSync(GIT_METADATA)) {
-      gitMetadata = JSON.parse(fs.readFileSync(GIT_METADATA));
-      console.log('  + Project Metadata file read OK');
-    } else {
-      console.log('  + Project Metadata file does not exist');
-    }
-
-    console.log("  + Project Metadata: " + JSON.stringify(gitMetadata));
-
-    // Git Information
-    replace.sync({ files: INDEX_HTML, from: '@@stratos_git_project@@', to: gitMetadata.project });
-    replace.sync({ files: INDEX_HTML, from: '@@stratos_git_branch@@', to: gitMetadata.branch });
-    replace.sync({ files: INDEX_HTML, from: '@@stratos_git_commit@@', to: gitMetadata.commit });
-
-    // Date and Time that the build was made (approximately => it is when this script is run)
-    replace.sync({ files: INDEX_HTML, from: '@@stratos_build_date@@', to: new Date() });
-
-    // Replace loading indicator - HTML
-    let loadingHtmlFile = INDEX_LOADING_HTML_DEFAULT;
-    if (fs.existsSync(INDEX_LOADING_HTML_CUSTOM)) {
-      loadingHtmlFile = INDEX_LOADING_HTML_CUSTOM
-    }
-    const loadingHtml = fs.readFileSync(loadingHtmlFile, 'utf8');
-    replace.sync({ files: INDEX_HTML, from: '<!-- @@LOADING_HTML@@ -->', to: loadingHtml });
-
-    // Replace loading indicator - CSS
-    let loadingCssFile = INDEX_LOADING_CSS_DEFAULT;
-    if (fs.existsSync(INDEX_LOADING_CSS_CUSTOM)) {
-      loadingCssFile = INDEX_LOADING_CSS_CUSTOM
-    }
-    const loadingCss = fs.readFileSync(loadingCssFile, 'utf8');
-    replace.sync({ files: INDEX_HTML, from: '/** @@LOADING_CSS@@ **/', to: loadingCss });
-  }
-
-  // We can only do this if we have a git repository checkout
-  // We'll store this in a file which we will then use - when in environments like Docker, we will run this
-  // in the host environment so that we can pick it up when we're running in the Docker world
-  function storeGitRepositoryMetadata() {
-    // Do we have a git folder?
-    if (!fs.existsSync(GIT_FOLDER)) {
-      console.log('  + Unable to store git repository metadata - .git folder not found');
-      return;
-    }
-    var gitMetadata = {
-      project: execGit('git config --get remote.origin.url'),
-      branch: execGit('git rev-parse --abbrev-ref HEAD'),
-      commit: execGit('git rev-parse HEAD')
-    };
-
-    fs.writeFileSync(GIT_METADATA, JSON.stringify(gitMetadata, null, 2));
-  }
-
-  function execGit(cmd) {
-    try {
-      var response = execSync(cmd + ' 2> /dev/null');
-      return response.toString().trim();
-    } catch (e) {
-      return '';
-    }
-  }
-
-})();
\ No newline at end of file
diff --git a/build/fe-build.js b/build/fe-build.js
index 0542f8942c..75946dd93c 100644
--- a/build/fe-build.js
+++ b/build/fe-build.js
@@ -17,9 +17,6 @@
   var config = require('./gulp.config');
   var paths = config.paths;
 
-  // Import customization tasks
-  require('./customize-build');
-
   // Clean dist dir
   gulp.task('clean', function (next) {
     del(paths.dist + '**/*', {
diff --git a/build/tools/v4-migration/migrate.sh b/build/tools/v4-migration/migrate.sh
new file mode 100755
index 0000000000..0eb8bfd8c0
--- /dev/null
+++ b/build/tools/v4-migration/migrate.sh
@@ -0,0 +1,156 @@
+#!/usr/bin/env bash
+
+# Migrate custom theme and extensions into the new package structure
+
+set -e
+set -o pipefail
+
+# Script folder
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+STRATOS="`cd "${DIR}/../../..";pwd`"
+CUSTOM="${STRATOS}/custom-src"
+TEMPLATES=${DIR}/templates
+
+STRATOS_YML=${STRATOS}/stratos.yaml
+PKGS=${STRATOS}/src/frontend/packages
+
+echo $CUSTOM
+
+function migrateTitle() {
+  if [ -f "${CUSTOM}/stratos.yaml" ]; then
+    DATA=$(cat "${CUSTOM}/stratos.yaml")
+
+    # Make sure we have a Stratos.yaml file
+    touch ${STRATOS_YML}
+
+    TITLE=$(grep -o 'title: .*' ${CUSTOM}/stratos.yaml)
+    sed -i.bak -e '/^title:/d' ${STRATOS_YML}
+    echo -e "${TITLE}" >> ${STRATOS_YML}
+  fi
+}
+
+function migrateTheme() {
+  echo "Looking for custom theme"
+
+  # Custom theme if we have custom-src/frontend/sass/custom.scss
+  CUSTOM_THEME=${CUSTOM}/frontend/sass/custom.scss
+  if [ ! -f ${CUSTOM_THEME} ]; then
+    echo "No custom theme found"
+    return
+  fi
+
+  echo "Custom theme found ... migrating"
+
+  # Create a new package for the theme
+  THEME_DIR=${PKGS}/custom_theme
+
+  rm  -rf ${THEME_DIR}
+  mkdir ${THEME_DIR}
+  mkdir ${THEME_DIR}/sass
+  mkdir -p ${THEME_DIR}/assets/core
+  mkdir -p ${THEME_DIR}/assets/custom
+  mkdir -p ${THEME_DIR}/loader
+
+  cp -R ${CUSTOM}/frontend/sass/* ${THEME_DIR}/sass
+
+  cp ${TEMPLATES}/theme.package.json ${THEME_DIR}/package.json
+  cp ${TEMPLATES}/_index.scss ${THEME_DIR}
+
+  cp ${CUSTOM}/frontend/loading.* ${THEME_DIR}/loader/
+
+  # Update the theme in the top-level stratos.yml
+  sed -i.bak -e 's/theme: .*/theme: \"@custom\/theme\"/g' ${STRATOS_YML}
+
+  # Copy assets
+  cp -R ${CUSTOM}/frontend/assets/* ${THEME_DIR}/assets/core
+  # Favicon
+  cp -R ${CUSTOM}/frontend/favicon.ico ${THEME_DIR}/assets
+
+  # Remove lines from package.json that are not required
+  if [ ! -f "${THEME_DIR}/assets/favicon.ico" ]; then
+    sed -i.bak '/"favicon.ico"$/d' ${THEME_DIR}/package.json
+  fi
+
+  # Loading screen
+  if [ ! -f "${THEME_DIR}/loader/loading.css" ]; then
+    sed -i.bak '/loading.css",$/d' ${THEME_DIR}/package.json
+  fi
+
+  if [ ! -f "${THEME_DIR}/loader/loading.html" ]; then
+    sed -i.bak '/loading.html"$/d' ${THEME_DIR}/package.json
+  fi
+
+  rm -rf ${THEME_DIR}/package.json.bak
+}
+
+function migrateExtensions() {
+  echo "Looking for custom extensions"
+
+  # Custom theme if we have custom-src/frontend/sass/custom.scss
+  CUSTOM_MODULE=${CUSTOM}/frontend/app/custom/custom.module.ts
+  if [ ! -f ${CUSTOM_MODULE} ]; then
+    echo "No custom extensions found"
+    return
+  fi
+
+  echo "Custom extensions found ... migrating"
+
+  # Create a new package for the extension(s)
+  EXT_DIR=${PKGS}/custom_extensions
+
+  rm  -rf ${EXT_DIR}
+  mkdir -p ${EXT_DIR}/src
+  cp ${TEMPLATES}/ext.package.json ${EXT_DIR}/package.json
+  
+  # Copy the source code into the src folder
+  cp -R ${CUSTOM}/frontend/app/custom/ ${EXT_DIR}/src
+  cp ${TEMPLATES}/public-api.ts_ ${EXT_DIR}/src/public-api.ts
+
+  #IMPORT_LINE=$(awk '/imports:/{ print NR; exit }' ${CUSTOM_MODULE}
+
+  sed -i '' "s/imports: \[/imports: \[ StratosComponentsModule,/" ${EXT_DIR}/src/custom.module.ts
+
+  echo "import { StratosComponentsModule } from '@stratosui/shared';" | cat - ${EXT_DIR}/src/custom.module.ts > ${EXT_DIR}/temp.ts
+  mv -f ${EXT_DIR}/temp.ts ${EXT_DIR}/src/custom.module.ts
+
+  if [ -f ${EXT_DIR}/src/custom-routing.module.ts ]; then
+    echo -e "\nexport * from './custom-routing.module';\n" >> ${EXT_DIR}/src/public-api.ts
+
+    sed -i '' "s/_routingModule/routingModule/g" ${EXT_DIR}/package.json
+  fi
+
+  # Need to update the import references as things will have moved
+  pushd ${EXT_DIR}/src
+
+  # Not exhaustive, so extensions developers may need to manually fix imports
+  find . -name "*.ts" | xargs sed -i '' "s@'../../core@'../../../core/src/core@g"
+  find . -name "*.ts" | xargs sed -i '' "s@'../core/core.module@'../../core/src/core/core.module@g"
+  find . -name "*.ts" | xargs sed -i '' "s@'../core/customizations.types@'../../core/src/core/customizations.types@g"
+  find . -name "*.ts" | xargs sed -i '' 's@../core/md.module@../../core/src/core/md.module@g'
+  find . -name "*.ts" | xargs sed -i '' "s@'../shared/shared.module@'../../core/src/shared/shared.module@g"
+  find . -name "*.ts" | xargs sed -i '' "s@'../../../../store/src/app-state@'../../../store/src/app-state@g"
+  find . -name "*.ts" | xargs sed -i '' "s@'../../features/login/login-page/login-page.component@'../../../core/src/features/login/login-page/login-page.component@g"
+
+  popd
+}
+
+pushd "${STRATOS}" > /dev/null
+
+# Look for custom-src folder
+
+
+if [ -d "${CUSTOM}" ]; then
+  echo "Found customizations to migrate"
+else
+  echo "No custom src folder exists - nothing to migrate"
+  popd > /dev/null
+  exit 1
+fi
+
+migrateTitle
+migrateTheme
+migrateExtensions
+
+popd > /dev/null
+
+cat $STRATOS_YML
\ No newline at end of file
diff --git a/build/tools/v4-migration/templates/_index.scss b/build/tools/v4-migration/templates/_index.scss
new file mode 100644
index 0000000000..a8d3f300e1
--- /dev/null
+++ b/build/tools/v4-migration/templates/_index.scss
@@ -0,0 +1,9 @@
+@import '~@stratosui/theme/helper';
+
+// Custom Theme
+@import './sass/custom';
+
+@function stratos-theme() {
+  $theme: stratos-theme-helper($stratos-theme);
+  @return $theme
+}
\ No newline at end of file
diff --git a/src/frontend/packages/store/testing/package.json b/build/tools/v4-migration/templates/ext.package.json
similarity index 53%
rename from src/frontend/packages/store/testing/package.json
rename to build/tools/v4-migration/templates/ext.package.json
index 7dd43ac8c1..e22a84b356 100644
--- a/src/frontend/packages/store/testing/package.json
+++ b/build/tools/v4-migration/templates/ext.package.json
@@ -1,8 +1,12 @@
 {
-  "name": "store/testing",
+  "name": "@custom/extensions",
   "version": "0.0.1",
   "peerDependencies": {
     "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
     "@angular/core": "^6.0.0-rc.0 || ^6.0.0"
+  },
+  "stratos": {
+    "module": "CustomModule",
+    "_routingModule": "CustomRoutingModule"
   }
 }
\ No newline at end of file
diff --git a/build/tools/v4-migration/templates/public-api.ts_ b/build/tools/v4-migration/templates/public-api.ts_
new file mode 100644
index 0000000000..b78971cc53
--- /dev/null
+++ b/build/tools/v4-migration/templates/public-api.ts_
@@ -0,0 +1,3 @@
+// Custom Extensions
+
+export * from './custom.module';
\ No newline at end of file
diff --git a/build/tools/v4-migration/templates/theme.package.json b/build/tools/v4-migration/templates/theme.package.json
new file mode 100644
index 0000000000..a588ac2e99
--- /dev/null
+++ b/build/tools/v4-migration/templates/theme.package.json
@@ -0,0 +1,19 @@
+{
+  "name": "@custom/theme",
+  "version": "0.0.1",
+  "stratos": {
+    "assets": {
+      "assets/core": "core/assets",
+      "assets/favicon.ico": "favicon.ico"
+    },
+    "theme":{
+      "loadingCss": "loader/loading.css",
+      "loadingHtml": "loader/loading.html"
+    }
+  },
+  "peerDependencies": {
+  },
+  "scripts": {
+    "build": "rm -rf ../../../../dist/theme && mkdir -p ../../../../dist/theme && cp -R * ../../../../dist/theme"
+  }
+}
diff --git a/deploy/cloud-foundry/build.sh b/deploy/cloud-foundry/build.sh
index 0d3f2eb8d3..3d89979b33 100755
--- a/deploy/cloud-foundry/build.sh
+++ b/deploy/cloud-foundry/build.sh
@@ -39,7 +39,6 @@ else
   # Build front-end
   log "Fetching front-end dependencies" $CYAN
   npm install
-  npm run customize
 
   log "Building front-end" $CYAN
   npm run build-cf
diff --git a/deploy/kubernetes/README.md b/deploy/kubernetes/README.md
index 10358b4ad5..6d8d583560 100644
--- a/deploy/kubernetes/README.md
+++ b/deploy/kubernetes/README.md
@@ -1,401 +1,15 @@
 # Deploying in Kubernetes
 
-The following guide details how to deploy Stratos in Kubernetes.
+Stratos can be deployed to Kubernetes using [Helm](https://github.com/kubernetes/helm).
 
-<!-- TOC -->
-- [Requirements](#requirements)
-  * [Kubernetes](#kubernetes)
-  * [Helm](#helm)
-  * [Storage Class](#storage-class)
-- [Deploying Stratos](#deploying-stratos)
-  * [Deploy using the Helm repository](#deploy-using-the-helm-repository)
-  * [Deploy using an archive of the Helm Chart](#deploy-using-an-archive-of-the-helm-chart)
-  * [Deploying using the GitHub repository](#deploying-using-the-github-repository)
-- [Accessing the Console](#accessing-the-console)
-- [Advanced Topics](#advanced-topics)
-  * [Using a Load Balancer](#using-a-load-balancer)
-  * [Using an Ingress Controller](#ingress)
-  * [Specifying an External IP](#specifying-an-external-ip)
-  * [Upgrading your deployment](#upgrading-your-deployment)
-  * [Specifying UAA configuration](#specifying-uaa-configuration)
-  * [Configuring a local user account](#configuring-a-local-user-account)
-  * [Specifying a custom Storage Class](#specifying-a-custom-storage-class)
-    + [Providing Storage Class override](#providing-storage-class-override)
-    + [Create a default Storage Class](#create-a-default-storage-class)
-  * [Deploying Stratos with your own TLS certificates](#deploying-stratos-with-your-own-tls-certificates)
-  * [Using with a Secure Image Repostiory](#using-with-a-secure-image-repository)
-  * [Installing Nightly Release](#installing-a-nightly-release)
-<!-- /TOC -->
+As part of the Stratos release process, a Helm chart is generated and added to the release artifacts for a given release. In addition, we maintain a Helm Chart repository that can be used to install Stratos from:
 
-## Requirements
-
-### Kubernetes
+`https://cloudfoundry.github.io/stratos`
 
 You will need a suitable Kubernetes environment and a machine from which to run the deployment commands.
 
-You will need to have the `kubectl` CLI installed and available on your path. It should be appropriately configured to be able to communicate with your Kubernetes environment.
-
-### Helm
-
-We use [Helm](https://github.com/kubernetes/helm) for deploying to Kubernetes.
-
-You will need the latest Helm client installed on the machine from which you are deploying and you will need to install the Helm Server (Tiller) into you Kubernetes environment.
-
-- Download the Helm client for your system from https://github.com/kubernetes/helm/releases.
-For convenience the guide assumes that the helm client has been added to your PATH.
-- To install the Helm server (Tiller) in your Kubernetes environment by running the following command:
-```
-helm init
-```
-
-If you already Helm installed, please make sure it is the latest version. To update your Helm server (Tiller) in your Kubernetes environment after you download the latest Helm release, run the following command:
-```
-helm init --upgrade
-```
-### Storage Class
-
-Stratos uses persistent volumes. In order to deploy it in your Kubernetes environment, you must
-have a storage class available.
-
-Without configuration, the Stratos Helm Chart will use the default storage class. If a default storage
-class is not available, installation will fail.
-
-To check if a `default` storage class exists, you can list your configured storage classes with `kubectl get storageclass`. If no storage class has `(default)` after it, then you need to either specify a storage class override or declare a default storage class for your Kubernetes cluster.
-
-For non-production environments, you may want to use the `hostpath` storage class. See the [SCF instructions](https://github.com/SUSE/scf/wiki/How-to-Install-SCF#choosing-a-storage-class) for details on setting this up. Note that you will need to make this storage class the default storage class, e.g.
-
-```
-kubectl patch storageclass <your-class-name> -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}'
-```
-Where `<your-class-name>` would be `hostpath` if you follow the SCF instructions.
-## Deploying Stratos
-
-You can deploy Stratos from one of three different sources:
-
-1. Using our Helm repository
-1. Using an archive file containing a given release of our Helm chart
-1. Using the latest Helm chart directly from out GitHub repository
-
-> **Note**: By default each deployment method deploys Stratos with its default user authentication mechanism - which requires a UAA. If you wish to use Stratos without the requirement for a UAA component, use the deployment commands from the following section below: [Configuring a local user account](#configuring-a-local-user-account). All other steps for each deployment method remain the same, as detailed in the following sections.
-
-### Deploy using the Helm repository
-
-Add the Helm repository to your helm installation
-```
-helm repo add stratos https://cloudfoundry.github.io/stratos
-```
-Check the repository was successfully added by searching for the `console`
-```
-helm search console 
-NAME                    VERSION DESCRIPTION                       
-stratos/console         0.9.0 A Helm chart for deploying Console
-```
-To install Stratos.
-
-```
-helm install stratos/console --namespace=console --name my-console
-```
-> **Note**: The previous assumes that a storage class exists in the kubernetes cluster that has been marked as `default`. If no such storage class exists, a specific storage class needs to be specified, please see the following section *Specifying a custom Storage Class*. 
-
-> You can change the namespace (--namespace) and the release name (--name) to values of your choice.
-
-This will create a Console instance named `my-console` in a namespace called `console` in your Kubernetes cluster.
-
-After the install, you should be able to access the Console in a web browser by following [the instructions](#accessing-the-console) below.
-
-### Deploy using an archive of the Helm Chart
-
-Helm chart archives are available for Stratos releases from our GitHub repository, under releases - see https://github.com/suse/stratos/releases.
-
-Download the appropriate release `console-helm-chart.X.Y.Z.tgz` from the GitHub repository and unpack the archive to a local folder. The Helm Chart will be extracted to a sub-folder named `console`.
-
-Deploy Stratos with:
-
-```
-helm install console --namespace=console --name my-console
-```
-
-### Deploying using the GitHub repository
-
-> Note: Deploying using the GitHub repository uses the latest Stratos images that are built nightly (tagged `latest`). While these contain the very latest updates, they may contain bugs or instabilities.
-
-Clone the Stratos GitHub repository:
-
-```
-git clone https://github.com/suse/stratos.git
-```
-
-Open a terminal and cd to the `deploy/kubernetes` directory:
-
-```
-$ cd deploy/kubernetes
-```
-
-Run helm install:
-
-```
-$ helm install console --namespace console --name my-console
-```
-
-> You can change the namespace (--namespace) and the release name (--name) to values of your choice.
-
-This will create a Console instance named `my-console` in a namespace called `console` in your Kubernetes cluster.
-
-You should now be able to access the Console in a web browser by following the instructions below.
-
-## Accessing the Console
-
-To check the status of the instance use the following command:
-```
-helm status my-console
-```
-
-> Note: Replace `my-console` with the value you used for the `name` parameter, or if you did not provide one, use the `helm list` command to find the release name that was automatically generated for you.
-
-Once the instance is in `DEPLOYED` state, find the IP address and port that the console is running on:
-
-```
-$ helm status my-console | grep ui-ext
-console-ui-ext        10.0.0.162  192.168.77.1      80:30933/TCP,443:30941/TCP  1m  
-```
-
-In this example, the IP address is `192.168.77.1` and the node-port is `30941`, so the console is accessible on:
-
-`https://192.168.77.1:30941`
-
-The values will be different for your environment.
-
-You can now access the UI.
-
-> You may see a certificate warning which you can safely ignore.
-
-To login use the following credentials detailed [here](../../docs/access.md).
-
-> Note: For some environments like Minikube, you are not given an IP Address - it may show as `<nodes>`. In this case, run `kubectl cluster-info` and use the IP address of your node shown in the output of this command.
-
-## Advanced Topics
-### Using a Load Balancer
-If your Kubernetes deployment supports automatic configuration of a load balancer (e.g. Google Container Engine), specify the parameters `console.service.type=LoadBalancer` when installing.
-
-```
-helm install stratos/console --namespace=console --name my-console --set console.service.type=LoadBalancer
-```
-
-### Using an Ingress Controller
-
-If your Kubernetes Cluster supports Ingress, you can expose Stratos through Ingress by supplying the appropriate ingress configuration when installing.
-
-This configuration is described below:
-
-|Parameter|Description|Default|
-|----|---|---|
-|console.service.ingress.enabled|Enables ingress|false|
-|console.service.ingress.annotations|Annotations to be added to the ingress resource.|{}|
-|console.service.ingress.extraLabels|Additional labels to be added to the ingress resource.|{}|
-|console.service.ingress.host|The host name that will be used for the Stratos service.||
-|console.service.ingress.secretName|The existing TLS secret that contains the certificate for ingress.||
-
-You must provide `console.service.ingress.host` when enabling ingress.
-
-By default a certificate will be generated for TLS. You can provide your own certificate by creating a secret and specifying this with `console.service.ingress.secretName`.
-
-> Note: If you do not supply `console.service.ingress.host` but do supply `env.DOMAIN` then the host `console.[env.DOMAIN]` will be used.
-
-### Specifying an External IP
-
-If the kubernetes cluster supports external IPs for services (see [ Service External IPs](https://kubernetes.io/docs/concepts/services-networking/service/#external-ips)), then the following arguments can be provided. In this following example the dashboard will be available at `https://192.168.100.100:5000`.
-
-```
-helm install stratos/console --namespace=console --name my-console --set console.service.externalIPs={192.168.100.100} --set console.service.servicePort=5000
-```
-
-### Upgrading your deployment
-
-To upgrade your instance when using the Helm repository, fetch any updates to the repository:
-
-```
-$ helm repo update
-```
-
-To update an instance, the following assumes your instance is called `my-console`, and overrides have been specified in a file called `overrides.yaml`.
-
-```
-$ helm upgrade -f overrides.yaml my-console stratos/console
-```
-
-After the upgrade, perform a `helm list` to ensure your console is the latest version.
-
-
-
-### Specifying UAA configuration
-
-When deploying with SCF, the `scf-config-values.yaml` (see [SCF Wiki link](https://github.com/SUSE/scf/wiki/How-to-Install-SCF#configuring-the-deployment)) can be supplied when installing Stratos.
-```
-$ helm install stratos/console  -f scf-config-values.yaml
-```
-
-Alternatively, you can supply the following configuration. Edit according to your environment and save to a file called `uaa-config.yaml`.
-```
-uaa:
-  protocol: https://
-  port: 2793
-  host: uaa.cf-dev.io
-  consoleClient:  cf
-  consoleClientSecret: 
-  consoleAdminIdentifier: cloud_controller.admin 
-  skipSSLValidation: false
-```
-
-To install Stratos with the above specified configuration:
-```
-$ helm install stratos/console -f uaa-config.yaml
-```
-
-### Configuring a local user account
-
-This allows for deployment without a UAA. To enable the local user account, supply a password for the local user in the deployment command, as follows. All other steps for each deployment method should be followed as in the preceding sections above.
-
-To deploy using our Helm repository:
-
-```
-helm install stratos/console --namespace=console --name my-console --set console.localAdminPassword=<password>
-```
-
-To deploy using an archive file containing a given release of our Helm chart
-
-```
-helm install console --namespace=console --name my-console --set console.localAdminPassword=<password>
-```
-
-To deploy using the latest Helm chart directly from out GitHub repository
-
-```
-$ helm install console --namespace console --name my-console --set console.localAdminPassword=<password>
-```
-
-For console access via the local user account see: [*Accessing the Console*](#accessing-the-console)
-
-### Specifying a custom Storage Class 
-
-If no default storage class has been defined in the Kubernetes cluster. The Stratos helm chart will fail to deploy successfully. To check if a `default` storage class exists, you can list your configured storage classes with `kubectl`. If no storage class has `(default)` after it, then you need to either specify a storage class override or declare a default storage class for your Kubernetes cluster.
-
-#### Providing Storage Class override
-```
-$ kubectl get storageclass
-NAME                TYPE
-ssd                 kubernetes.io/host-path   
-persistent          kubernetes.io/host-path   
-```
-
-For instance to use the storage class `persistent` to deploy Console persistent volume claims, store the following to a file called `override.yaml`.
-
-```
----
-storageClass: persistent
-```
-
-If you want MariaDB to use a specific storage class (which can be different to that used for the other components), then specify the following:
-```
----
-storageClass: persistent
-mariadb:
-  persistence:
-    storageClass: persistent
-```
-
-Run Helm with the override:
-```
-helm install -f override.yaml stratos/console
-```
-
-#### Create a default Storage Class
-Alternatively, you can configure a storage class with `storageclass.kubernetes.io/is-default-class` set to `true`. For instance the following storage class will be declared as the default. If you don't have the `hostpath` provisioner available in your local cluster, please follow the instructions on [link] (https://github.com/kubernetes-incubator/external-storage/tree/master/docs/demo/hostpath-provisioner), to deploy one.
-
-If the hostpath provisioner is available, save the file to `storageclass.yaml`
-
-```
----
-kind: StorageClass
-apiVersion: storage.k8s.io/v1beta1
-metadata:
-  name: default
-  annotations:
-    storageclass.kubernetes.io/is-default-class: "true"
-provisioner: kubernetes.io/host-path # Or whatever the local hostpath provisioner is called
-```
-
-To create it in your kubernetes cluster, execute the following.
-```
-kubectl create -f storageclass.yaml
-```
-
-See [Storage Class documentation] ( https://kubernetes.io/docs/tasks/administer-cluster/change-default-storage-class/) for more insformation.
-
-### Deploying Stratos with your own TLS certificates
-
-By default the console will generate self-signed certificates for demo purposes. To configure Stratos UI to use your provided TLS certificates set the `consoleCert` and `consoleCertKey` overrides.
-
-```
-consoleCert: |
-    -----BEGIN CERTIFICATE-----
-    MIIDXTCCAkWgAwIBAgIJAJooOiQWl1v1MA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
-    ...
-    -----END CERTIFICATE-----
-consoleCertKey: |
-    -----BEGIN PRIVATE KEY-----
-    MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDV9+ySh0xZzM41
-    ....
-    -----END PRIVATE KEY-----
-``` 
-Assuming the above is stored in a file called `override-ssl.yaml`, install the chart with the override specified.
-```
-helm install -f override-ssl.yaml stratos/console --namespace console
-```
-
-### Using with a Secure Image Repository
-If you are deploying the helm chart against images that are hosted in a secure image repository provide the following parameters ( store the following to a file called `docker-registry-secrets.yaml`).
-
-
-```
-kube:
-  registry:
-    hostname: mysecure-dockerregistry.io
-    username: john.appleseed
-    password: sup3rs3cur3
-    # `email` is an optional field
-    email: john.appleseed@foobar.com
-```
-
-Deploy the chart with the provided parameters:
-```
-helm install -f docker-registry-secrets.yaml stratos/console
-```
-
-### Installing a Nightly Release
-Nightly releases are pushed with a `dev` tag. These are strictly for development purposes and should be considered unstable and may contain bugs.
-
-To install the nightly release: 
-
-Update your Helm repositories to ensure you have the latest nightly release information:
-
-```
-helm repo update
-```
-
-List all versions of the console, to determine the tag.
-```
-helm search console -l
-NAME                 CHART VERSION           DESCRIPTION                       
-stratos/console      2.0.0-dev-9a5611dc      A Helm chart for deploying Stratos UI Consoles
-stratos/console      1.0.2                   A Helm chart for deploying Stratos UI Console
-stratos/console      1.0.0                   A Helm chart for deploying Stratos UI Console
-stratos/console      0.9.9                   A Helm chart for deploying Stratos UI Console
-stratos/console      0.9.8                   A Helm chart for deploying Stratos UI Console
-
-```
-Install
+You will need to have both the `kubectl` and `helm` CLIs installed and available on your path. It should be appropriately configured to be able to communicate with your Kubernetes environment.
 
-```
-helm install stratos/console --namespace=console --name my-console --version 2.0.0-dev-9a5611dc
-```
+The Stratos Helm chart contains a `README.md` file that contains installation instructions and configuration documentation.
 
+This document is also available in our GitHub repository here: [README.md](https://github.com/cloudfoundry/stratos/blob/master/deploy/kubernetes/console/README.md).
diff --git a/deploy/stratos-ui-release/packages/backend/pre_packaging b/deploy/stratos-ui-release/packages/backend/pre_packaging
index 99faea2123..ba252553a7 100644
--- a/deploy/stratos-ui-release/packages/backend/pre_packaging
+++ b/deploy/stratos-ui-release/packages/backend/pre_packaging
@@ -10,7 +10,6 @@ curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
 
 # Build backend
 npm install
-npm run customize
 export PATH=$PATH:$PWD/node_modules/.bin
 npm run bosh-build-backend
 
diff --git a/deploy/stratos-ui-release/packages/frontend/pre_packaging b/deploy/stratos-ui-release/packages/frontend/pre_packaging
index c2c28d2215..440e323fa2 100644
--- a/deploy/stratos-ui-release/packages/frontend/pre_packaging
+++ b/deploy/stratos-ui-release/packages/frontend/pre_packaging
@@ -4,7 +4,6 @@ set -e -x
 cd ${BUILD_DIR}/stratos
 
 npm install
-npm run customize
 export PATH=$PATH:$PWD/node_modules/.bin
 npm run build
 
diff --git a/docs/customizing.md b/docs/customizing.md
index 496b7fddb6..e81f9ebabd 100644
--- a/docs/customizing.md
+++ b/docs/customizing.md
@@ -8,11 +8,44 @@ Stratos provides a mechanism for customization - the following customizations ar
 - Adding new functionality
 - Changing the initial loading indicator
 
+# Migrating to Stratos V4 Customization
+In V4 there are breaking customization changes. These changes allow a much improved approach to extensions by opening the door to npm style plugins.
+To aid in migrating we've provided these instructions.
+
+1) Before updating to the latest code...
+    1) Run `npm run customize-reset` to remove all previously created sym links.
+    2) Read through the customization documentation below to get a better understanding of the new process.
+1) Update your codebase with the desired v4 code.
+1) Run `npm install` (only required first time, this will ensure you have the required version of Angular).
+1) Change directory to `./build/tools/v4-migration` and run the migration script `./migrate.sh`.
+    - This will copy your customizations from `custom-src` to a new Angular package `src/frontend/packages/custom_extensions`.
+1) Check that the new package exports your custom module and if applicable your custom-routing module.
+    - The migrate script should do this in `src/frontend/packages/custom_extensions/src/public-api.ts`.
+1) Check that your ts config file defines the public api file.
+    - `src/tsconfig.json` file's `compilerOptions/paths` section should contain something like `"@custom/extensions": ["frontend/packages/custom_extensions/src/public-api.ts"]`.
+1) Check that your new package's package.json defines your custom module and if application custom-routing module.
+    - See `src/frontend/packages/suse_extensions/package.json` file's `stratos` section.
+    - Note your `routingModule` entry label should not have a preceding `_`.
+1) Build Stratos in your usual way, for instance `npm run build`.
+    - It could be that this fails due to TypeScript import issues, if so go through these and fix.
+    - During build time the custom packages will be discovered and output, see section starting `Building with these extensions`. These should contain the modules your require.
+1) Run Stratos your usual way. Ensure you can navigate to all your custom parts.
+1) Once you are happy everything works as intended remove the old `./custom-src` directory and commit you changes.
+
 ## Approach
 
 In order to customize Stratos, you will need to fork the Stratos GitHub repository and apply customizations in your fork. Our aim is to minimize any merge conflicts that might occur when re-basing your fork with the upstream Stratos repository.
 
-All customizations are placed within a top-level folder named `custom-src`. This folder should only exist in forks and will not exist in the main Stratos repository, so any changes made within this folder should be free from merge conflicts.
+<!-- All customizations are placed within a top-level folder named `custom-src`. This folder should only exist in forks and will not exist in the main Stratos repository, so any changes made within this folder should be free from merge conflicts. -->
+Customizations are placed in angular packages in the folder named `src/frontend/packages`. In the future you will be able to host these packages in npm and bring them into Stratos in the usual npm dependency way.
+
+Each package should contain custom Stratos configuration in it's package.json pointing to the modules it will be required to import. 
+
+stratos.yaml
+custom theme
+custom styles
+custom assets
+
 
 The Stratos approach to customization uses symbolic links. We maintain a default set of resources in the folder `src/misc/custom`. When you run `npm install` or when you explicitly run `npm run customize`, a gulp task (in the file `build/fe-build.js`) runs and creates symbolic links, linking the required files to their expected locations withing the `src` folder.
 
diff --git a/package-lock.json b/package-lock.json
index 200d6f47de..eec8e18f4e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,20 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@angular-builders/custom-webpack": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-9.2.0.tgz",
+      "integrity": "sha512-0ivkjENONFm0oNy6hdCod4YaT4dUk80KuP9+eDliWuZIA70yKQgIYMLul0bz6/i+Cm24PaZ2tq4w7kW7AuSMoA==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/architect": ">=0.900.0 < 0.1000.0",
+        "@angular-devkit/build-angular": ">=0.900.0 < 0.1000.0",
+        "@angular-devkit/core": "^9.0.0",
+        "lodash": "^4.17.10",
+        "ts-node": "^8.5.2",
+        "webpack-merge": "^4.2.1"
+      }
+    },
     "@angular-devkit/architect": {
       "version": "0.901.7",
       "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.7.tgz",
@@ -618,6 +632,17 @@
       "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.9.tgz",
       "integrity": "sha512-4u+CWMPB4hCkAsFCEzC94YEWT0wVozqGkc/Dortt2hFaqvZpIegg6iJVZlDxuyDjzFYBPnnbTDdgiTTA8ckfuA=="
     },
+    "@apidevtools/json-schema-ref-parser": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.1.tgz",
+      "integrity": "sha512-Qsdz0W0dyK84BuBh5KZATWXOtVDXIF2EeNRzpyWblPUeAmnIokwWcwrpAm5pTPMjuWoIQt9C67X3Af1OlL6oSw==",
+      "dev": true,
+      "requires": {
+        "@jsdevtools/ono": "^7.1.2",
+        "call-me-maybe": "^1.0.1",
+        "js-yaml": "^3.13.1"
+      }
+    },
     "@babel/code-frame": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
@@ -2912,6 +2937,12 @@
         }
       }
     },
+    "@jsdevtools/ono": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.2.tgz",
+      "integrity": "sha512-qS/a24RA5FEoiJS9wiv6Pwg2c/kiUo3IVUQcfeM9JvsR6pM8Yx+yl/6xWYLckZCT5jpLNhslgjiA8p/XcGyMRQ==",
+      "dev": true
+    },
     "@ngrx/effects": {
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-9.2.0.tgz",
@@ -3944,6 +3975,12 @@
       "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
       "dev": true
     },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
+    },
     "anymatch": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
@@ -5250,6 +5287,12 @@
         }
       }
     },
+    "call-me-maybe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
+      "dev": true
+    },
     "caller-callsite": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
@@ -5465,6 +5508,20 @@
       "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==",
       "dev": true
     },
+    "cli-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.0.tgz",
+      "integrity": "sha512-a0VZ8LeraW0jTuCkuAGMNufareGHhyZU9z8OGsW0gXd1hZGi1SRuNRXdbGkraBBKnhyUhyebFWnRbp+dIn0f0A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.1.1",
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.51",
+        "es6-iterator": "^2.0.3",
+        "memoizee": "^0.4.14",
+        "timers-ext": "^0.1.7"
+      }
+    },
     "cli-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
@@ -7113,7 +7170,7 @@
     },
     "duplexer": {
       "version": "0.1.1",
-      "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
       "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
       "dev": true
     },
@@ -7816,7 +7873,7 @@
     },
     "event-stream": {
       "version": "3.3.4",
-      "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
       "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
       "dev": true,
       "requires": {
@@ -8760,7 +8817,6 @@
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
       "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-      "dev": true,
       "optional": true
     },
     "function-bind": {
@@ -10388,6 +10444,12 @@
         "isobject": "^3.0.1"
       }
     },
+    "is-promise": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
+      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
+      "dev": true
+    },
     "is-property": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
@@ -11022,6 +11084,43 @@
       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
       "dev": true
     },
+    "json-schema-ref-parser": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-9.0.1.tgz",
+      "integrity": "sha512-KLrCjRjW5hMXxsX4osVBWpwixXL9NtICfpyNNS0eHguN5mP/I4UatI7i7PFS8jU94b1NHF4EbirACdCn0RFPBA==",
+      "dev": true,
+      "requires": {
+        "@apidevtools/json-schema-ref-parser": "9.0.1"
+      }
+    },
+    "json-schema-to-typescript": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-9.1.0.tgz",
+      "integrity": "sha512-9/yDXQQyqtRDxohQGRCKht4Wjfg73TALi1yzy651EOo71a6aKFtIm2WUbDWSf8OitFGukUn00dx4t1kg0W6O4Q==",
+      "dev": true,
+      "requires": {
+        "@types/json-schema": "^7.0.4",
+        "cli-color": "^2.0.0",
+        "glob": "^7.1.6",
+        "is-glob": "^4.0.1",
+        "json-schema-ref-parser": "^9.0.1",
+        "json-stringify-safe": "^5.0.1",
+        "lodash": "^4.17.15",
+        "minimist": "^1.2.5",
+        "mkdirp": "^1.0.4",
+        "mz": "^2.7.0",
+        "prettier": "^2.0.5",
+        "stdin": "0.0.1"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        }
+      }
+    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -11248,13 +11347,6 @@
             "path-exists": "^4.0.0"
           }
         },
-        "fsevents": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
-          "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
-          "dev": true,
-          "optional": true
-        },
         "get-caller-file": {
           "version": "2.0.5",
           "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -12017,6 +12109,15 @@
         }
       }
     },
+    "lru-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
+      "dev": true,
+      "requires": {
+        "es5-ext": "~0.10.2"
+      }
+    },
     "magic-string": {
       "version": "0.25.7",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
@@ -12140,7 +12241,7 @@
     },
     "map-stream": {
       "version": "0.1.0",
-      "resolved": "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
       "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
       "dev": true
     },
@@ -12219,12 +12320,6 @@
           "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
           "dev": true
         },
-        "fsevents": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-          "optional": true
-        },
         "glob-parent": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
@@ -12331,6 +12426,22 @@
         }
       }
     },
+    "memoizee": {
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
+      "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.45",
+        "es6-weak-map": "^2.0.2",
+        "event-emitter": "^0.3.5",
+        "is-promise": "^2.1",
+        "lru-queue": "0.1",
+        "next-tick": "1",
+        "timers-ext": "^0.1.5"
+      }
+    },
     "memory-fs": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
@@ -12854,6 +12965,17 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
+    "mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dev": true,
+      "requires": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -14933,7 +15055,7 @@
     },
     "pause-stream": {
       "version": "0.0.11",
-      "resolved": "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
       "dev": true,
       "requires": {
@@ -15802,6 +15924,12 @@
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
     },
+    "prettier": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
+      "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
+      "dev": true
+    },
     "pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
@@ -18516,7 +18644,7 @@
     },
     "split": {
       "version": "0.3.3",
-      "resolved": "http://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
       "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
       "dev": true,
       "requires": {
@@ -18628,6 +18756,12 @@
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
       "dev": true
     },
+    "stdin": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/stdin/-/stdin-0.0.1.tgz",
+      "integrity": "sha1-0wQZgarsPf28d6GzjWNy449ftx4=",
+      "dev": true
+    },
     "stealthy-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
@@ -18693,7 +18827,7 @@
     },
     "stream-combiner": {
       "version": "0.0.4",
-      "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
       "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
       "dev": true,
       "requires": {
@@ -19604,6 +19738,24 @@
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
+    "thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dev": true,
+      "requires": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "dev": true,
+      "requires": {
+        "thenify": ">= 3.1.0 < 4"
+      }
+    },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -19651,6 +19803,16 @@
         "setimmediate": "^1.0.4"
       }
     },
+    "timers-ext": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
+      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
+      "dev": true,
+      "requires": {
+        "es5-ext": "~0.10.46",
+        "next-tick": "1"
+      }
+    },
     "timsort": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
@@ -20657,13 +20819,6 @@
             "to-regex-range": "^5.0.1"
           }
         },
-        "fsevents": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-          "dev": true,
-          "optional": true
-        },
         "glob-parent": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
@@ -20793,13 +20948,6 @@
                 "to-regex": "^3.0.1"
               }
             },
-            "fsevents": {
-              "version": "1.2.13",
-              "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-              "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-              "dev": true,
-              "optional": true
-            },
             "readdirp": {
               "version": "2.2.1",
               "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
@@ -20844,6 +20992,13 @@
             "to-regex-range": "^2.1.0"
           }
         },
+        "fsevents": {
+          "version": "1.2.13",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+          "dev": true,
+          "optional": true
+        },
         "is-binary-path": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
diff --git a/package.json b/package.json
index 8e5d3381a3..17dd16aca8 100644
--- a/package.json
+++ b/package.json
@@ -14,12 +14,12 @@
     "build": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod",
     "build-cf": "node --max_old_space_size=1500 --gc_interval=100 node_modules/@angular/cli/bin/ng build --prod",
     "build-dev": "ng build --dev",
-    "prebuild-ui": "npm run customize && npm run build && gulp package-prebuild",
+    "prebuild-ui": "npm run build && gulp package-prebuild",
     "ng": "ng",
-    "start": "npm run customize && ng serve",
-    "start-high-mem": "npm run customize && node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve",
-    "start-dev-high-mem": "npm run customize && node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve --aot=false",
-    "start-prod-high-mem": "npm run customize && node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve --prod",
+    "start": "ng serve",
+    "start-high-mem": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve",
+    "start-dev-high-mem": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve --aot=false",
+    "start-prod-high-mem": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve --prod",
     "start-dev": "ng serve --aot=false",
     "test-clean": "./build/clean-test-reports.sh",
     "test-reports": "./build/show-test-reports.sh",
@@ -38,11 +38,9 @@
     "headless-e2e": "xvfb-run --server-args='-screen 0 1920x1080x24' protractor ./protractor.conf.js",
     "climate": "codeclimate analyze $(git diff --name-only master)",
     "gate-check": "npm run lint && npm run test-headless",
-    "customize": "gulp customize",
-    "customize-default": "gulp customize-default",
-    "customize-reset": "gulp customize-reset",
     "store-git-metadata": "gulp store-git-metadata",
-    "postinstall": "npm run customize && gulp dev-setup"
+    "postinstall": "gulp dev-setup && npm run build-devkit",
+    "build-devkit": "cd src/frontend/packages/devkit && npm run build"
   },
   "author": "",
   "license": "Apache-2.0",
@@ -96,12 +94,16 @@
     "node": "12.13.0"
   },
   "devDependencies": {
+    "@angular-builders/custom-webpack": "^9.1.0",
+    "@angular-devkit/architect": "^0.901.7",
     "@angular-devkit/build-angular": "~0.901.5",
     "@angular-devkit/build-ng-packagr": "~0.901.5",
+    "@angular-devkit/core": "^9.1.7",
     "@angular-devkit/schematics": "^9.1.5",
     "@angular/cli": "^9.1.5",
     "@angular/compiler-cli": "^9.1.6",
     "@angular/language-service": "^9.1.6",
+    "@schematics/angular": "^9.1.5",
     "@types/jasmine": "^3.5.10",
     "@types/jasminewd2": "~2.0.8",
     "@types/karma": "^5.0.0",
@@ -111,6 +113,7 @@
     "browserstack-local": "^1.4.5",
     "codecov": "^3.6.5",
     "codelyzer": "^5.1.2",
+    "copy-webpack-plugin": "5.1.1",
     "delete": "^1.1.0",
     "fs-extra": "^9.0.0",
     "globby": "^11.0.0",
@@ -122,6 +125,7 @@
     "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.1",
     "js-yaml": "~3.13.1",
+    "json-schema-to-typescript": "^9.1.0",
     "karma": "~5.0.1",
     "karma-chrome-launcher": "~3.1.0",
     "karma-cli": "~2.0.0",
diff --git a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts
index e7463eee23..e470be161e 100644
--- a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts
+++ b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts
@@ -52,7 +52,6 @@ const customRoutes: Routes = [
   ],
   declarations: [
     AutoscalerTabExtensionComponent
-  ],
-  entryComponents: [AutoscalerTabExtensionComponent]
+  ]
 })
 export class CfAutoscalerModule { }
diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
index 2faabe86af..cb76b829f2 100644
--- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
+++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
@@ -83,13 +83,6 @@ import { AutoscalerRoutingModule } from './autoscaler.routing';
   ],
   providers: [
     ApplicationService
-  ],
-  entryComponents: [
-    AppAutoscalerMetricChartCardComponent,
-    AppAutoscalerComboChartComponent,
-    AppAutoscalerComboSeriesVerticalComponent,
-    TableCellAutoscalerEventChangeComponent,
-    TableCellAutoscalerEventStatusComponent
   ]
 })
 export class AutoscalerModule { }
diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.spec.ts
index eff100853b..b96d66bdb5 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.spec.ts
@@ -15,6 +15,9 @@ import {
 import {
   RunningInstancesComponent,
 } from '../../../../cloud-foundry/src/shared/components/running-instances/running-instances.component';
+import {
+  cfCurrentUserPermissionsService,
+} from '../../../../cloud-foundry/src/user-permissions/cf-user-permissions-checkers';
 import { ApplicationServiceMock } from '../../../../cloud-foundry/test-framework/application-service-helper';
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
@@ -48,7 +51,8 @@ describe('AutoscalerTabExtensionComponent', () => {
       providers: [
         DatePipe,
         { provide: ApplicationService, useClass: ApplicationServiceMock },
-        TabNavService
+        TabNavService,
+        ...cfCurrentUserPermissionsService
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
index dfee79bace..9b3b56c9b2 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
@@ -2,15 +2,25 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { combineLatest, Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, first, map, pairwise, publishReplay, refCount } from 'rxjs/operators';
+import { combineLatest, Observable, of, Subscription } from 'rxjs';
+import { distinctUntilChanged, filter, first, map, pairwise, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
-import { applicationEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
-import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
+import { cfEntityCatalog } from '../../../../cloud-foundry/src/cf-entity-catalog';
+import {
+  applicationEntityType,
+  organizationEntityType,
+  spaceEntityType,
+} from '../../../../cloud-foundry/src/cf-entity-types';
+import {
+  createEntityRelationKey,
+  createEntityRelationPaginationKey,
+} from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { ApplicationMonitorService } from '../../../../cloud-foundry/src/features/applications/application-monitor.service';
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
 import { getGuids } from '../../../../cloud-foundry/src/features/applications/application/application-base.component';
+import { CfCurrentUserPermissions } from '../../../../cloud-foundry/src/user-permissions/cf-user-permissions-checkers';
 import { StratosTab, StratosTabType } from '../../../../core/src/core/extension/extension-service';
+import { CurrentUserPermissionsService } from '../../../../core/src/core/permissions/current-user-permissions.service';
 import { safeUnsubscribe } from '../../../../core/src/core/utils.service';
 import { ConfirmationDialogConfig } from '../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../core/src/shared/components/confirmation-dialog.service';
@@ -52,9 +62,32 @@ import { appAutoscalerAppMetricEntityType, autoscalerEntityFactory } from '../..
   link: 'autoscale',
   icon: 'meter',
   iconFont: 'stratos-icons',
-  hidden: (store: Store<AppState>, esf: EntityServiceFactory, activatedRoute: ActivatedRoute) => {
+  hidden: (store: Store<AppState>, esf: EntityServiceFactory, activatedRoute: ActivatedRoute, cups: CurrentUserPermissionsService) => {
     const endpointGuid = getGuids('cf')(activatedRoute) || window.location.pathname.split('/')[2];
-    return isAutoscalerEnabled(endpointGuid, esf).pipe(map(enabled => !enabled));
+    const appGuid = getGuids()(activatedRoute) || window.location.pathname.split('/')[3];
+    const appEntService = cfEntityCatalog.application.store.getEntityService(appGuid, endpointGuid, {
+      includeRelations: [
+        createEntityRelationKey(applicationEntityType, spaceEntityType),
+        createEntityRelationKey(spaceEntityType, organizationEntityType),
+      ],
+      populateMissing: true
+    })
+
+    const canEditApp$ = appEntService.waitForEntity$.pipe(
+      switchMap(app => cups.can(
+        CfCurrentUserPermissions.APPLICATION_EDIT,
+        endpointGuid,
+        app.entity.entity.space.entity.organization_guid,
+        app.entity.entity.space.metadata.guid
+      )),
+    )
+
+    const autoscalerEnabled = isAutoscalerEnabled(endpointGuid, esf);
+
+    return canEditApp$.pipe(
+      switchMap(canEditSpace => canEditSpace ? autoscalerEnabled : of(false)),
+      map(can => !can)
+    )
   }
 })
 @Component({
@@ -130,7 +163,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
     private paginationMonitorFactory: PaginationMonitorFactory,
     private appAutoscalerPolicySnackBar: MatSnackBar,
     private appAutoscalerScalingHistorySnackBar: MatSnackBar,
-    private confirmDialog: ConfirmationDialogService,
+    private confirmDialog: ConfirmationDialogService
   ) { }
 
   ngOnInit() {
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts
index 56fe3b5865..fcfbc0bf81 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts
@@ -5,9 +5,6 @@ import { inject, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createEmptyStoreModule } from '@stratosui/store/testing';
 
-import { GetApplication } from '../../../../../cloud-foundry/src/actions/application.actions';
-import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
-import { applicationEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
 import { ApplicationsModule } from '../../../../../cloud-foundry/src/features/applications/applications.module';
 import {
   generateTestApplicationServiceProvider,
@@ -15,7 +12,6 @@ import {
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { AppTestModule } from '../../../../../core/test-framework/core-test.helper';
-import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper';
 import { EntityCatalogHelper } from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service';
 import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
@@ -35,11 +31,6 @@ describe('CfAppAutoscalerEventsConfigService', () => {
         EntityServiceFactory,
         EntityMonitorFactory,
         EntityCatalogHelper,
-        generateTestEntityServiceProvider(
-          appGuid,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appGuid, cfGuid)
-        ),
         generateTestApplicationServiceProvider(appGuid, cfGuid),
         HttpClient,
       ],
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts
index 98d5b15a48..8732d20bfb 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts
@@ -8,8 +8,9 @@ import { ApplicationService } from '../../../../../cloud-foundry/src/features/ap
 import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
 import { IListConfig, ListConfig, ListViewTypes } from '../../../../../core/src/shared/components/list/list.component.types';
 import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service';
-import { ITimeRange, MetricQueryType } from '../../../../../core/src/shared/services/metrics-range-selector.types';
+import { ITimeRange } from '../../../../../core/src/shared/services/metrics-range-selector.types';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { MetricQueryType } from '../../../../../store/src/types/metric.types';
 import { AppAutoscalerEvent } from '../../../store/app-autoscaler.types';
 import { CfAppAutoscalerEventsDataSource } from './cf-app-autoscaler-events-data-source';
 import {
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts
index 05e19cc82a..a5c3fd8aef 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts
@@ -10,9 +10,10 @@ import {
 import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
 import { ListViewTypes } from '../../../../../core/src/shared/components/list/list.component.types';
 import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service';
-import { ITimeRange, MetricQueryType } from '../../../../../core/src/shared/services/metrics-range-selector.types';
+import { ITimeRange } from '../../../../../core/src/shared/services/metrics-range-selector.types';
 import { ListView } from '../../../../../store/src/actions/list.actions';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { MetricQueryType } from '../../../../../store/src/types/metric.types';
 import { AutoscalerConstants } from '../../../core/autoscaler-helpers/autoscaler-util';
 import { AppScalingTrigger } from '../../../store/app-autoscaler.types';
 import {
diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-factory.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-factory.ts
index ecdddc9b8c..13c1ff8089 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-factory.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-factory.ts
@@ -1,8 +1,8 @@
 import { Schema, schema } from 'normalizr';
 
 import { getAPIResourceGuid } from '../../../cloud-foundry/src/store/selectors/api.selectors';
-import { metricEntityType } from '../../../core/src/base-entity-schemas';
 import { EntitySchema } from '../../../store/src/helpers/entity-schema';
+import { metricEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 
 export const appAutoscalerInfoEntityType = 'autoscalerInfo';
 export const appAutoscalerHealthEntityType = 'autoscalerHealth';
@@ -10,7 +10,7 @@ export const appAutoscalerPolicyEntityType = 'autoscalerPolicy';
 export const appAutoscalerPolicyTriggerEntityType = 'autoscalerPolicyTrigger';
 export const appAutoscalerScalingHistoryEntityType = 'autoscalerScalingHistory';
 export const appAutoscalerAppMetricEntityType = 'autoscalerAppMetric';
-export const appAutoscalerCredentialEntityType = 'autoscalerCredential'
+export const appAutoscalerCredentialEntityType = 'autoscalerCredential';
 
 export const AUTOSCALER_ENDPOINT_TYPE = 'autoscaler';
 
diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
index 9e946fca20..4e71099074 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
@@ -1,10 +1,10 @@
 import { IOrgFavMetadata } from '../../../cloud-foundry/src/cf-metadata-types';
-import { metricEntityType } from '../../../core/src/base-entity-schemas';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEntity,
 } from '../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { IStratosEndpointDefinition } from '../../../store/src/entity-catalog/entity-catalog.types';
+import { metricEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 import { APIResource } from '../../../store/src/types/api.types';
 import { IFavoriteMetadata } from '../../../store/src/types/user-favorites.types';
 import { AppAutoscalerEvent, AppAutoscalerHealth, AppAutoscalerPolicy, AppScalingTrigger } from './app-autoscaler.types';
diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts
index e85527a5cd..98c2e1e7c1 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts
@@ -7,9 +7,9 @@ import { catchError, mergeMap, withLatestFrom } from 'rxjs/operators';
 
 import { PaginationResponse } from '../../../cloud-foundry/src/store/types/cf-api.types';
 import { environment } from '../../../core/src/environments/environment';
-import { isHttpErrorResponse } from '../../../core/src/jetstream.helpers';
 import { AppState } from '../../../store/src/app-state';
 import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
+import { isHttpErrorResponse } from '../../../store/src/jetstream';
 import { ApiRequestTypes } from '../../../store/src/reducers/api-request-reducer/request-helpers';
 import {
   resultPerPageParam,
diff --git a/src/frontend/packages/cloud-foundry/package.json b/src/frontend/packages/cloud-foundry/package.json
index 989436cb0d..844bc32e3a 100644
--- a/src/frontend/packages/cloud-foundry/package.json
+++ b/src/frontend/packages/cloud-foundry/package.json
@@ -4,5 +4,9 @@
   "peerDependencies": {
     "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
     "@angular/core": "^6.0.0-rc.0 || ^6.0.0"
+  },
+  "stratos": {
+    "theming": "sass/_all-theme#apply-theme-stratos-cloud-foundry"
   }
+
 }
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/sass/_all-theme.scss b/src/frontend/packages/cloud-foundry/sass/_all-theme.scss
new file mode 100644
index 0000000000..fd92ae1354
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/sass/_all-theme.scss
@@ -0,0 +1,12 @@
+// Theming for the copmponents in the Cloud Foundry package
+
+@import '../src/features/applications/application-wall/application-wall.component.theme';
+@import '../src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.theme';
+
+@mixin apply-theme-stratos-cloud-foundry($stratos-theme) {
+
+  $theme: map-get($stratos-theme, theme);
+  $app-theme: map-get($stratos-theme, app-theme);
+
+  @include cf-security-group-theme($theme);
+}
diff --git a/src/frontend/packages/cloud-foundry/src/actions/cf-event.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/cf-event.actions.ts
index ad2daf059f..c6bb0e3aff 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/cf-event.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/cf-event.actions.ts
@@ -1,6 +1,6 @@
 import { HttpParams, HttpRequest } from '@angular/common/http';
 
-import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { cfEventEntityType } from '../cf-entity-types';
@@ -18,7 +18,7 @@ export class GetAllCfEvents extends CFStartAction implements PaginatedAction {
 
   constructor(public paginationKey: string, public endpointGuid) {
     super();
-    this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(endpointSchemaKey, endpointGuid);
+    this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(endpointEntityType, endpointGuid);
     this.options = new HttpRequest(
       'GET',
       'events',
diff --git a/src/frontend/packages/cloud-foundry/src/actions/cf-metrics.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/cf-metrics.actions.ts
index 4422c703f6..e57065e7f0 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/cf-metrics.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/cf-metrics.actions.ts
@@ -1,5 +1,5 @@
-import { MetricQueryType } from '../../../core/src/shared/services/metrics-range-selector.types';
 import { MetricQueryConfig, MetricsAction, MetricsChartAction } from '../../../store/src/actions/metrics.actions';
+import { MetricQueryType } from '../../../store/src/types/metric.types';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { CF_ENDPOINT_TYPE } from '../cf-types';
 
diff --git a/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts
index 13d4f6d59b..d593428b5f 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts
@@ -1,6 +1,6 @@
 import { HttpRequest } from '@angular/common/http';
 
-import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
@@ -36,7 +36,7 @@ export class FetchAllDomains extends CFStartAction implements PaginatedAction {
       'GET',
       'domains',
     );
-    this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(endpointSchemaKey, endpointGuid);
+    this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(endpointEntityType, endpointGuid);
   }
   actions = [GET_ALL_DOMAIN, GET_ALL_DOMAIN_SUCCESS, GET_ALL_DOMAIN_FAILED];
   entity = [cfEntityFactory(domainEntityType)];
diff --git a/src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts
index 6ec461e70b..5c1967a0c1 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts
@@ -1,7 +1,7 @@
 import { HttpRequest } from '@angular/common/http';
 
 import { getActions } from '../../../store/src/actions/action.helper';
-import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { RequestEntityLocation } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
@@ -12,7 +12,7 @@ import { CFStartAction } from './cf-action.types';
 export class GetAllFeatureFlags extends CFStartAction implements PaginatedAction {
   constructor(public endpointGuid: string, public paginationKey: string = null) {
     super();
-    this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(endpointSchemaKey, this.endpointGuid);
+    this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(endpointEntityType, this.endpointGuid);
     this.options = new HttpRequest(
       'GET',
       `config/feature_flags`
diff --git a/src/frontend/packages/cloud-foundry/src/actions/stack.action.ts b/src/frontend/packages/cloud-foundry/src/actions/stack.action.ts
index b4a274ee38..ac77391430 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/stack.action.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/stack.action.ts
@@ -2,7 +2,7 @@ import { HttpRequest } from '@angular/common/http';
 
 import { getActions } from '../../../store/src/actions/action.helper';
 import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
-import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
 import { stackEntityType } from '../cf-entity-types';
@@ -38,7 +38,7 @@ export class GetAllStacks extends CFStartAction implements PaginatedAction {
       'GET',
       'stacks'
     );
-    this.paginationKey = createEntityRelationKey(endpointSchemaKey, endpointGuid);
+    this.paginationKey = createEntityRelationKey(endpointEntityType, endpointGuid);
   }
   paginationKey: string;
   actions = getActions('Stack', 'Fetch all');
diff --git a/src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts
index 0080cf6962..6ef888f96d 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts
@@ -2,7 +2,7 @@ import { HttpRequest } from '@angular/common/http';
 
 import { getActions } from '../../../store/src/actions/action.helper';
 import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
-import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
@@ -39,7 +39,7 @@ export class GetAllUserProvidedServices extends CFStartAction implements Paginat
   ) {
     super();
     this.paginationKey = paginationKey || (spaceGuid ? createEntityRelationPaginationKey(spaceEntityType, spaceGuid) :
-      createEntityRelationPaginationKey(endpointSchemaKey, endpointGuid));
+      createEntityRelationPaginationKey(endpointEntityType, endpointGuid));
     this.options = new HttpRequest(
       'GET',
       `user_provided_service_instances`,
diff --git a/src/frontend/packages/cloud-foundry/src/actions/users.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/users.actions.ts
index 40f7d57afc..73d008753b 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/users.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/users.actions.ts
@@ -1,8 +1,8 @@
 import { HttpRequest } from '@angular/common/http';
 
 import { getActions } from '../../../store/src/actions/action.helper';
-import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
 import { EntitySchema } from '../../../store/src/helpers/entity-schema';
+import { endpointEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { EntityRequestAction } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
@@ -51,7 +51,7 @@ export class GetAllCfUsersAsAdmin extends CFStartAction implements PaginatedActi
     paginationKey?: string
   ) {
     super();
-    this.paginationKey = paginationKey || createEntityRelationPaginationKey(endpointSchemaKey, endpointGuid);
+    this.paginationKey = paginationKey || createEntityRelationPaginationKey(endpointEntityType, endpointGuid);
     this.options = new HttpRequest(
       'GET',
       'users'
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
index 1112888031..33bbedf4f7 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
@@ -1,5 +1,5 @@
-import { metricEntityType } from '../../core/src/base-entity-schemas';
 import { EntitySchema } from '../../store/src/helpers/entity-schema';
+import { metricEntityType } from '../../store/src/helpers/stratos-entity-factory';
 import { APIResource } from '../../store/src/types/api.types';
 import {
   CFApplicationEntitySchema,
@@ -200,24 +200,24 @@ const CFUserSchema = new CFUserEntitySchema({
     audited_spaces: [createUserOrgSpaceSchema(spaceEntityType, {}, CfUserRoleParams.AUDITED_SPACES)],
   }
 }, {
-    idAttribute: getAPIResourceGuid,
-    processStrategy: (user: APIResource<CfUser>) => {
-      if (user.entity.username) {
-        return user;
-      }
-      const entity = {
-        ...user.entity,
-        username: user.metadata.guid
-      };
-
-      return user.metadata ? {
-        entity,
-        metadata: user.metadata
-      } : {
-          entity
-        };
+  idAttribute: getAPIResourceGuid,
+  processStrategy: (user: APIResource<CfUser>) => {
+    if (user.entity.username) {
+      return user;
     }
-  });
+    const entity = {
+      ...user.entity,
+      username: user.metadata.guid
+    };
+
+    return user.metadata ? {
+      entity,
+      metadata: user.metadata
+    } : {
+        entity
+      };
+  }
+});
 entityCache[cfUserEntityType] = CFUserSchema;
 
 const coreSpaceSchemaParams = {
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
index beba13c732..89727e826e 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -3,10 +3,8 @@ import * as moment from 'moment';
 import { combineLatest, Observable, of } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
-import { EndpointHealthCheck } from '../../core/endpoints-health-checks';
-import { metricEntityType } from '../../core/src/base-entity-schemas';
+import { BaseEndpointAuth } from '../../core/src/core/endpoint-auth';
 import { urlValidationExpression } from '../../core/src/core/utils.service';
-import { BaseEndpointAuth } from '../../core/src/features/endpoints/endpoint-auth';
 import { AppState, GeneralEntityAppState } from '../../store/src/app-state';
 import {
   StratosBaseCatalogEntity,
@@ -14,6 +12,7 @@ import {
   StratosCatalogEntity,
 } from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import {
+  EndpointHealthCheck,
   IStratosEntityDefinition,
   StratosEndpointExtensionDefinition,
 } from '../../store/src/entity-catalog/entity-catalog.types';
@@ -22,6 +21,7 @@ import {
 } from '../../store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe';
 import { ActionDispatcher, JetstreamResponse } from '../../store/src/entity-request-pipeline/entity-request-pipeline.types';
 import { EntitySchema } from '../../store/src/helpers/entity-schema';
+import { metricEntityType } from '../../store/src/helpers/stratos-entity-factory';
 import { RequestInfoState } from '../../store/src/reducers/api-request-reducer/types';
 import { selectSessionData } from '../../store/src/reducers/auth.reducer';
 import { APIResource, EntityInfo } from '../../store/src/types/api.types';
@@ -409,7 +409,9 @@ function generateCFQuotaDefinitionEntity(endpointDefinition: StratosEndpointExte
   const definition: IStratosEntityDefinition = {
     type: quotaDefinitionEntityType,
     schema: cfEntityFactory(quotaDefinitionEntityType),
-    endpoint: endpointDefinition
+    endpoint: endpointDefinition,
+    label: 'Organization Quota',
+    labelPlural: 'Organization Quotas',
   };
   cfEntityCatalog.quotaDefinition = new StratosCatalogEntity<
     IBasicCFMetaData,
@@ -451,6 +453,8 @@ function generateCFAppEnvVarEntity(endpointDefinition: StratosEndpointExtensionD
         }
       };
     },
+    label: 'App Env Var',
+    labelPlural: 'App Env Vars',
   };
   cfEntityCatalog.appEnvVar = new StratosCatalogEntity<
     IBasicCFMetaData,
@@ -478,6 +482,8 @@ function generateCFAppSummaryEntity(endpointDefinition: StratosEndpointExtension
     type: appSummaryEntityType,
     schema: cfEntityFactory(appSummaryEntityType),
     endpoint: endpointDefinition,
+    label: 'App Summary',
+    labelPlural: 'App Summaries',
   };
   cfEntityCatalog.appSummary = new StratosCatalogEntity<IBasicCFMetaData, IAppSummary, AppSummaryActionBuilders>(definition, {
     dataReducers: [
@@ -500,7 +506,9 @@ function generateCFSpaceQuotaEntity(endpointDefinition: StratosEndpointExtension
   const definition: IStratosEntityDefinition = {
     type: spaceQuotaEntityType,
     schema: cfEntityFactory(spaceQuotaEntityType),
-    endpoint: endpointDefinition
+    endpoint: endpointDefinition,
+    label: 'Space Quota',
+    labelPlural: 'Space Quotas',
   };
   cfEntityCatalog.spaceQuota = new StratosCatalogEntity<
     IBasicCFMetaData,
@@ -518,7 +526,9 @@ function generateCFPrivateDomainEntity(endpointDefinition: StratosEndpointExtens
   const definition: IStratosEntityDefinition = {
     type: privateDomainsEntityType,
     schema: cfEntityFactory(privateDomainsEntityType),
-    endpoint: endpointDefinition
+    endpoint: endpointDefinition,
+    label: 'Private Domain',
+    labelPlural: 'Private Domains',
   };
   cfEntityCatalog.privateDomain = new StratosCatalogEntity<IBasicCFMetaData, APIResource<IPrivateDomain>>(definition, {
     dataReducers: [
diff --git a/src/frontend/packages/cloud-foundry/src/cf-error-helpers.ts b/src/frontend/packages/cloud-foundry/src/cf-error-helpers.ts
index 73c4b0c0d4..da3efe70ec 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-error-helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-error-helpers.ts
@@ -1,4 +1,4 @@
-import { JetStreamErrorResponse, jetStreamErrorResponseToSafeString } from '../../core/src/jetstream.helpers';
+import { JetStreamErrorResponse, jetStreamErrorResponseToSafeString } from '../../store/src/jetstream';
 
 export interface CfErrorObject {
   code: number;
diff --git a/src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts b/src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts
index ec23f4125f..8f19d39a21 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts
@@ -1,5 +1,5 @@
-import { FavoritesConfigMapper } from '../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
 import { IEntityMetadata } from '../../store/src/entity-catalog/entity-catalog.types';
+import { FavoritesConfigMapper } from '../../store/src/favorite-config-mapper';
 import { UserFavorite } from '../../store/src/types/user-favorites.types';
 import { CfAPIResource } from './store/types/cf-api.types';
 
diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts
index 11769b81a4..99bfc37bbd 100644
--- a/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts
@@ -3,11 +3,11 @@ import { NgModule } from '@angular/core';
 import { EffectsModule } from '@ngrx/effects';
 
 import { generateASEntities } from '../../cf-autoscaler/src/store/autoscaler-entity-generator';
-import { generateStratosEntities } from '../../core/src/base-entity-types';
 import { getGitHubAPIURL, GITHUB_API_URL } from '../../core/src/core/github.helpers';
 import { LoggerService } from '../../core/src/core/logger.service';
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../store/src/entity-catalog.module';
 import { entityCatalog, TestEntityCatalog } from '../../store/src/entity-catalog/entity-catalog';
+import { generateStratosEntities } from '../../store/src/stratos-entity-generator';
 import { testSCFEndpointGuid } from '../../store/testing/public-api';
 import { BaseCfOrgSpaceRouteMock } from '../test-framework/cloud-foundry-endpoint-service.helper';
 import { generateCFEntities } from './cf-entity-generator';
diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-list.spec.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-list.spec.ts
index 73851810cc..35679dc510 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-list.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-list.spec.ts
@@ -1,6 +1,7 @@
+import { EntitySchema } from '../../../store/src/helpers/entity-schema';
 import { listEntityRelations } from './entity-relations';
 import { createEntityRelationKey, EntityInlineParentAction } from './entity-relations.types';
-import { EntitySchema } from '../../../store/src/helpers/entity-schema';
+
 const endpointType = 'endpointtype1';
 
 describe('Entity Relations - List relations', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.tree.spec.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.tree.spec.ts
index 6ce1b9126a..5383e22fbe 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.tree.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.tree.spec.ts
@@ -1,5 +1,5 @@
-import { CF_ENDPOINT_TYPE } from '../cf-types';
 import { CFEntitySchema } from '../cf-entity-schema-types';
+import { CF_ENDPOINT_TYPE } from '../cf-types';
 import { fetchEntityTree } from './entity-relations.tree';
 import { createEntityRelationKey, EntityInlineParentAction } from './entity-relations.types';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.spec.ts
index 7e8ac98783..52aa6ff434 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.spec.ts
@@ -1,12 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { GetApplication } from '../../../../../cloud-foundry/src/actions/application.actions';
-import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
 import { TabNavService } from '../../../../../core/tab-nav.service';
-import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper';
 import { generateTestApplicationServiceProvider } from '../../../../test-framework/application-service-helper';
 import { generateCfBaseTestModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { applicationEntityType } from '../../../cf-entity-types';
 import { ApplicationsModule } from '../applications.module';
 import { ApplicationDeleteComponent } from './application-delete.component';
 
@@ -22,11 +18,6 @@ describe('ApplicationDeleteComponent', () => {
         ApplicationsModule
       ],
       providers: [
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         TabNavService
       ]
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts
index 91f805f77c..f8b961dfba 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts
@@ -12,7 +12,7 @@ import {
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { RowState } from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { ListViewTypes } from '../../../../../../core/src/shared/components/list/list.component.types';
-import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../../store/src/helpers/stratos-entity-factory';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { IServiceBinding } from '../../../../cf-api-svc.types';
@@ -59,7 +59,7 @@ export class AppDeleteServiceInstancesListConfigService extends AppServiceBindin
         const action = cfEntityCatalog.serviceBinding.actions.getAllForServiceInstance(
           serviceBinding.entity.service_instance_guid,
           appService.cfGuid,
-          createEntityRelationPaginationKey(endpointSchemaKey, serviceBindingEntityType),
+          createEntityRelationPaginationKey(endpointEntityType, serviceBindingEntityType),
           {
             includeRelations: [],
           }
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts
index cc133e9d3b..184b50070a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts
@@ -1,12 +1,8 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { GetApplication } from '../../../../../../cloud-foundry/src/actions/application.actions';
-import { cfEntityFactory } from '../../../../../../cloud-foundry/src/cf-entity-factory';
-import { generateTestEntityServiceProvider } from '../../../../../../core/test-framework/entity-service.helper';
 import { generateTestApplicationServiceProvider } from '../../../../../test-framework/application-service-helper';
 import { generateCfBaseTestModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { applicationEntityType } from '../../../../cf-entity-types';
 import { ServiceActionHelperService } from '../../../../shared/data-services/service-action-helper.service';
 import {
   ApplicationEnvVarsHelper,
@@ -24,11 +20,6 @@ describe('DeleteAppInstancesComponent', () => {
       declarations: [DeleteAppServiceInstancesComponent],
       imports: generateCfBaseTestModules(),
       providers: [
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationEnvVarsHelper,
         DatePipe,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.spec.ts
index 28b04b412d..7e6b4e0ff6 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.spec.ts
@@ -1,12 +1,8 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { GetApplication } from '../../../../../../cloud-foundry/src/actions/application.actions';
-import { cfEntityFactory } from '../../../../../../cloud-foundry/src/cf-entity-factory';
-import { generateTestEntityServiceProvider } from '../../../../../../core/test-framework/entity-service.helper';
 import { generateTestApplicationServiceProvider } from '../../../../../test-framework/application-service-helper';
 import { generateCfBaseTestModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { applicationEntityType } from '../../../../cf-entity-types';
 import {
   ApplicationEnvVarsHelper,
 } from '../../application/application-tabs-base/tabs/build-tab/application-env-vars.service';
@@ -23,11 +19,6 @@ describe('DeleteAppRoutesComponent', () => {
       declarations: [DeleteAppRoutesComponent],
       imports: generateCfBaseTestModules(),
       providers: [
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationEnvVarsHelper,
         DatePipe,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.spec.ts
index aba0ea3567..23282a262b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.spec.ts
@@ -1,18 +1,14 @@
 import { inject, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { GetApplication } from '../../../../cloud-foundry/src/actions/application.actions';
-import { cfEntityFactory } from '../../../../cloud-foundry/src/cf-entity-factory';
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { ExtensionService } from '../../../../core/src/core/extension/extension-service';
 import { getGitHubAPIURL, GITHUB_API_URL } from '../../../../core/src/core/github.helpers';
-import { generateTestEntityServiceProvider } from '../../../../core/test-framework/entity-service.helper';
 import { EntityMonitorFactory } from '../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { AppStoreModule } from '../../../../store/src/store.module';
 import { generateTestApplicationServiceProvider } from '../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { applicationEntityType } from '../../cf-entity-types';
 import { LongRunningCfOperationsService } from '../../shared/data-services/long-running-cf-op.service';
 import { GitSCMService } from '../../shared/data-services/scm/scm.service';
 import { ApplicationStateService } from '../../shared/services/application-state.service';
@@ -33,11 +29,6 @@ describe('ApplicationService', () => {
         generateCfStoreModules()
       ],
       providers: [
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationStateService,
         ApplicationEnvVarsHelper,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
index d918209f4f..628b8560a4 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
@@ -44,13 +44,13 @@ export function createGetApplicationAction(guid: string, endpointGuid: string) {
   return new GetApplication(
     guid,
     endpointGuid, [
-      createEntityRelationKey(applicationEntityType, routeEntityType),
-      createEntityRelationKey(applicationEntityType, spaceEntityType),
-      createEntityRelationKey(applicationEntityType, stackEntityType),
-      createEntityRelationKey(applicationEntityType, serviceBindingEntityType),
-      createEntityRelationKey(routeEntityType, domainEntityType),
-      createEntityRelationKey(spaceEntityType, organizationEntityType),
-    ]
+    createEntityRelationKey(applicationEntityType, routeEntityType),
+    createEntityRelationKey(applicationEntityType, spaceEntityType),
+    createEntityRelationKey(applicationEntityType, stackEntityType),
+    createEntityRelationKey(applicationEntityType, serviceBindingEntityType),
+    createEntityRelationKey(routeEntityType, domainEntityType),
+    createEntityRelationKey(spaceEntityType, organizationEntityType),
+  ]
   );
 }
 
@@ -64,7 +64,7 @@ export interface ApplicationData {
 @Injectable()
 export class ApplicationService {
 
-  private appEntityService: EntityService<APIResource<IApp>>;
+  public entityService: EntityService<APIResource<IApp>>;
   private appSummaryEntityService: EntityService<IAppSummary>;
 
   constructor(
@@ -74,7 +74,7 @@ export class ApplicationService {
     private appStateService: ApplicationStateService,
     private appEnvVarsService: ApplicationEnvVarsHelper,
   ) {
-    this.appEntityService = cfEntityCatalog.application.store.getEntityService(
+    this.entityService = cfEntityCatalog.application.store.getEntityService(
       appGuid,
       cfGuid,
       {
@@ -138,7 +138,7 @@ export class ApplicationService {
 
   private constructCoreObservables() {
     // First set up all the base observables
-    this.app$ = this.appEntityService.waitForEntity$;
+    this.app$ = this.entityService.waitForEntity$;
     const moreWaiting$ = this.app$.pipe(
       filter(entityInfo => !!(entityInfo.entity && entityInfo.entity.entity && entityInfo.entity.entity.cfGuid)),
       map(entityInfo => entityInfo.entity.entity));
@@ -162,9 +162,9 @@ export class ApplicationService {
       filter(org => !!org)
     );
 
-    this.isDeletingApp$ = this.appEntityService.isDeletingEntity$.pipe(publishReplay(1), refCount());
+    this.isDeletingApp$ = this.entityService.isDeletingEntity$.pipe(publishReplay(1), refCount());
 
-    this.waitForAppEntity$ = this.appEntityService.waitForEntity$.pipe(publishReplay(1), refCount());
+    this.waitForAppEntity$ = this.entityService.waitForEntity$.pipe(publishReplay(1), refCount());
 
     this.appSummary$ = this.waitForAppEntity$.pipe(
       switchMap(() => this.appSummaryEntityService.entityObs$),
@@ -231,9 +231,9 @@ export class ApplicationService {
   }
 
   private constructStatusObservables() {
-    this.isFetchingApp$ = this.appEntityService.isFetchingEntity$;
+    this.isFetchingApp$ = this.entityService.isFetchingEntity$;
 
-    this.isUpdatingApp$ = this.appEntityService.entityObs$.pipe(map(a => {
+    this.isUpdatingApp$ = this.entityService.entityObs$.pipe(map(a => {
       const updatingRoot = a.entityRequestInfo.updating[rootUpdatingKey] || { busy: false };
       const updatingSection = a.entityRequestInfo.updating[UpdateExistingApplication.updateKey] || { busy: false };
       return !!updatingRoot.busy || !!updatingSection.busy;
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.ts
index a95f69f887..ba7fea321a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.ts
@@ -3,10 +3,9 @@ import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import { APP_GUID, CF_GUID, ENTITY_SERVICE } from '../../../../../core/src/shared/entity.tokens';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
+import { APP_GUID, CF_GUID } from '../../../../../core/src/shared/entity.tokens';
 import { ApplicationStateService } from '../../../shared/services/application-state.service';
-import { ApplicationService, createGetApplicationAction } from '../application.service';
+import { ApplicationService } from '../application.service';
 import { ApplicationEnvVarsHelper } from './application-tabs-base/tabs/build-tab/application-env-vars.service';
 
 export function applicationServiceFactory(
@@ -25,17 +24,6 @@ export function applicationServiceFactory(
   );
 }
 
-export function cfApplicationEntityServiceFactory(
-  cfId: string,
-  id: string,
-  esf: EntityServiceFactory
-) {
-  return esf.create(
-    id,
-    createGetApplicationAction(id, cfId)
-  );
-}
-
 export function getGuids(type?: string) {
   return (activatedRoute: ActivatedRoute) => {
     const { id, endpointId } = activatedRoute.snapshot.params;
@@ -72,13 +60,7 @@ export function getGuids(type?: string) {
         ApplicationStateService,
         ApplicationEnvVarsHelper,
       ]
-    },
-    {
-      provide: ENTITY_SERVICE,
-      useFactory: cfApplicationEntityServiceFactory,
-      deps: [CF_GUID, APP_GUID, EntityServiceFactory]
-    },
-
+    }
   ]
 })
 export class ApplicationBaseComponent {
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-poll/application-poll.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-poll/application-poll.component.spec.ts
index 096eebe3f7..d20348cc9f 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-poll/application-poll.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-poll/application-poll.component.spec.ts
@@ -1,11 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { generateTestEntityServiceProvider } from '../../../../../../../core/test-framework/entity-service.helper';
 import { generateTestApplicationServiceProvider } from '../../../../../../test-framework/application-service-helper';
 import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { GetApplication } from '../../../../../actions/application.actions';
-import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { applicationEntityType } from '../../../../../cf-entity-types';
 import { ApplicationPollingService } from '../application-polling.service';
 import { ApplicationEnvVarsHelper } from '../tabs/build-tab/application-env-vars.service';
 import { ApplicationStateService } from './../../../../../shared/services/application-state.service';
@@ -23,11 +19,6 @@ describe('ApplicationPollComponent', () => {
       declarations: [ApplicationPollComponent],
       providers: [
         ApplicationPollingService,
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationEnvVarsHelper,
         ApplicationStateService,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-polling.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-polling.service.ts
index 39fd632931..046af5a750 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-polling.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-polling.service.ts
@@ -1,15 +1,11 @@
-import { Inject, Injectable, NgZone } from '@angular/core';
+import { Injectable, NgZone } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { first, map, tap } from 'rxjs/operators';
 
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
-import { ENTITY_SERVICE } from '../../../../../../core/src/shared/entity.tokens';
 import { AppState } from '../../../../../../store/src/app-state';
-import { EntityService } from '../../../../../../store/src/entity-service';
 import { selectDashboardState } from '../../../../../../store/src/selectors/dashboard.selectors';
-import { APIResource } from '../../../../../../store/src/types/api.types';
-import { IApp } from '../../../../cf-api.types';
 import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { ApplicationService } from '../../application.service';
 
@@ -19,7 +15,7 @@ export class ApplicationPollingService {
   private pollingSub: Subscription;
   private autoRefreshString = 'auto-refresh';
 
-  public isPolling$ = this.entityService.updatingSection$.pipe(map(
+  public isPolling$ = this.applicationService.entityService.updatingSection$.pipe(map(
     update => update[this.autoRefreshString] && update[this.autoRefreshString].busy
   ));
 
@@ -27,7 +23,6 @@ export class ApplicationPollingService {
 
   constructor(
     public applicationService: ApplicationService,
-    @Inject(ENTITY_SERVICE) private entityService: EntityService<APIResource<IApp>>,
     private store: Store<AppState>,
     private ngZone: NgZone,
   ) {
@@ -54,7 +49,7 @@ export class ApplicationPollingService {
 
     // Auto refresh
     this.ngZone.runOutsideAngular(() => {
-      this.pollingSub = this.entityService
+      this.pollingSub = this.applicationService.entityService
         .poll(10000, this.autoRefreshString).pipe(
           tap(() => this.ngZone.run(() => this.poll(false))))
         .subscribe();
@@ -69,12 +64,12 @@ export class ApplicationPollingService {
     const { cfGuid, appGuid } = this.applicationService;
     if (withApp) {
       const updatingApp = {
-        ...this.entityService.action,
+        ...this.applicationService.entityService.action,
         updatingKey: this.autoRefreshString
       };
       this.store.dispatch(updatingApp);
     }
-    this.entityService.entityObs$.pipe(
+    this.applicationService.entityService.entityObs$.pipe(
       first(),
     ).subscribe(resource => {
       cfEntityCatalog.appSummary.api.get(appGuid, cfGuid);
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.spec.ts
index 55f591b111..19c49370d4 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.spec.ts
@@ -5,17 +5,13 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule } from '@ngrx/store';
 
-import { GetApplication } from '../../../../../../cloud-foundry/src/actions/application.actions';
-import { cfEntityFactory } from '../../../../../../cloud-foundry/src/cf-entity-factory';
 import { CoreModule } from '../../../../../../core/src/core/core.module';
 import { getGitHubAPIURL, GITHUB_API_URL } from '../../../../../../core/src/core/github.helpers';
 import { MDAppModule } from '../../../../../../core/src/core/md.module';
 import { SharedModule } from '../../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../../core/tab-nav.service';
-import { generateTestEntityServiceProvider } from '../../../../../../core/test-framework/entity-service.helper';
 import { generateTestApplicationServiceProvider } from '../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { applicationEntityType } from '../../../../cf-entity-types';
 import { ApplicationStateService } from '../../../../shared/services/application-state.service';
 import { ApplicationTabsBaseComponent } from './application-tabs-base.component';
 import { ApplicationEnvVarsHelper } from './tabs/build-tab/application-env-vars.service';
@@ -44,11 +40,6 @@ describe('ApplicationTabsBaseComponent', () => {
         HttpClientTestingModule
       ],
       providers: [
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationStateService,
         ApplicationEnvVarsHelper,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts
index ca2194ba6e..362c6c37fd 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, NgZone, OnDestroy, OnInit } from '@angular/core';
+import { Component, NgZone, OnDestroy, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
 import { filter, first, map, startWith, switchMap, withLatestFrom } from 'rxjs/operators';
@@ -15,22 +15,18 @@ import {
   StratosTabType,
 } from '../../../../../../core/src/core/extension/extension-service';
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service';
-import { getFavoriteFromEntity } from '../../../../../../core/src/core/user-favorite-helpers';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { IPageSideNavTab } from '../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
-import {
-  FavoritesConfigMapper,
-} from '../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
 import { IHeaderBreadcrumb } from '../../../../../../core/src/shared/components/page-header/page-header.types';
-import { ENTITY_SERVICE } from '../../../../../../core/src/shared/entity.tokens';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
-import { EntityService } from '../../../../../../store/src/entity-service';
+import { FavoritesConfigMapper } from '../../../../../../store/src/favorite-config-mapper';
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
 import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { endpointEntitiesSelector } from '../../../../../../store/src/selectors/endpoint.selectors';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
+import { getFavoriteFromEntity } from '../../../../../../store/src/user-favorite-helpers';
 import { UpdateExistingApplication } from '../../../../actions/application.actions';
 import { IApp, IOrganization, ISpace } from '../../../../cf-api.types';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
@@ -61,7 +57,6 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy {
 
   constructor(
     public applicationService: ApplicationService,
-    @Inject(ENTITY_SERVICE) private entityService: EntityService<APIResource>,
     private store: Store<CFAppState>,
     private endpointsService: EndpointsService,
     private ngZone: NgZone,
@@ -246,7 +241,7 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    this.appSub$ = this.entityService.entityMonitor.entityRequest$.subscribe(requestInfo => {
+    this.appSub$ = this.applicationService.entityService.entityMonitor.entityRequest$.subscribe(requestInfo => {
       if (
         requestInfo.deleting.deleted ||
         requestInfo.error
@@ -257,7 +252,7 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy {
 
     this.isFetching$ = this.applicationService.isFetchingApp$;
 
-    this.isBusyUpdating$ = this.entityService.updatingSection$.pipe(
+    this.isBusyUpdating$ = this.applicationService.entityService.updatingSection$.pipe(
       map(updatingSection => {
         const updating = this.updatingSectionBusy(updatingSection.restaging) ||
           this.updatingSectionBusy(updatingSection[UpdateExistingApplication.updateKey]);
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html
index a1ceaa6f53..de18350435 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html
@@ -149,12 +149,12 @@
           </mat-card-content>
         </mat-card>
       </app-tile>
-      <app-tile id="app-build-tab-deployment-info">
+      <app-tile id="app-build-tab-deployment-info" *ngIf="(deploySource$ | async) as deploySource">
         <mat-card>
           <mat-card-header>
             <mat-card-title>Deployment Info</mat-card-title>
           </mat-card-header>
-          <mat-card-content *ngIf="(deploySource$ | async) as deploySource; else notDeployedFromStratos">
+          <mat-card-content>
             <span [ngSwitch]="deploySource.type">
               <app-metadata-item *ngSwitchCase="'giturl'" icon="code" label="Git Url">
                 <div matTooltip="{{ deploySource.branch + ' ' + (deploySource.commit | slice:0:8)}}"
@@ -183,9 +183,6 @@
               </app-metadata-item>
             </span>
           </mat-card-content>
-          <ng-template #notDeployedFromStratos>
-            <mat-card-content>None</mat-card-content>
-          </ng-template>
         </mat-card>
       </app-tile>
     </app-tile-group>
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts
index 71731cb35b..58a38edbe5 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts
@@ -6,17 +6,15 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
 import { GITHUB_API_URL } from '../../../../../../../../core/src/core/github.helpers';
-import { APP_GUID, CF_GUID, ENTITY_SERVICE } from '../../../../../../../../core/src/shared/entity.tokens';
+import { APP_GUID, CF_GUID } from '../../../../../../../../core/src/shared/entity.tokens';
 import { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../../../../core/tab-nav.service';
-import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { AppStoreModule } from '../../../../../../../../store/src/store.module';
 import { ApplicationServiceMock } from '../../../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CloudFoundrySharedModule } from '../../../../../../shared/cf-shared.module';
 import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
 import { ApplicationService } from '../../../../application.service';
-import { cfApplicationEntityServiceFactory } from '../../../application-base.component';
 import { ApplicationPollComponent } from '../../application-poll/application-poll.component';
 import { ApplicationPollingService } from '../../application-polling.service';
 import { ApplicationEnvVarsHelper } from './application-env-vars.service';
@@ -53,11 +51,6 @@ describe('BuildTabComponent', () => {
         TabNavService,
         { provide: CF_GUID, useValue: '' },
         { provide: APP_GUID, useValue: '' },
-        {
-          provide: ENTITY_SERVICE,
-          useFactory: cfApplicationEntityServiceFactory,
-          deps: [CF_GUID, APP_GUID, EntityServiceFactory]
-        },
         ApplicationPollingService
       ]
     })
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts
index 57c88faeb4..5f3574c8d7 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts
@@ -1,20 +1,21 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { combineLatest, delay, distinct, filter, first, map, mergeMap, startWith, tap } from 'rxjs/operators';
+import { combineLatest as observableCombineLatest, Observable, of as observableOf, of } from 'rxjs';
+import { combineLatest, delay, distinct, filter, first, map, mergeMap, startWith, switchMap, tap } from 'rxjs/operators';
 
 import { AppMetadataTypes } from '../../../../../../../../cloud-foundry/src/actions/app-metadata.actions';
 import { UpdateExistingApplication } from '../../../../../../../../cloud-foundry/src/actions/application.actions';
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
-import { getFullEndpointApiUrl } from '../../../../../../../../core/src/features/endpoints/endpoint-helpers';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { ConfirmationDialogConfig } from '../../../../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { ENTITY_SERVICE } from '../../../../../../../../core/src/shared/entity.tokens';
 import { ResetPagination } from '../../../../../../../../store/src/actions/pagination.actions';
-import { EntityService } from '../../../../../../../../store/src/entity-service';
+import { getFullEndpointApiUrl } from '../../../../../../../../store/src/endpoint-utils';
 import { ActionState } from '../../../../../../../../store/src/reducers/api-request-reducer/types';
-import { APIResource, EntityInfo } from '../../../../../../../../store/src/types/api.types';
+import { EntityInfo } from '../../../../../../../../store/src/types/api.types';
 import { IAppSummary } from '../../../../../../cf-api.types';
 import { cfEntityCatalog } from '../../../../../../cf-entity-catalog';
 import { GitSCMService, GitSCMType } from '../../../../../../shared/data-services/scm/scm.service';
@@ -62,11 +63,10 @@ export class BuildTabComponent implements OnInit {
     public applicationService: ApplicationService,
     private scmService: GitSCMService,
     private store: Store<CFAppState>,
-    @Inject(ENTITY_SERVICE) private entityService: EntityService<APIResource>,
     private route: ActivatedRoute,
     private router: Router,
     private confirmDialog: ConfirmationDialogService,
-
+    private cups: CurrentUserPermissionsService
   ) { }
 
   cardTwoFetching$: Observable<boolean>;
@@ -88,7 +88,7 @@ export class BuildTabComponent implements OnInit {
         return app.fetching || appSummary.entityRequestInfo.fetching;
       }), distinct());
 
-    this.isBusyUpdating$ = this.entityService.updatingSection$.pipe(
+    this.isBusyUpdating$ = this.applicationService.entityService.updatingSection$.pipe(
       map(updatingSection => {
         const updating = this.updatingSectionBusy(updatingSection.restaging) ||
           this.updatingSectionBusy(updatingSection[UpdateExistingApplication.updateKey]);
@@ -108,8 +108,17 @@ export class BuildTabComponent implements OnInit {
       })
     );
 
-    this.deploySource$ = this.applicationService.applicationStratProject$.pipe(
-      combineLatest(this.applicationService.application$)
+    const canSeeEnvVars$ = this.applicationService.appSpace$.pipe(
+      switchMap(space => this.cups.can(
+        CfCurrentUserPermissions.APPLICATION_VIEW_ENV_VARS,
+        this.applicationService.cfGuid,
+        space.metadata.guid)
+      )
+    )
+
+    const deploySource$ = observableCombineLatest(
+      this.applicationService.applicationStratProject$,
+      this.applicationService.application$
     ).pipe(
       map(([project, app]) => {
         if (!!project) {
@@ -149,6 +158,10 @@ export class BuildTabComponent implements OnInit {
         }
       }),
       startWith({ type: 'loading' })
+    )
+
+    this.deploySource$ = canSeeEnvVars$.pipe(
+      switchMap(canSeeEnvVars => canSeeEnvVars ? deploySource$ : of(null)),
     );
   }
 
@@ -249,7 +262,7 @@ export class BuildTabComponent implements OnInit {
   }
 
   pollEntityService(state, stateString): Observable<any> {
-    return this.entityService
+    return this.applicationService.entityService
       .poll(1000, state).pipe(
         delay(1),
         filter(({ resource }) => {
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component.spec.ts
index b300ad4f84..03b62309d1 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component.spec.ts
@@ -3,18 +3,14 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule } from '@ngrx/store';
 
-import { GetApplication } from '../../../../../../../../cloud-foundry/src/actions/application.actions';
-import { cfEntityFactory } from '../../../../../../../../cloud-foundry/src/cf-entity-factory';
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
 import { MDAppModule } from '../../../../../../../../core/src/core/md.module';
 import { LogViewerComponent } from '../../../../../../../../core/src/shared/components/log-viewer/log-viewer.component';
-import { generateTestEntityServiceProvider } from '../../../../../../../../core/test-framework/entity-service.helper';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { AppStoreModule } from '../../../../../../../../store/src/store.module';
 import { generateTestApplicationServiceProvider } from '../../../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { applicationEntityType } from '../../../../../../cf-entity-types';
 import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
 import { ApplicationEnvVarsHelper } from '../build-tab/application-env-vars.service';
 import { LogStreamTabComponent } from './log-stream-tab.component';
@@ -41,11 +37,6 @@ describe('LogStreamTabComponent', () => {
         LogStreamTabComponent
       ],
       providers: [
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         AppStoreModule,
         ApplicationStateService,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/metrics-tab/metrics-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/metrics-tab/metrics-tab.component.spec.ts
index 6bb64cb28b..42bf58fa38 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/metrics-tab/metrics-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/metrics-tab/metrics-tab.component.spec.ts
@@ -1,14 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
-import { GetApplication } from '../../../../../../../../cloud-foundry/src/actions/application.actions';
-import { cfEntityFactory } from '../../../../../../../../cloud-foundry/src/cf-entity-factory';
 import { MDAppModule } from '../../../../../../../../core/src/core/md.module';
 import { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
-import { generateTestEntityServiceProvider } from '../../../../../../../../core/test-framework/entity-service.helper';
 import { generateTestApplicationServiceProvider } from '../../../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { applicationEntityType } from '../../../../../../cf-entity-types';
 import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
 import { ApplicationEnvVarsHelper } from '../build-tab/application-env-vars.service';
 import { MetricsTabComponent } from './metrics-tab.component';
@@ -30,11 +26,6 @@ describe('MetricsTabComponent', () => {
       providers: [
         ApplicationStateService,
         ApplicationEnvVarsHelper,
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
       ]
     })
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts
index c3ead1317a..ff36e161d2 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts
@@ -1,16 +1,12 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { GetApplication } from '../../../../../cloud-foundry/src/actions/application.actions';
-import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { MDAppModule } from '../../../../../core/src/core/md.module';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../core/tab-nav.service';
-import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper';
 import { generateTestApplicationServiceProvider } from '../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { applicationEntityType } from '../../../cf-entity-types';
 import { CloudFoundrySharedModule } from '../../../shared/cf-shared.module';
 import { ApplicationStateService } from '../../../shared/services/application-state.service';
 import { ApplicationEnvVarsHelper } from '../application/application-tabs-base/tabs/build-tab/application-env-vars.service';
@@ -35,11 +31,6 @@ describe('CliInfoApplicationComponent', () => {
         CloudFoundrySharedModule
       ],
       providers: [
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationStateService,
         ApplicationEnvVarsHelper,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.ts
index 9785603d75..1681bae4ad 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.ts
@@ -2,11 +2,10 @@ import { Component, OnInit } from '@angular/core';
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { filter, first, map } from 'rxjs/operators';
 
-import { EntityService } from '../../../../../store/src/entity-service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
-import { getFullEndpointApiUrl } from '../../../../../core/src/features/endpoints/endpoint-helpers';
 import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
-import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
+import { getFullEndpointApiUrl } from '../../../../../store/src/endpoint-utils';
+import { EntityService } from '../../../../../store/src/entity-service';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { CFAppCLIInfoContext } from '../../../shared/components/cli-info/cli-info.component';
 import { ApplicationService } from '../application.service';
@@ -29,7 +28,6 @@ export class CliInfoApplicationComponent implements OnInit {
 
   constructor(
     private applicationService: ApplicationService,
-    private entityServiceFactory: EntityServiceFactory
   ) {
     this.breadcrumbs$ = new BehaviorSubject<IHeaderBreadcrumb[]>([]);
   }
@@ -41,10 +39,7 @@ export class CliInfoApplicationComponent implements OnInit {
   }
 
   private setupObservables(cfGuid: string) {
-    this.cfEndpointEntityService = this.entityServiceFactory.create<EndpointModel>(
-      cfGuid,
-      new GetAllEndpoints()
-    );
+    this.cfEndpointEntityService = stratosEntityCatalog.endpoint.store.getEntityService(cfGuid);
 
     this.context$ = combineLatest(
       this.applicationService.application$,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/edit-application/edit-application.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/edit-application/edit-application.component.spec.ts
index f25b7fa87f..e5de781a2a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/edit-application/edit-application.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/edit-application/edit-application.component.spec.ts
@@ -4,18 +4,14 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { GetApplication } from '../../../../../cloud-foundry/src/actions/application.actions';
-import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../core/tab-nav.service';
-import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper';
 import {
   ApplicationServiceMock,
   generateTestApplicationServiceProvider,
 } from '../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { applicationEntityType } from '../../../cf-entity-types';
 import { ApplicationStateService } from '../../../shared/services/application-state.service';
 import { ApplicationService } from '../application.service';
 import { ApplicationEnvVarsHelper } from '../application/application-tabs-base/tabs/build-tab/application-env-vars.service';
@@ -42,11 +38,6 @@ describe('EditApplicationComponent', () => {
       ],
       providers: [
         { provide: ApplicationService, useClass: ApplicationServiceMock },
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationStateService,
         ApplicationEnvVarsHelper,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts
index c5e99f073c..acc4f55a0c 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts
@@ -14,7 +14,7 @@ import {
 import { selectCfRequestInfo } from '../../../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
-import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../../store/src/helpers/stratos-entity-factory';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../../../store/src/types/api.types';
@@ -75,7 +75,7 @@ export class CreateOrganizationStepComponent implements OnInit, OnDestroy {
       tap((o) => this.allOrgs = o)
     );
 
-    const quotaPaginationKey = createEntityRelationPaginationKey(endpointSchemaKey, this.cfGuid);
+    const quotaPaginationKey = createEntityRelationPaginationKey(endpointEntityType, this.cfGuid);
     this.quotaDefinitions$ = cfEntityCatalog.quotaDefinition.store.getPaginationService(
       quotaPaginationKey, this.cfGuid, { includeRelations: [] }
     ).entities$.pipe(
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts
index c0673a5c49..375a28581a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts
@@ -3,12 +3,12 @@ import { Observable, of } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
 import { endpointHasMetricsByAvailable } from '../../../../core/src/features/endpoints/endpoint-helpers';
-import { MetricQueryType } from '../../../../core/src/shared/services/metrics-range-selector.types';
 import { MetricQueryConfig } from '../../../../store/src/actions/metrics.actions';
 import { AppState } from '../../../../store/src/app-state';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { IMetrics } from '../../../../store/src/types/base-metric.types';
+import { MetricQueryType } from '../../../../store/src/types/metric.types';
 import { FetchCFCellMetricsPaginatedAction } from '../../actions/cf-metrics.actions';
 import { CFEntityConfig } from '../../cf-types';
 import { CellMetrics } from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
index 675a1f4758..e6e64456f7 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
@@ -28,9 +28,10 @@ import { APIResource } from '../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { PaginatedAction, PaginationEntityState } from '../../../../store/src/types/pagination.types';
 import { IServiceInstance, IUserProvidedServiceInstance } from '../../cf-api-svc.types';
-import { CFFeatureFlagTypes, ISpace } from '../../cf-api.types';
+import { CFFeatureFlagTypes, IApp, ISpace } from '../../cf-api.types';
 import { cfEntityFactory } from '../../cf-entity-factory';
 import { CFEntityConfig } from '../../cf-types';
+import { ListCfRoute } from '../../shared/components/list/list-types/cf-routes/cf-routes-data-source-base';
 import {
   CfUser,
   CfUserRoleParams,
@@ -350,12 +351,17 @@ export function fetchTotalResults(
   );
 }
 
+type CfOrgSpaceFilterTypes = IApp | ListCfRoute | IServiceInstance;
 export const cfOrgSpaceFilter = (entities: APIResource[], paginationState: PaginationEntityState) => {
   // Filtering is done remotely when maxedResults are hit (see `setMultiFilter`)
   if (!!paginationState.maxedState.isMaxedMode && !paginationState.maxedState.ignoreMaxed) {
     return entities;
   }
 
+  const fetchOrgGuid = (e: APIResource<CfOrgSpaceFilterTypes>): string => {
+    return e.entity.space ? e.entity.space.entity.organization_guid : null;
+  }
+
   // Filter by cf/org/space
   const cfGuid = paginationState.clientPagination.filter.items.cf;
   const orgGuid = paginationState.clientPagination.filter.items.org;
@@ -363,7 +369,7 @@ export const cfOrgSpaceFilter = (entities: APIResource[], paginationState: Pagin
   return !cfGuid && !orgGuid && !spaceGuid ? entities : entities.filter(e => {
     e = extractActualListEntity(e);
     const validCF = !(cfGuid && cfGuid !== e.entity.cfGuid);
-    const validOrg = !(orgGuid && orgGuid !== e.entity.space.entity.organization_guid);
+    const validOrg = !(orgGuid && orgGuid !== fetchOrgGuid(e));
     const validSpace = !(spaceGuid && spaceGuid !== e.entity.space_guid);
     return validCF && validOrg && validSpace;
   });
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
index 82ddcf4295..3449967904 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
@@ -5,9 +5,9 @@ import { first, map } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { CFAppCLIInfoContext } from '../../../../../cloud-foundry/src/shared/components/cli-info/cli-info.component';
-import { getFullEndpointApiUrl } from '../../../../../core/src/features/endpoints/endpoint-helpers';
 import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
+import { getFullEndpointApiUrl } from '../../../../../store/src/endpoint-utils';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { getPreviousRoutingState } from '../../../../../store/src/types/routing.type';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
index 57ddd512a7..c086f9cd86 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
@@ -13,7 +13,7 @@ import {
 import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service';
 import { environment } from '../../../../../core/src/environments/environment.prod';
 import { IPageSideNavTab } from '../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
-import { FavoritesConfigMapper } from '../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
+import { FavoritesConfigMapper } from '../../../../../store/src/favorite-config-mapper';
 import { UserFavoriteEndpoint } from '../../../../../store/src/types/user-favorites.types';
 import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 import { CloudFoundryEndpointService } from '../services/cloud-foundry-endpoint.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
index cc3e90927d..5a91738c56 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
@@ -11,7 +11,7 @@ import {
 } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
-import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../../store/src/helpers/stratos-entity-factory';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
@@ -114,7 +114,7 @@ export class EditOrganizationStepComponent implements OnInit, OnDestroy {
     );
     this.fetchOrgsSub = this.allOrgsInEndpoint$.subscribe();
 
-    const quotaPaginationKey = createEntityRelationPaginationKey(endpointSchemaKey, this.cfGuid);
+    const quotaPaginationKey = createEntityRelationPaginationKey(endpointEntityType, this.cfGuid);
     this.quotaDefinitions$ = cfEntityCatalog.quotaDefinition.store.getPaginationService(
       quotaPaginationKey, this.cfGuid, { includeRelations: [] }
     ).entities$.pipe(
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts
index f271b4ec36..d330a31aec 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts
@@ -8,7 +8,7 @@ import { createEntityRelationPaginationKey } from '../../../../../cloud-foundry/
 import { ActiveRouteCfOrgSpace } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { safeUnsubscribe } from '../../../../../core/src/core/utils.service';
-import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { IQuotaDefinition } from '../../../cf-api.types';
 
 export interface QuotaFormValues {
@@ -71,7 +71,7 @@ export class QuotaDefinitionFormComponent implements OnInit, OnDestroy {
   }
 
   fetchQuotasDefinitions() {
-    const quotaPaginationKey = createEntityRelationPaginationKey(endpointSchemaKey, this.cfGuid);
+    const quotaPaginationKey = createEntityRelationPaginationKey(endpointEntityType, this.cfGuid);
     const quotaDefinitions$ = cfEntityCatalog.quotaDefinition.store.getPaginationService(quotaPaginationKey, this.cfGuid, {})
       .entities$.pipe(
         filter(o => !!o),
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts
index 7f489dbfb6..eec79aba70 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts
@@ -17,13 +17,12 @@ import {
   createEntityRelationPaginationKey,
 } from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { CfApplicationState } from '../../../../../cloud-foundry/src/store/types/application.types';
-import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
 import { EntityService } from '../../../../../store/src/entity-service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
-import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { PaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
 import { EndpointModel, EndpointUser } from '../../../../../store/src/types/endpoint.types';
 import { PaginatedAction } from '../../../../../store/src/types/pagination.types';
@@ -69,8 +68,8 @@ export class CloudFoundryEndpointService {
 
   static createGetAllOrganizations(cfGuid: string) {
     const paginationKey = cfGuid ?
-      createEntityRelationPaginationKey(endpointSchemaKey, cfGuid)
-      : createEntityRelationPaginationKey(endpointSchemaKey);
+      createEntityRelationPaginationKey(endpointEntityType, cfGuid)
+      : createEntityRelationPaginationKey(endpointEntityType);
     const getAllOrganizationsAction = cfEntityCatalog.org.actions.getMultiple(cfGuid, paginationKey,
       {
         includeRelations: [
@@ -84,8 +83,8 @@ export class CloudFoundryEndpointService {
   }
   static createGetAllOrganizationsLimitedSchema(cfGuid: string) {
     const paginationKey = cfGuid ?
-      createEntityRelationPaginationKey(endpointSchemaKey, cfGuid)
-      : createEntityRelationPaginationKey(endpointSchemaKey);
+      createEntityRelationPaginationKey(endpointEntityType, cfGuid)
+      : createEntityRelationPaginationKey(endpointEntityType);
     const getAllOrganizationsAction = cfEntityCatalog.org.actions.getMultiple(cfGuid, paginationKey,
       {
         includeRelations: [
@@ -138,16 +137,12 @@ export class CloudFoundryEndpointService {
   constructor(
     public activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
     private store: Store<CFAppState>,
-    private entityServiceFactory: EntityServiceFactory,
     private cfUserService: CfUserService,
     private pmf: PaginationMonitorFactory,
   ) {
     this.cfGuid = activeRouteCfOrgSpace.cfGuid;
 
-    this.cfEndpointEntityService = this.entityServiceFactory.create(
-      this.cfGuid,
-      new GetAllEndpoints()
-    );
+    this.cfEndpointEntityService = stratosEntityCatalog.endpoint.store.getEntityService(this.cfGuid);
 
     this.cfInfoEntityService = cfEntityCatalog.cfInfo.store.getEntityService(this.cfGuid)
     this.constructCoreObservables();
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-org-space-quota.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-org-space-quota.ts
index 0e89121107..e02ed1ae30 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-org-space-quota.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-org-space-quota.ts
@@ -3,9 +3,9 @@ import { filter, first, map, switchMap } from 'rxjs/operators';
 
 import { truthyIncludingZero } from '../../../../../core/src/core/utils.service';
 import { determineCardStatus } from '../../../../../core/src/shared/components/cards/card-status/card-status.component';
-import { StratosStatus } from '../../../../../core/src/shared/shared.types';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { StratosStatus } from '../../../../../store/src/types/shared.types';
 import { IApp, IOrganization, ISpace } from '../../../cf-api.types';
 import { CFEntityConfig } from '../../../cf-types';
 import { CloudFoundryEndpointService } from './cloud-foundry-endpoint.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization-quota.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization-quota.ts
index 932894115e..9c3bcbf845 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization-quota.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization-quota.ts
@@ -1,9 +1,9 @@
 import { Observable } from 'rxjs';
 
 import { organizationEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
-import { StratosStatus } from '../../../../../core/src/shared/shared.types';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { StratosStatus } from '../../../../../store/src/types/shared.types';
 import { IApp, IOrganization } from '../../../cf-api.types';
 import { getEntityFlattenedList, getStartedAppInstanceCount } from '../../../cf.helpers';
 import { CloudFoundryEndpointService } from './cloud-foundry-endpoint.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space-quota.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space-quota.ts
index 1be45b3e30..692fad26d8 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space-quota.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space-quota.ts
@@ -1,9 +1,9 @@
 import { Observable } from 'rxjs';
 
 import { spaceEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
-import { StratosStatus } from '../../../../../core/src/shared/shared.types';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { StratosStatus } from '../../../../../store/src/types/shared.types';
 import { IApp, ISpace } from '../../../cf-api.types';
 import { getStartedAppInstanceCount } from '../../../cf.helpers';
 import { CloudFoundryEndpointService } from './cloud-foundry-endpoint.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts
index a6bacfc2c6..5e648aba80 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts
@@ -9,7 +9,7 @@ import { createEntityRelationPaginationKey } from '../../../../../cloud-foundry/
 import { ActiveRouteCfOrgSpace } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { safeUnsubscribe } from '../../../../../core/src/core/utils.service';
-import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { IQuotaDefinition } from '../../../cf-api.types';
 
 
@@ -65,7 +65,7 @@ export class SpaceQuotaDefinitionFormComponent implements OnInit, OnDestroy {
     this.spaceQuotaDefinitions$ = cfEntityCatalog.spaceQuota.store.getAllInOrganization.getPaginationService(
       this.orgGuid,
       this.cfGuid,
-      createEntityRelationPaginationKey(endpointSchemaKey, this.cfGuid)
+      createEntityRelationPaginationKey(endpointEntityType, this.cfGuid)
     ).entities$
       .pipe(
         filter(o => !!o),
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.spec.ts
index 6ef73eb96f..ee79e073f2 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.spec.ts
@@ -3,10 +3,10 @@ import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { testSCFEndpoint, testSCFEndpointGuid } from '@stratosui/store/testing';
 
-import { endpointEntitySchema } from '../../../../../core/src/base-entity-schemas';
 import { TabNavService } from '../../../../../core/tab-nav.service';
 import { EntityCatalogHelpers } from '../../../../../store/src/entity-catalog/entity-catalog.helper';
 import { EntityCatalogEntityConfig } from '../../../../../store/src/entity-catalog/entity-catalog.types';
+import { endpointEntityType, stratosEntityFactory } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { NormalizedResponse } from '../../../../../store/src/types/api.types';
 import { WrapperRequestActionSuccess } from '../../../../../store/src/types/request.types';
 import {
@@ -51,7 +51,7 @@ describe('SpaceQuotaDefinitionComponent', () => {
       .compileComponents();
 
 
-    const stratosEndpointEntityConfig: EntityCatalogEntityConfig = endpointEntitySchema;
+    const stratosEndpointEntityConfig: EntityCatalogEntityConfig = stratosEntityFactory(endpointEntityType);
     const stratosEndpointEntityKey = EntityCatalogHelpers.buildEntityKey(
       stratosEndpointEntityConfig.entityType,
       stratosEndpointEntityConfig.endpointType
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts
index 07a77cddd6..cd137d502e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts
@@ -2,9 +2,9 @@ import { Component } from '@angular/core';
 import { Observable } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
-import { metricEntityType } from '../../../../../../../../core/src/base-entity-schemas';
 import { IPageSideNavTab } from '../../../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
 import { IHeaderBreadcrumb } from '../../../../../../../../core/src/shared/components/page-header/page-header.types';
+import { metricEntityType } from '../../../../../../../../store/src/helpers/stratos-entity-factory';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { getActiveRouteCfCellProvider } from '../../../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../../../services/cloud-foundry-endpoint.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.ts
index 081ec14430..e43d9ca244 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.ts
@@ -4,9 +4,8 @@ import { MetricsConfig } from '../../../../../../../../core/src/shared/component
 import {
   MetricsLineChartConfig,
 } from '../../../../../../../../core/src/shared/components/metrics-chart/metrics-chart.types';
-import { MetricQueryType } from '../../../../../../../../core/src/shared/services/metrics-range-selector.types';
 import { IMetricMatrixResult } from '../../../../../../../../store/src/types/base-metric.types';
-import { IMetricCell } from '../../../../../../../../store/src/types/metric.types';
+import { IMetricCell, MetricQueryType } from '../../../../../../../../store/src/types/metric.types';
 import { CloudFoundryCellService } from '../cloud-foundry-cell.service';
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.spec.ts
index e8c160cbcf..669e75977b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.spec.ts
@@ -10,8 +10,8 @@ import {
 import {
   MetricsChartHelpers,
 } from '../../../../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
-import { MetricQueryType } from '../../../../../../../../core/src/shared/services/metrics-range-selector.types';
 import { MetricQueryConfig } from '../../../../../../../../store/src/actions/metrics.actions';
+import { MetricQueryType } from '../../../../../../../../store/src/types/metric.types';
 import { generateCfBaseTestModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { FetchCFCellMetricsAction } from '../../../../../../actions/cf-metrics.actions';
 import { ActiveRouteCfCell } from '../../../../cf-page.types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.ts
index e3427cd79b..2109f6dee5 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.ts
@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { ListConfig } from '../../../../../../../../core/src/shared/components/list/list.component.types';
-import { StratosStatus } from '../../../../../../../../core/src/shared/shared.types';
+import { StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import {
   CfCellHealthListConfigService,
 } from '../../../../../../shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service.ts
index fb6c1e76ec..708a438723 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service.ts
@@ -8,13 +8,12 @@ import { MetricsLineChartConfig } from '../../../../../../../core/src/shared/com
 import {
   MetricsChartHelpers,
 } from '../../../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
-import { MetricQueryType } from '../../../../../../../core/src/shared/services/metrics-range-selector.types';
 import { MetricQueryConfig } from '../../../../../../../store/src/actions/metrics.actions';
 import { AppState } from '../../../../../../../store/src/app-state';
 import { EntityServiceFactory } from '../../../../../../../store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { IMetricMatrixResult, IMetrics, IMetricVectorResult } from '../../../../../../../store/src/types/base-metric.types';
-import { IMetricCell } from '../../../../../../../store/src/types/metric.types';
+import { IMetricCell, MetricQueryType } from '../../../../../../../store/src/types/metric.types';
 import { FetchCFCellMetricsAction } from '../../../../../actions/cf-metrics.actions';
 import { CfCellHelper } from '../../../cf-cell.helpers';
 import { ActiveRouteCfCell } from '../../../cf-page.types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts
index 0c83c22d0f..f9a24ac961 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts
@@ -11,15 +11,13 @@ import {
   StratosActionType,
   StratosTabType,
 } from '../../../../../../../core/src/core/extension/extension-service';
-import { getFavoriteFromEntity } from '../../../../../../../core/src/core/user-favorite-helpers';
 import { environment } from '../../../../../../../core/src/environments/environment.prod';
 import { IPageSideNavTab } from '../../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
-import {
-  FavoritesConfigMapper,
-} from '../../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
 import { IHeaderBreadcrumb } from '../../../../../../../core/src/shared/components/page-header/page-header.types';
+import { FavoritesConfigMapper } from '../../../../../../../store/src/favorite-config-mapper';
 import { EntitySchema } from '../../../../../../../store/src/helpers/entity-schema';
 import { UserFavorite } from '../../../../../../../store/src/types/user-favorites.types';
+import { getFavoriteFromEntity } from '../../../../../../../store/src/user-favorite-helpers';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CfUserService } from '../../../../../shared/data-services/cf-user.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
index c8c42c5c5a..5ae190a43b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
@@ -13,16 +13,14 @@ import {
   StratosActionType,
   StratosTabType,
 } from '../../../../../../../../core/src/core/extension/extension-service';
-import { getFavoriteFromEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
 import { environment } from '../../../../../../../../core/src/environments/environment.prod';
 import { IPageSideNavTab } from '../../../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
-import {
-  FavoritesConfigMapper,
-} from '../../../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
 import { IHeaderBreadcrumb } from '../../../../../../../../core/src/shared/components/page-header/page-header.types';
 import { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
+import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 import { CfUserService } from '../../../../../../shared/data-services/cf-user.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/user-invite.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/user-invite.service.ts
index 755128bd1b..7331193e11 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/user-invite.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/user-invite.service.ts
@@ -10,7 +10,7 @@ import { CurrentUserPermissionsService } from '../../../../../core/src/core/perm
 import { environment } from '../../../../../core/src/environments/environment.prod';
 import { ConfirmationDialogConfig } from '../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../core/src/shared/components/confirmation-dialog.service';
-import { GetSystemInfo } from '../../../../../store/src/actions/system.actions';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
 import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { waitForCFPermissions } from '../cf.helpers';
@@ -57,7 +57,6 @@ interface UserInviteSend {
 export class UserInviteConfigureService {
 
   constructor(
-    private store: Store<CFAppState>,
     private http: HttpClient,
     private snackBar: MatSnackBar,
     private confirmDialog: ConfirmationDialogService,
@@ -70,7 +69,7 @@ export class UserInviteConfigureService {
     const url = `/pp/${proxyAPIVersion}/invite/${cfGUID}`;
     const obs$ = this.http.post(url, formData).pipe(
       map(v => {
-        this.store.dispatch(new GetSystemInfo());
+        stratosEntityCatalog.systemInfo.api.getSystemInfo()
         return {
           error: false
         };
@@ -99,7 +98,7 @@ export class UserInviteConfigureService {
       const url = `/pp/${proxyAPIVersion}/invite/${cfGUID}`;
       this.http.delete(url).pipe(
         map(v => {
-          this.store.dispatch(new GetSystemInfo());
+          stratosEntityCatalog.systemInfo.api.getSystemInfo()
           return {
             error: false,
             errorMessage: ''
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.ts
index 56a88ed334..faa4668b08 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.ts
@@ -18,7 +18,7 @@ import {
   createEntityRelationPaginationKey,
 } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service';
-import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../../store/src/helpers/stratos-entity-factory';
 import { APIResource, EntityInfo } from '../../../../../../store/src/types/api.types';
 import { UsersRolesSetChanges } from '../../../../actions/users-roles.actions';
 import { IOrganization, ISpace } from '../../../../cf-api.types';
@@ -239,7 +239,7 @@ export class CfRolesService {
 
   fetchOrgs(cfGuid: string): Observable<APIResource<IOrganization>[]> {
     if (!this.cfOrgs[cfGuid]) {
-      const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey, cfGuid);
+      const paginationKey = createEntityRelationPaginationKey(endpointEntityType, cfGuid);
       const orgs$ = cfEntityCatalog.org.store.getPaginationService(
         cfGuid,
         paginationKey,
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.html b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.html
index f6b4c53c11..4a7bb72774 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.html
@@ -1,11 +1,11 @@
 <app-page-header [tabs]="tabLinks" tabsHeader="Service" [breadcrumbs]="breadcrumbs">
   <div class="app-page-header">
-    {{ getServiceLabel() | async }}
+    {{ serviceLabel$ | async }}
   </div>
   <div class="page-header-right">
     <ng-container *appCfUserPermission="canCreateServiceInstance">
-      <button mat-icon-button name="add-service-instance" [routerLink]="addServiceInstanceLink()"
-        [queryParams]="isServiceSpaceScoped() | async" [disabled]="!(hasVisiblePlans$ | async)">
+      <button mat-icon-button name="add-service-instance" [routerLink]="addServiceInstanceLink"
+        [queryParams]="isServiceSpaceScoped$ | async" [disabled]="!(hasVisiblePlans$ | async)">
         <mat-icon [matTooltip]="toolTipText$ | async">add</mat-icon>
       </button>
     </ng-container>
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.ts
index 817f55a6e2..763af35529 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.ts
@@ -6,6 +6,7 @@ import { map, publishReplay, refCount } from 'rxjs/operators';
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { IPageSideNavTab } from '../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
 import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
+import { CSI_CANCEL_URL } from '../../../shared/components/add-service-instance/csi-mode.service';
 import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 import { getServiceName } from '../services-helper';
 import { ServicesService } from '../services.service';
@@ -20,6 +21,9 @@ export class ServiceTabsBaseComponent {
   toolTipText$: Observable<string>;
   hasVisiblePlans$: Observable<boolean>;
   servicesSubscription: Subscription;
+  isServiceSpaceScoped$: Observable<any>;
+  addServiceInstanceLink: string[];
+  serviceLabel$: Observable<string>;
 
   tabLinks: IPageSideNavTab[] = [
     {
@@ -59,24 +63,23 @@ export class ServiceTabsBaseComponent {
           return 'Cannot create service instance (no public or visible plans exist for service)';
         }
       }));
-
-  }
-
-  addServiceInstanceLink = () => [
-    '/marketplace',
-    this.servicesService.cfGuid,
-    this.servicesService.serviceGuid,
-    'create'
-  ]
-
-  isServiceSpaceScoped = () => this.servicesService.isSpaceScoped$;
-
-  getServiceLabel = (): Observable<string> => {
-    return this.servicesService.service$.pipe(
+    this.isServiceSpaceScoped$ = this.servicesService.isSpaceScoped$.pipe(
+      map(queryParams => ({
+        ...queryParams,
+        [CSI_CANCEL_URL]: `/marketplace/${this.servicesService.cfGuid}/${this.servicesService.serviceGuid}/instances`
+      }))
+    )
+    this.addServiceInstanceLink = [
+      '/marketplace',
+      this.servicesService.cfGuid,
+      this.servicesService.serviceGuid,
+      'create'
+    ]
+    this.serviceLabel$ = this.servicesService.service$.pipe(
       map(getServiceName),
       publishReplay(1),
       refCount()
-    );
+    )
   }
 
 }
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts
index 9f55596f21..d3fce2628e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts
@@ -5,10 +5,10 @@ import { combineLatest, filter, first, map, share, switchMap } from 'rxjs/operat
 
 import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { getIdFromRoute, safeStringToObj } from '../../../../core/src/core/utils.service';
-import { StratosStatus } from '../../../../core/src/shared/shared.types';
 import { EntityService } from '../../../../store/src/entity-service';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../store/src/types/api.types';
+import { StratosStatus } from '../../../../store/src/types/shared.types';
 import {
   IService,
   IServiceBroker,
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts
index a550800a57..05d65754d3 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts
@@ -132,6 +132,7 @@ export class ServicesService {
       map(o => (o.length === 0 ? null : o[0]))
     );
     this.isSpaceScoped$ = this.serviceBroker$.pipe(
+      first(),
       map(o => o ? o.entity.space_guid : null),
       switchMap(spaceGuid => {
         if (!spaceGuid) {
@@ -151,7 +152,8 @@ export class ServicesService {
             })),
           );
         }
-      })
+      }),
+      first()
     );
     this.serviceInstances$ = this.allServiceInstances$.pipe(
       map(instances => instances.filter(instance => instance.entity.service_guid === this.serviceGuid))
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.html b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.html
index cf6322f5e7..b47b7c7e12 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.html
@@ -3,7 +3,7 @@ <h1>Services</h1>
   <div class="page-header-right">
     <ng-container *ngIf="(haveConnectedCf$ | async)">
       <ng-container *appCfUserPermission="canCreateServiceInstance">
-        <button mat-icon-button [routerLink]="'/services/new/'">
+        <button mat-icon-button [routerLink]="'/services/new/'" [queryParams]="location">
           <mat-icon>add</mat-icon>
         </button>
       </ng-container>
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.ts b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.ts
index 96d806b0c5..be3e78240d 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.ts
@@ -14,6 +14,7 @@ import {
 } from '../../../../../cloud-foundry/src/shared/data-services/cf-org-space-service.service';
 import { CloudFoundryService } from '../../../../../cloud-foundry/src/shared/data-services/cloud-foundry.service';
 import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
+import { CSI_CANCEL_URL } from '../../../shared/components/add-service-instance/csi-mode.service';
 import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 
 @Component({
@@ -35,6 +36,7 @@ export class ServicesWallComponent implements OnDestroy {
   canCreateServiceInstance: CfCurrentUserPermissions;
   initCfOrgSpaceService: Subscription;
   cfIds$: Observable<string[]>;
+  location: { [CSI_CANCEL_URL]: string };
 
   constructor(
     public cloudFoundryService: CloudFoundryService,
@@ -57,6 +59,10 @@ export class ServicesWallComponent implements OnDestroy {
     this.haveConnectedCf$ = cloudFoundryService.connectedCFEndpoints$.pipe(
       map(endpoints => !!endpoints && endpoints.length > 0)
     );
+
+    this.location = {
+      [CSI_CANCEL_URL]: `/services`
+    }
   }
 
   ngOnDestroy(): void {
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.ts b/src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.ts
index c6ebd18e85..eadc97f032 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.ts
@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { filter, map, publishReplay, refCount } from 'rxjs/operators';
 
 import { serviceEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
-import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { APIResource } from '../../../../../store/src/types/api.types';
 import { IService } from '../../../cf-api-svc.types';
 import { cfEntityCatalog } from '../../../cf-entity-catalog';
@@ -18,7 +18,7 @@ export class ServicesWallService {
   }
 
   initServicesObservable = () => {
-    const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey);
+    const paginationKey = createEntityRelationPaginationKey(endpointEntityType);
     return cfEntityCatalog.service.store.getPaginationService(null, paginationKey, {}).entities$
   }
 
diff --git a/src/frontend/packages/cloud-foundry/src/public_api.ts b/src/frontend/packages/cloud-foundry/src/public_api.ts
index eef53f2d79..dbe7a16cbd 100644
--- a/src/frontend/packages/cloud-foundry/src/public_api.ts
+++ b/src/frontend/packages/cloud-foundry/src/public_api.ts
@@ -5,3 +5,5 @@
 // export * from './lib/cloud-foundry.service';
 export * from './lib/cloud-foundry.component';
 export * from './lib/cloud-foundry.module';
+
+export * from './cf-api-svc.types';
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts b/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts
index 7da0831fa8..aeef92fd78 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts
@@ -5,9 +5,6 @@ import { MaterialDesignFrameworkModule } from '@cfstratos/ajsf-material';
 import { CoreModule } from '../../../core/src/core/core.module';
 import { CardCell, TableCellCustom } from '../../../core/src/shared/components/list/list.types';
 import { SharedModule } from '../../../core/src/shared/shared.module';
-import {
-  ApplicationInstanceChartComponent,
-} from '../features/applications/application/application-instance-chart/application-instance-chart.component';
 import {
   AddServiceInstanceBaseStepComponent,
 } from './components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component';
@@ -23,6 +20,9 @@ import {
 import {
   SpecifyUserProvidedDetailsComponent,
 } from './components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component';
+import {
+  ApplicationInstanceChartComponent,
+} from './components/application-instance-chart/application-instance-chart.component';
 import { CardAppInstancesComponent } from './components/cards/card-app-instances/card-app-instances.component';
 import { CardAppStatusComponent } from './components/cards/card-app-status/card-app-status.component';
 import { CardAppUptimeComponent } from './components/cards/card-app-uptime/card-app-uptime.component';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.html
index bdb623280b..20a2ba742b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.html
@@ -1,7 +1,7 @@
 <app-page-header>
   Choose Service Type
 </app-page-header>
-<app-steppers [cancel]="'/services'">
+<app-steppers [cancel]="cancelUrl">
   <app-step [hideNextButton]="true">
     <div class="select-service-step">
       <h3>Choose service type to {{ bindApp ? 'bind' : 'create' }}</h3>
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.ts
index 06f9214b75..2daa17cb4a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.ts
@@ -1,12 +1,14 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
+import { getIdFromRoute } from '../../../../../../core/src/core/utils.service';
 import { BASE_REDIRECT_QUERY } from '../../../../../../core/src/shared/components/stepper/stepper.types';
 import { TileConfigManager } from '../../../../../../core/src/shared/components/tile/tile-selector.helpers';
 import { ITileConfig, ITileData } from '../../../../../../core/src/shared/components/tile/tile-selector.types';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
+import { CSI_CANCEL_URL } from '../csi-mode.service';
 import { SERVICE_INSTANCE_TYPES } from './add-service-instance.types';
 
 interface ICreateServiceTilesData extends ITileData {
@@ -21,6 +23,7 @@ interface ICreateServiceTilesData extends ITileData {
 export class AddServiceInstanceBaseStepComponent {
   private tileManager = new TileConfigManager();
   public serviceType: string;
+  public cancelUrl = '/services';
 
   public tileSelectorConfig = [
     this.tileManager.getNextTileConfig<ICreateServiceTilesData>(
@@ -44,16 +47,39 @@ export class AddServiceInstanceBaseStepComponent {
     this.serviceType = tile ? tile.data.type : null;
     this.pSelectedTile = tile;
     if (tile) {
-      const baseUrl = this.bindApp ? this.router.routerState.snapshot.url : '/services/new';
+      const baseUrl = this.createServiceTileUrl();
       this.store.dispatch(new RouterNav({
         path: `${baseUrl}/${this.serviceType}`,
         query: {
-          [BASE_REDIRECT_QUERY]: baseUrl
+          [BASE_REDIRECT_QUERY]: baseUrl, // 'previous' destination
+          [CSI_CANCEL_URL]: this.cancelUrl // 'cancel' + 'success' destination
         }
       }));
     }
   }
-  constructor(private route: ActivatedRoute, private router: Router, public store: Store<CFAppState>) {
+
+  private cfId: string;
+  private appId: string;
+
+  constructor(
+    private route: ActivatedRoute,
+    public store: Store<CFAppState>
+  ) {
     this.bindApp = !!this.route.snapshot.data.bind;
+    if (this.bindApp) {
+      this.cfId = getIdFromRoute(this.route, 'endpointId');
+      this.appId = getIdFromRoute(this.route, 'id');
+    }
+    this.cancelUrl = this.createCancelUrl();
+  }
+
+  private createServiceTileUrl(): string {
+    return this.bindApp ? `/applications/${this.cfId}/${this.appId}/bind` : '/services/new'
   }
+
+  private createCancelUrl(): string {
+    return this.bindApp ? `/applications/${this.cfId}/${this.appId}/services` : '/services'
+  }
+
+
 }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts
index 3c4fa72df5..ad65ce4410 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { filter, map, pairwise } from 'rxjs/operators';
 
 import { SpaceScopedService } from '../../../../../cloud-foundry/src/features/service-catalog/services.service';
@@ -19,8 +19,23 @@ export const enum CreateServiceFormMode {
   BindServiceInstance = 'bind-service-instance',
 }
 
+/**
+ * Where should the user be taken on cancel (and success). If not supplied will fall back on previous location and then deduced from
+ * params
+ */
+export const CSI_CANCEL_URL = 'cancel'
+
+/**
+ * Used when `CSI_CANCEL_URL` is not supplied
+ */
 export const CANCEL_SPACE_ID_PARAM = 'space-guid';
+/**
+ * Used when `CSI_CANCEL_URL` is not supplied
+ */
 export const CANCEL_ORG_ID_PARAM = 'org-guid';
+/**
+ * Used when `CSI_CANCEL_URL` is not supplied
+ */
 export const CANCEL_USER_PROVIDED = 'up';
 
 interface ViewDetail {
@@ -44,12 +59,16 @@ export class CsiModeService {
 
   private mode: string;
   public viewDetail: ViewDetail;
+  /**
+   * Where should the user be taken on cancel (and success). Taken from url param, previous location or deduced
+   */
   public cancelUrl: string;
   // This property is only used when launching the Create Service Instance Wizard from the Marketplace
   spaceScopedDetails: SpaceScopedService = { isSpaceScoped: false };
 
   constructor(
     private activatedRoute: ActivatedRoute,
+    router: Router
   ) {
     const serviceId = getIdFromRoute(activatedRoute, 'serviceId');
     const serviceInstanceId = getIdFromRoute(activatedRoute, 'serviceInstanceId');
@@ -118,6 +137,7 @@ export class CsiModeService {
         `/cloud-foundry/${cfId}/organizations/${orgGuid}/spaces/${spaceGuid}/${isUserProvided ? 'user-service-instances' : 'service-instances'}`;
     }
 
+    this.updateCancelUrl(this.activatedRoute, router);
   }
 
   getViewDetail = () => this.viewDetail;
@@ -148,4 +168,33 @@ export class CsiModeService {
     );
   }
 
+  private updateCancelUrl(
+    activatedRoute: ActivatedRoute,
+    router: Router
+  ) {
+    // cancelUrl determines where we go on cancel AND success
+    const cancelUrl = activatedRoute.snapshot.queryParamMap.get(CSI_CANCEL_URL);
+    if (cancelUrl) {
+      // Override cancelUrl with what's been passed in (probably came from the service selection pre-step)
+      this.cancelUrl = cancelUrl;
+    } else {
+      // There's some holes with the way cancelUrl in ctor is calculated
+      // - marketplace/service/instances list --> cancel goes to space service instance list
+      // - marketplace/service create instance --> cancel goes to marketplace/service/instance regardless of starting tab
+      // - .. others??
+      // For simplicity always go back to the previous location
+      // - good catch all
+      // - doesn't work that well for marketplace/service create instance --> success (should go to marketplace/service/instance)
+      // - if user has refreshed on stepper (previous url was login) use the old cancelUrl best-guess value
+      const currentNavigation = router.getCurrentNavigation();
+      if (currentNavigation &&
+        currentNavigation.previousNavigation &&
+        currentNavigation.previousNavigation.finalUrl &&
+        currentNavigation.previousNavigation.finalUrl.toString() !== '/login'
+      ) {
+        this.cancelUrl = currentNavigation.previousNavigation.finalUrl.toString();
+      }
+    }
+  }
+
 }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/select-plan-step/select-plan-step.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/select-plan-step/select-plan-step.component.ts
index 961ada73a1..e1b2c4d645 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/select-plan-step/select-plan-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/select-plan-step/select-plan-step.component.ts
@@ -39,8 +39,8 @@ import {
 } from '../../../../../../cloud-foundry/src/store/selectors/create-service-instance.selectors';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { StepOnNextResult } from '../../../../../../core/src/shared/components/stepper/step/step.component';
-import { StratosStatus } from '../../../../../../core/src/shared/shared.types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { StratosStatus } from '../../../../../../store/src/types/shared.types';
 import { IServicePlan } from '../../../../cf-api-svc.types';
 import { CreateServiceInstanceHelperServiceFactory } from '../create-service-instance-helper-service-factory.service';
 import { CreateServiceInstanceHelper } from '../create-service-instance-helper.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.ts
index 80ed214a56..ae2ed8a868 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.ts
@@ -31,7 +31,6 @@ import {
 } from '../../../../../../cloud-foundry/src/actions/create-service-instance.actions';
 import { pathGet, safeStringToObj } from '../../../../../../core/src/core/utils.service';
 import { StepOnNextResult } from '../../../../../../core/src/shared/components/stepper/step/step.component';
-import { RouterNav } from '../../../../../../store/src/actions/router.actions';
 import { getDefaultRequestState, RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource, NormalizedResponse } from '../../../../../../store/src/types/api.types';
 import { UpdateServiceInstance } from '../../../../actions/service-instances.actions';
@@ -297,7 +296,7 @@ export class SpecifyDetailsStepComponent implements OnDestroy, AfterContentInit
       this.longRunningOpService.handleLongRunningCreateService(bindApp);
       // Return to app page instead of falling through to service page
       if (bindApp) {
-        return observableOf(this.routeToServices(state.cfGuid, state.bindAppGuid));
+        return observableOf(this.routeToServices());
       }
     } else if (request.error) {
       // The request has errored, report this back
@@ -318,7 +317,7 @@ export class SpecifyDetailsStepComponent implements OnDestroy, AfterContentInit
           } else {
             // Refetch env vars for app, since they have been changed by CF
             cfEntityCatalog.appEnvVar.api.getMultiple(state.bindAppGuid, state.cfGuid);
-            return this.routeToServices(state.cfGuid, state.bindAppGuid);
+            return this.routeToServices();
           }
         })
       );
@@ -356,13 +355,12 @@ export class SpecifyDetailsStepComponent implements OnDestroy, AfterContentInit
     );
   }
 
-  routeToServices = (cfGuid: string = null, appGuid: string = null): StepOnNextResult => {
-    if (this.modeService.isAppServicesMode()) {
-      this.store.dispatch(new RouterNav({ path: ['/applications', cfGuid, appGuid, 'services'] }));
-    } else {
-      this.store.dispatch(new RouterNav({ path: ['/services'] }));
-    }
-    return { success: true };
+  routeToServices = (): StepOnNextResult => {
+    return {
+      success: true,
+      // We should always go back to where we came from, aka 'cancel' location.
+      redirect: true,
+    };
   }
 
   private setServiceInstanceGuid = (request: { creating: boolean; error: boolean; response: { result: any[]; }; }) =>
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
index a5d2b02b09..258727a9cc 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
@@ -27,6 +27,7 @@ import { IUserProvidedServiceInstance } from '../../../../cf-api-svc.types';
 import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { AppNameUniqueChecking } from '../../../directives/app-name-unique.directive/app-name-unique.directive';
 import { CloudFoundryUserProvidedServicesService } from '../../../services/cloud-foundry-user-provided-services.service';
+import { AppServiceBindingDataSource } from '../../list/list-types/app-sevice-bindings/app-service-binding-data-source';
 import { CreateServiceFormMode, CsiModeService } from './../csi-mode.service';
 
 const { proxyAPIVersion, cfAPIVersion } = environment;
@@ -38,7 +39,7 @@ const { proxyAPIVersion, cfAPIVersion } = environment;
 export class SpecifyUserProvidedDetailsComponent implements OnDestroy {
 
   constructor(
-    route: ActivatedRoute,
+    private route: ActivatedRoute,
     private upsService: CloudFoundryUserProvidedServicesService,
     public modeService: CsiModeService,
     private store: Store<CFAppState>,
@@ -297,11 +298,24 @@ export class SpecifyUserProvidedDetailsComponent implements OnDestroy {
       this.serviceInstanceId,
       updateData
     ).pipe(
-      map(er => ({
-        success: !er.error,
-        redirect: !er.error,
-        message: `Failed to update service instance: ${er.message}`
-      }))
+      map(er => {
+        if (!er.error) {
+          // Update the application binding list
+          const appId = this.appId || this.route.snapshot.queryParamMap.get('appId');
+          if (appId) {
+            this.store.dispatch(AppServiceBindingDataSource.createGetAllServiceBindings(appId, this.cfGuid));
+          }
+          return {
+            success: true,
+            redirect: true,
+          };
+        }
+        return {
+          success: false,
+          redirect: false,
+          message: `Failed to update service instance: ${er.message}`
+        };
+      })
     );
   }
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.html
rename to src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.scss
rename to src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.spec.ts
similarity index 74%
rename from src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.spec.ts
index 07fb0f11ed..fc47c9f6b3 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.spec.ts
@@ -2,10 +2,10 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { CoreModule } from '../../../../../../core/src/core/core.module';
-import { SharedModule } from '../../../../../../core/src/shared/shared.module';
-import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CloudFoundrySharedModule } from './../../../../shared/cf-shared.module';
+import { CoreModule } from '../../../../../core/src/core/core.module';
+import { SharedModule } from '../../../../../core/src/shared/shared.module';
+import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { CloudFoundrySharedModule } from '../../cf-shared.module';
 import { ApplicationInstanceChartComponent } from './application-instance-chart.component';
 
 describe('ApplicationInstanceChartComponent', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.ts
similarity index 66%
rename from src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.ts
index 5401a177bc..3a54bec82d 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.ts
@@ -1,13 +1,12 @@
 import { Component, Input, OnInit } from '@angular/core';
 
-import { MetricsConfig } from '../../../../../../core/src/shared/components/metrics-chart/metrics-chart.component';
-import { MetricsLineChartConfig } from '../../../../../../core/src/shared/components/metrics-chart/metrics-chart.types';
-import { MetricsChartHelpers } from '../../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
-import { MetricQueryType } from '../../../../../../core/src/shared/services/metrics-range-selector.types';
-import { MetricQueryConfig } from '../../../../../../store/src/actions/metrics.actions';
-import { IMetricMatrixResult } from '../../../../../../store/src/types/base-metric.types';
-import { IMetricApplication } from '../../../../../../store/src/types/metric.types';
-import { FetchApplicationMetricsAction } from '../../../../actions/cf-metrics.actions';
+import { MetricsConfig } from '../../../../../core/src/shared/components/metrics-chart/metrics-chart.component';
+import { MetricsLineChartConfig } from '../../../../../core/src/shared/components/metrics-chart/metrics-chart.types';
+import { MetricsChartHelpers } from '../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
+import { MetricQueryConfig } from '../../../../../store/src/actions/metrics.actions';
+import { IMetricMatrixResult } from '../../../../../store/src/types/base-metric.types';
+import { IMetricApplication, MetricQueryType } from '../../../../../store/src/types/metric.types';
+import { FetchApplicationMetricsAction } from '../../../actions/cf-metrics.actions';
 
 @Component({
   selector: 'app-application-instance-chart',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.html
index bf67158f11..4c5cd00b6f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.html
@@ -5,7 +5,8 @@
   </mat-card-header>
   <mat-card-content class="card-app-instances__compact">
     <div *ngIf="!isEditing" class="card-app-instances__large">
-      <app-running-instances [instances]="(appService.application$ | async)?.app.entity?.instances" [cfGuid]="appService.cfGuid" [appGuid]="this.appService.appGuid">
+      <app-running-instances [instances]="(appService.application$ | async)?.app.entity?.instances"
+        [cfGuid]="appService.cfGuid" [appGuid]="this.appService.appGuid">
       </app-running-instances>
     </div>
     <form [hidden]="!isEditing" class="card-app-instances__form">
@@ -14,23 +15,27 @@
       </mat-form-field>
     </form>
   </mat-card-content>
-  <mat-card-actions *ngIf="showActions && (appService.applicationRunning$ | async) && !isEditing" class="card-app-instances__actions">
-    <button (click)="edit()" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
-          <mat-icon>edit</mat-icon>
+  <ng-container *ngIf="canEditApp$ | async">
+    <mat-card-actions *ngIf="showActions && (appService.applicationRunning$ | async) && !isEditing"
+      class="card-app-instances__actions">
+      <button (click)="edit()" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
+        <mat-icon>edit</mat-icon>
       </button>
-    <button (click)="scaleDown()" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
-          <mat-icon>remove_circle_outline</mat-icon>
+      <button (click)="scaleDown()" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
+        <mat-icon>remove_circle_outline</mat-icon>
       </button>
-    <button (click)="scaleUp()" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
-          <mat-icon>add_circle_outline</mat-icon>
+      <button (click)="scaleUp()" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
+        <mat-icon>add_circle_outline</mat-icon>
       </button>
-  </mat-card-actions>
-  <mat-card-actions *ngIf="showActions && isEditing" class="card-app-instances__actions">
-    <button (click)="finishEdit(false)" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
-          <mat-icon>clear</mat-icon>
+    </mat-card-actions>
+    <mat-card-actions *ngIf="showActions && isEditing" class="card-app-instances__actions">
+      <button (click)="finishEdit(false)" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
+        <mat-icon>clear</mat-icon>
       </button>
-    <button (click)="finishEdit(true)" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
-            <mat-icon>done</mat-icon>
-        </button>
-  </mat-card-actions>
-</mat-card>
+      <button (click)="finishEdit(true)" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
+        <mat-icon>done</mat-icon>
+      </button>
+    </mat-card-actions>
+  </ng-container>
+
+</mat-card>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.ts
index c3524019b6..6604494482 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.ts
@@ -1,13 +1,15 @@
-import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild, Renderer2 } from '@angular/core';
+import { Component, ElementRef, Input, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core';
 import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
-import { Observable, Subscription } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { combineLatest, Observable, Subscription } from 'rxjs';
+import { first, map, switchMap } from 'rxjs/operators';
 
 import { AppMetadataTypes } from '../../../../../../cloud-foundry/src/actions/app-metadata.actions';
 import { ApplicationService } from '../../../../../../cloud-foundry/src/features/applications/application.service';
+import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { ConfirmationDialogConfig } from '../../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { StratosStatus } from '../../../../../../core/src/shared/shared.types';
+import { StratosStatus } from '../../../../../../store/src/types/shared.types';
+import { CfCurrentUserPermissions } from '../../../../user-permissions/cf-user-permissions-checkers';
 
 const appInstanceScaleToZeroConfirmation = new ConfirmationDialogConfig('Set Instance count to 0',
   'Are you sure you want to set the instance count to 0?', 'Confirm', true);
@@ -28,14 +30,26 @@ export class CardAppInstancesComponent implements OnInit, OnDestroy {
 
   status$: Observable<StratosStatus>;
 
+  public canEditApp$: Observable<boolean>;
+
   constructor(
     public appService: ApplicationService,
     private renderer: Renderer2,
     private confirmDialog: ConfirmationDialogService,
-    private snackBar: MatSnackBar) {
+    private snackBar: MatSnackBar,
+    cups: CurrentUserPermissionsService
+  ) {
     this.status$ = this.appService.applicationState$.pipe(
       map(state => state.indicator)
     );
+    this.canEditApp$ = combineLatest(
+      appService.appOrg$,
+      appService.appSpace$
+    ).pipe(
+      switchMap(([org, space]) =>
+        cups.can(CfCurrentUserPermissions.APPLICATION_EDIT, appService.cfGuid, org.metadata.guid, space.metadata.guid)
+      ))
+
   }
 
   private currentCount = 0;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-status/card-app-status.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-status/card-app-status.component.ts
index def16fda0d..c7e9633951 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-status/card-app-status.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-status/card-app-status.component.ts
@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { ApplicationService } from '../../../../../../cloud-foundry/src/features/applications/application.service';
-import { StratosStatus } from '../../../../../../core/src/shared/shared.types';
+import { StratosStatus } from '../../../../../../store/src/types/shared.types';
 
 @Component({
   selector: 'app-card-app-status',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-usage/card-app-usage.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-usage/card-app-usage.component.ts
index b8dcea269a..8e47a9ab46 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-usage/card-app-usage.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-usage/card-app-usage.component.ts
@@ -7,7 +7,7 @@ import {
 } from '../../../../../../cloud-foundry/src/features/applications/application-monitor.service';
 import { ApplicationService } from '../../../../../../cloud-foundry/src/features/applications/application.service';
 import { pathGet } from '../../../../../../core/src/core/utils.service';
-import { StratosStatus } from '../../../../../../core/src/shared/shared.types';
+import { StratosStatus } from '../../../../../../store/src/types/shared.types';
 
 @Component({
   selector: 'app-card-app-usage',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.ts
index a6c13b1af5..d982f91991 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.ts
@@ -7,7 +7,7 @@ import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'
 import { ApplicationService } from '../../../../../../../cloud-foundry/src/features/applications/application.service';
 import { ActiveRouteCfOrgSpace } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
 import { BREADCRUMB_URL_PARAM } from '../../../../../../../core/src/shared/components/breadcrumbs/breadcrumbs.types';
-import { StratosStatus } from '../../../../../../../core/src/shared/shared.types';
+import { StratosStatus } from '../../../../../../../store/src/types/shared.types';
 import { ApplicationStateData, ApplicationStateService } from '../../../../services/application-state.service';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
index 1e20e5ab65..555865d96e 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
@@ -8,8 +8,8 @@ import {
   CloudFoundrySpaceService,
 } from '../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
+import { SnackBarService } from '../../../../../../core/src/shared/services/snackbar.service';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
-import { ShowReturnSnackBar } from '../../../../../../store/src/actions/snackBar.actions';
 import { AppState } from '../../../../../../store/src/app-state';
 
 @Component({
@@ -24,7 +24,8 @@ export class CardCfSpaceDetailsComponent implements OnDestroy {
   constructor(
     public cfSpaceService: CloudFoundrySpaceService,
     private store: Store<AppState>,
-    private router: Router
+    private router: Router,
+    private snackBarService: SnackBarService
   ) {
     this.allowSshStatus$ = cfSpaceService.allowSsh$.pipe(
       map(status => status === 'false' ? 'Disabled' : 'Enabled')
@@ -34,7 +35,7 @@ export class CardCfSpaceDetailsComponent implements OnDestroy {
   goToOrgQuota() {
     this.quotaLinkSub = this.cfSpaceService.quotaLink$.subscribe(quotaLink => {
       this.store.dispatch(new RouterNav({ path: quotaLink }));
-      this.store.dispatch(new ShowReturnSnackBar('You were switched to an organization', this.router.url, 'Return to space'));
+      this.snackBarService.showReturn('You were switched to an organization', this.router.url, 'Return to space');
     });
   }
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts
index 8472dd6633..f2337914c2 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts
@@ -46,6 +46,7 @@ export class CfRoleCheckboxComponent implements OnInit, OnDestroy {
 
 
   @Input() cfGuid: string;
+  @Input() orgGuid: string;
   @Input() spaceGuid: string;
   @Input() orgName: string;
   @Input() spaceName: string;
@@ -60,7 +61,6 @@ export class CfRoleCheckboxComponent implements OnInit, OnDestroy {
   sub: Subscription;
   isOrgRole = false;
   disabled = false;
-  orgGuid: string;
 
   private static hasExistingRole(role: string, roles: CfUserRolesSelected, userGuid: string, orgGuid: string, spaceGuid: string): boolean {
     if (roles && roles[userGuid] && roles[userGuid][orgGuid]) {
@@ -266,7 +266,6 @@ export class CfRoleCheckboxComponent implements OnInit, OnDestroy {
       combineLatestOp(this.cfRolesService.newRoles$, users$, canEditRole$, selectUsersIsSetByUsername$),
       filter(([existingRoles, newRoles, users, canEditRole, isSetByUsername]) => !!users.length && !!newRoles.orgGuid)
     ).subscribe(([existingRoles, newRoles, users, canEditRole, isSetByUsername]) => {
-      this.orgGuid = newRoles.orgGuid;
       const { checked, tooltip } = CfRoleCheckboxComponent.getCheckedState(
         this.role, users, existingRoles, newRoles, this.orgGuid, this.spaceGuid);
       this.checked = checked;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.spec.ts
index dd2d9a08a4..3966e4880a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.spec.ts
@@ -6,15 +6,11 @@ import { testSCFEndpointGuid } from '@stratosui/store/testing';
 import { CoreModule } from '../../../../../../../core/src/core/core.module';
 import { CF_GUID } from '../../../../../../../core/src/shared/entity.tokens';
 import { SharedModule } from '../../../../../../../core/src/shared/shared.module';
-import { generateTestEntityServiceProvider } from '../../../../../../../core/test-framework/entity-service.helper';
 import { generateTestApplicationServiceProvider } from '../../../../../../test-framework/application-service-helper';
 import {
   generateCfStoreModules,
   generateTestCfEndpointServiceProvider,
 } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { GetApplication } from '../../../../../actions/application.actions';
-import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { applicationEntityType } from '../../../../../cf-entity-types';
 import { ApplicationsModule } from '../../../../../features/applications/applications.module';
 import { CfAppInstancesConfigService } from './cf-app-instances-config.service';
 
@@ -27,11 +23,6 @@ describe('CfAppInstancesConfigService', () => {
     TestBed.configureTestingModule({
       providers: [
         CfAppInstancesConfigService,
-        generateTestEntityServiceProvider(
-          appGuid,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appGuid, cfGuid)
-        ),
         generateTestApplicationServiceProvider(appGuid, cfGuid),
         generateTestCfEndpointServiceProvider(),
         {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
index 1559dfec06..2753ce8909 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
@@ -1,12 +1,15 @@
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
+import { combineLatest as combineLatestObs, Observable } from 'rxjs';
 import { combineLatest, map, switchMap } from 'rxjs/operators';
 
 import { DeleteApplicationInstance } from '../../../../../../../cloud-foundry/src/actions/application.actions';
 import { FetchApplicationMetricsAction } from '../../../../../../../cloud-foundry/src/actions/cf-metrics.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { UtilsService } from '../../../../../../../core/src/core/utils.service';
 import { ConfirmationDialogConfig } from '../../../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../../../core/src/shared/components/confirmation-dialog.service';
@@ -19,14 +22,14 @@ import {
   IListConfig,
   ListViewTypes,
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { MetricQueryType } from '../../../../../../../core/src/shared/services/metrics-range-selector.types';
 import { MetricQueryConfig } from '../../../../../../../store/src/actions/metrics.actions';
 import { EntityServiceFactory } from '../../../../../../../store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { IMetricMatrixResult, IMetrics } from '../../../../../../../store/src/types/base-metric.types';
-import { IMetricApplication } from '../../../../../../../store/src/types/metric.types';
+import { IMetricApplication, MetricQueryType } from '../../../../../../../store/src/types/metric.types';
 import { ApplicationService } from '../../../../../features/applications/application.service';
 import { CfCellHelper } from '../../../../../features/cloud-foundry/cf-cell.helpers';
+import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { ListAppInstance } from './app-instance-types';
 import { CfAppInstancesDataSource } from './cf-app-instances-data-source';
 import { TableCellCfCellComponent } from './table-cell-cf-cell/table-cell-cf-cell.component';
@@ -158,7 +161,7 @@ export class CfAppInstancesConfigService implements IListConfig<ListAppInstance>
     },
     label: 'Terminate',
     description: ``, // Description depends on console user permission
-
+    createVisible: () => this.canEditApp$
   };
 
   private listActionSsh: IListAction<any> = {
@@ -182,7 +185,8 @@ export class CfAppInstancesConfigService implements IListConfig<ListAppInstance>
               space.entity.allow_ssh;
           })
         );
-      }))
+      })),
+    createVisible: () => this.canEditApp$
   };
 
   private singleActions = [
@@ -190,6 +194,8 @@ export class CfAppInstancesConfigService implements IListConfig<ListAppInstance>
     this.listActionSsh,
   ];
 
+  private canEditApp$: Observable<boolean>;
+
   constructor(
     private store: Store<CFAppState>,
     private appService: ApplicationService,
@@ -197,7 +203,8 @@ export class CfAppInstancesConfigService implements IListConfig<ListAppInstance>
     private router: Router,
     private confirmDialog: ConfirmationDialogService,
     entityServiceFactory: EntityServiceFactory,
-    paginationMonitorFactory: PaginationMonitorFactory
+    paginationMonitorFactory: PaginationMonitorFactory,
+    cups: CurrentUserPermissionsService
   ) {
     const cellHelper = new CfCellHelper(store, paginationMonitorFactory);
 
@@ -220,6 +227,15 @@ export class CfAppInstancesConfigService implements IListConfig<ListAppInstance>
       this.appService.appGuid,
       this,
     );
+
+    this.canEditApp$ = combineLatestObs(
+      appService.appOrg$,
+      appService.appSpace$
+    ).pipe(
+      switchMap(([org, space]) =>
+        cups.can(CfCurrentUserPermissions.APPLICATION_EDIT, appService.cfGuid, org.metadata.guid, space.metadata.guid)
+      )
+    )
   }
 
   getGlobalActions = () => null;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/table-cell-cf-cell/table-cell-cf-cell.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/table-cell-cf-cell/table-cell-cf-cell.component.ts
index 64ccc8b4f4..651c1b90ac 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/table-cell-cf-cell/table-cell-cf-cell.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/table-cell-cf-cell/table-cell-cf-cell.component.ts
@@ -2,8 +2,8 @@ import { Component, Input, OnDestroy } from '@angular/core';
 import { Observable, Subscription } from 'rxjs';
 import { filter, map, tap } from 'rxjs/operators';
 
-import { EntityService } from '../../../../../../../../store/src/entity-service';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
+import { EntityService } from '../../../../../../../../store/src/entity-service';
 import { IMetricMatrixResult, IMetrics } from '../../../../../../../../store/src/types/base-metric.types';
 import { IMetricCell } from '../../../../../../../../store/src/types/metric.types';
 import { ListAppInstance } from '../app-instance-types';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config.service.ts
index a631fac6ae..b69eb4ab15 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config.service.ts
@@ -1,7 +1,8 @@
 import { DatePipe } from '@angular/common';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { take } from 'rxjs/operators';
+import { combineLatest } from 'rxjs';
+import { switchMap, take } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
@@ -12,6 +13,7 @@ import { IGlobalListAction, IListConfig } from '../../../../../../../core/src/sh
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { ApplicationService } from '../../../../../features/applications/application.service';
+import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfAppRoutesListConfigServiceBase } from './cf-app-routes-list-config-base';
 
 
@@ -23,11 +25,12 @@ export class CfAppRoutesListConfigService extends CfAppRoutesListConfigServiceBa
     appService: ApplicationService,
     confirmDialog: ConfirmationDialogService,
     datePipe: DatePipe,
-    currentUserPermissionsService: CurrentUserPermissionsService,
+    private currentUserPermissionsService: CurrentUserPermissionsService,
   ) {
     super(store, appService, confirmDialog, datePipe, currentUserPermissionsService, null, true);
 
     this.setupList(store, appService);
+    this.allowSelection = false; // Allow the multi action visibility to determine this
   }
 
   private setupList(store: Store<CFAppState>, appService: ApplicationService) {
@@ -51,7 +54,18 @@ export class CfAppRoutesListConfigService extends CfAppRoutesListConfigServiceBa
       },
       icon: 'add',
       label: 'Add',
-      description: 'Add new route'
+      description: 'Add new route',
+      visible$: combineLatest(
+        appService.appOrg$,
+        appService.appSpace$
+      ).pipe(
+        switchMap(([org, space]) => this.currentUserPermissionsService.can(
+          CfCurrentUserPermissions.ROUTE_CREATE,
+          appService.cfGuid,
+          org.metadata.guid,
+          space.metadata.guid
+        ))
+      )
     };
     this.getGlobalActions = () => [listActionAddRoute];
   }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
index 5f15687925..50fb563f34 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
@@ -8,12 +8,10 @@ import {
   CurrentUserPermissionsService,
 } from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
-import {
-  MetaCardMenuItem,
-} from '../../../../../../../../core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell, IListRowCell } from '../../../../../../../../core/src/shared/components/list/list.types';
-import { ComponentEntityMonitorConfig } from '../../../../../../../../core/src/shared/shared.types';
 import { APIResource, EntityInfo } from '../../../../../../../../store/src/types/api.types';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
+import { ComponentEntityMonitorConfig } from '../../../../../../../../store/src/types/shared.types';
 import {
   IService,
   IServiceBinding,
@@ -34,6 +32,7 @@ import {
 import { AppEnvVarsState } from '../../../../../../store/types/app-metadata.types';
 import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
+import { CSI_CANCEL_URL } from '../../../../add-service-instance/csi-mode.service';
 import { EnvVarViewComponent } from '../../../../env-var-view/env-var-view.component';
 
 
@@ -54,7 +53,7 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
     data$: Observable<string>;
     customStyle?: string;
   }[];
-  cardMenu: MetaCardMenuItem[];
+  cardMenu: MenuItem[];
   service$: Observable<EntityInfo<APIResource<IService>> | null>;
   serviceInstance$: Observable<EntityInfo<APIResource<IServiceInstance | IUserProvidedServiceInstance>>>;
   tags$: Observable<AppChip<IServiceInstance | IUserProvidedServiceInstance>[]>;
@@ -241,7 +240,10 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
   private edit = () => this.serviceActionHelperService.startEditServiceBindingStepper(
     this.row.entity.service_instance_guid,
     this.appService.cfGuid,
-    { appId: this.appService.appGuid },
+    {
+      appId: this.appService.appGuid,
+      [CSI_CANCEL_URL]: `/applications/${this.appService.cfGuid}/${this.appService.appGuid}/services`
+    },
     this.isUserProvidedServiceInstance
   )
 }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts
index 68288fa9ec..2d39cd38df 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts
@@ -19,12 +19,12 @@ import {
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { GetAppServiceBindings } from '../../../../../actions/application-service-routes.actions';
 import { IServiceBinding } from '../../../../../cf-api-svc.types';
 import { ApplicationService } from '../../../../../features/applications/application.service';
 import { isServiceInstance, isUserProvidedServiceInstance } from '../../../../../features/cloud-foundry/cf.helpers';
 import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
+import { CSI_CANCEL_URL } from '../../../add-service-instance/csi-mode.service';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import {
   TableCellServiceInstanceTagsComponent,
@@ -57,17 +57,15 @@ export class AppServiceBindingListConfigService extends BaseCfListConfig<APIReso
 
   private listActionEdit: IListAction<APIResource<IServiceBinding>> = {
     action: (item) => {
-      // FIXME: If the user cancels stepper this leaks #4295
       this.serviceActionHelperService.startEditServiceBindingStepper(
         item.entity.service_instance_guid,
         this.appService.cfGuid,
-        { appId: this.appService.appGuid },
+        {
+          appId: this.appService.appGuid,
+          [CSI_CANCEL_URL]: `/applications/${this.appService.cfGuid}/${this.appService.appGuid}/services`
+        },
         !!isUserProvidedServiceInstance(item.entity.service_instance.entity)
-      ).subscribe(res => {
-        if (!res.error) {
-          this.store.dispatch(new GetAppServiceBindings(this.appService.appGuid, this.appService.cfGuid));
-        }
-      });
+      );
     },
     label: 'Edit',
     createVisible: () => this.appService.waitForAppEntity$.pipe(
@@ -104,7 +102,7 @@ export class AppServiceBindingListConfigService extends BaseCfListConfig<APIReso
     return [
       {
         columnId: 'name',
-        headerCell: () => 'Service Instances',
+        headerCell: () => 'Name',
         cellDefinition: {
           getValue: (row) => row.entity.service_instance.entity.name
         },
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.spec.ts
index 4eea9c86fc..b2a3d64486 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.spec.ts
@@ -4,12 +4,8 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { CoreModule } from '../../../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../../../core/src/shared/shared.module';
-import { generateTestEntityServiceProvider } from '../../../../../../../core/test-framework/entity-service.helper';
 import { generateTestApplicationServiceProvider } from '../../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { GetApplication } from '../../../../../actions/application.actions';
-import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { applicationEntityType } from '../../../../../cf-entity-types';
 import { ApplicationsModule } from '../../../../../features/applications/applications.module';
 import { CfAppVariablesListConfigService } from './cf-app-variables-list-config.service';
 
@@ -22,11 +18,6 @@ describe('CfAppVariablesListConfigService', () => {
     TestBed.configureTestingModule({
       providers: [
         CfAppVariablesListConfigService,
-        generateTestEntityServiceProvider(
-          appGuid,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appGuid, cfGuid)
-        ),
         generateTestApplicationServiceProvider(appGuid, cfGuid)
       ],
       imports: [
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
index 8236ed5d64..39a18e5336 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
@@ -6,14 +6,12 @@ import { map, startWith } from 'rxjs/operators';
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
 import { applicationEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
 import { IAppFavMetadata } from '../../../../../../../../cloud-foundry/src/cf-metadata-types';
-import { getFavoriteFromEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
-import {
-  FavoritesConfigMapper,
-} from '../../../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
-import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../core/src/shared/shared.types';
+import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
 import { IApp, ISpace } from '../../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-data-source.ts
index ae5065e46e..fbc40398d9 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-data-source.ts
@@ -9,7 +9,7 @@ import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../../../store/src/helpers/stratos-entity-factory';
 import { getRowMetadata } from '../../../../../../../store/src/public-api';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
@@ -17,7 +17,7 @@ import { cfEntityFactory } from '../../../../../cf-entity-factory';
 
 export class CfBuildpacksDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, cfGuid: string, listConfig?: IListConfig<APIResource>) {
-    const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey, cfGuid);
+    const paginationKey = createEntityRelationPaginationKey(endpointEntityType, cfGuid);
     const action = cfEntityCatalog.buildPack.actions.getMultiple(cfGuid, paginationKey)
     super({
       store,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-list-config.service.ts
index 6bc5cdfb94..6d4c6d7b02 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-list-config.service.ts
@@ -5,7 +5,6 @@ import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'
 import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import { ListViewTypes } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
-import { EntityServiceFactory } from '../../../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { IApp, ISpace } from '../../../../../cf-api.types';
 import { ActiveRouteCfCell } from '../../../../../features/cloud-foundry/cf-page.types';
@@ -24,9 +23,9 @@ export class CfCellAppsListConfigService extends BaseCfListConfig<CfCellApp> {
     noEntries: 'There are no applications'
   };
 
-  constructor(store: Store<CFAppState>, private activeRouteCfCell: ActiveRouteCfCell, entityServiceFactory: EntityServiceFactory) {
+  constructor(store: Store<CFAppState>, private activeRouteCfCell: ActiveRouteCfCell) {
     super();
-    this.dataSource = new CfCellAppsDataSource(store, activeRouteCfCell.cfGuid, activeRouteCfCell.cellId, this, entityServiceFactory);
+    this.dataSource = new CfCellAppsDataSource(store, activeRouteCfCell.cfGuid, activeRouteCfCell.cellId, this);
   }
 
   getColumns = (): ITableColumn<CfCellApp>[] => [
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-source.ts
index 6e834f3121..ba9148a902 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-source.ts
@@ -2,7 +2,6 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { GetApplication } from '../../../../../../../cloud-foundry/src/actions/application.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
   applicationEntityType,
@@ -13,14 +12,13 @@ import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { MetricQueryType } from '../../../../../../../core/src/shared/services/metrics-range-selector.types';
 import { MetricQueryConfig } from '../../../../../../../store/src/actions/metrics.actions';
-import { EntityServiceFactory } from '../../../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { IMetrics, IMetricVectorResult } from '../../../../../../../store/src/types/base-metric.types';
-import { IMetricApplication } from '../../../../../../../store/src/types/metric.types';
+import { IMetricApplication, MetricQueryType } from '../../../../../../../store/src/types/metric.types';
 import { FetchCFMetricsPaginatedAction } from '../../../../../actions/cf-metrics.actions';
 import { IApp } from '../../../../../cf-api.types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { createEntityRelationKey } from '../../../../../entity-relations/entity-relations.types';
 
@@ -41,7 +39,6 @@ export class CfCellAppsDataSource
     cfGuid: string,
     cellId: string,
     listConfig: IListConfig<CfCellApp>,
-    entityServiceFactory: EntityServiceFactory
   ) {
     const action = new FetchCFMetricsPaginatedAction(
       cellId,
@@ -64,7 +61,7 @@ export class CfCellAppsDataSource
         return response[0].data.result.map(res => ({
           metric: res.metric,
           appGuid: res.metric.application_id,
-          appEntityService: this.createAppEntityService(res.metric.application_id, cfGuid, entityServiceFactory)
+          appEntityService: this.createAppEntityService(res.metric.application_id, cfGuid)
         }));
       }),
       listConfig
@@ -74,15 +71,18 @@ export class CfCellAppsDataSource
 
   private createAppEntityService(
     appGuid: string,
-    cfGuid: string,
-    entityServiceFactory: EntityServiceFactory): Observable<APIResource<IApp>> {
+    cfGuid: string
+  ): Observable<APIResource<IApp>> {
     if (!this.appEntityServices[appGuid]) {
-      this.appEntityServices[appGuid] = entityServiceFactory.create<APIResource<IApp>>(
+      this.appEntityServices[appGuid] = cfEntityCatalog.application.store.getEntityService(
         appGuid,
-        new GetApplication(appGuid, cfGuid, [
+        cfGuid, {
+        includeRelations: [
           createEntityRelationKey(applicationEntityType, spaceEntityType),
           createEntityRelationKey(spaceEntityType, organizationEntityType)
-        ])
+        ],
+        populateMissing: true
+      }
       ).waitForEntity$.pipe(
         map(entityInfo => entityInfo.entity)
       );
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-data-source.ts
index a9e6b2856e..591c35bf58 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-data-source.ts
@@ -9,7 +9,7 @@ import { IListConfig } from '../../../../../../../core/src/shared/components/lis
 import { EntityMonitorFactory } from '../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../../../../../store/src/monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
-import { GetAllEndpoints } from '../../../../../../../store/src/actions/endpoint.actions';
+import { stratosEntityCatalog } from '../../../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
 
 export class CFEndpointsDataSource extends BaseEndpointsDataSource {
@@ -22,7 +22,7 @@ export class CFEndpointsDataSource extends BaseEndpointsDataSource {
     entityMonitorFactory: EntityMonitorFactory,
     internalEventMonitorFactory: InternalEventMonitorFactory
   ) {
-    const action = new GetAllEndpoints();
+    const action = stratosEntityCatalog.endpoint.actions.getAll();
     const paginationKey = 'cf-endpoints';
     // We do this here to ensure we sync up with main endpoint table data.
     syncPaginationSection(store, action, paginationKey);
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts
index c8275787bf..f7e4ff459b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts
@@ -8,24 +8,20 @@ import { organizationEntityType } from '../../../../../../../../cloud-foundry/sr
 import {
   CurrentUserPermissionsService,
 } from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
-import { getFavoriteFromEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
 import { truthyIncludingZeroString } from '../../../../../../../../core/src/core/utils.service';
 import { ConfirmationDialogConfig } from '../../../../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
-import {
-  FavoritesConfigMapper,
-} from '../../../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
-import {
-  MetaCardMenuItem,
-} from '../../../../../../../../core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
-import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../core/src/shared/shared.types';
 import { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
+import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { EndpointUser } from '../../../../../../../../store/src/types/endpoint.types';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
+import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
 import { IApp, IOrganization } from '../../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { getStartedAppInstanceCount } from '../../../../../../cf.helpers';
@@ -49,7 +45,7 @@ import { CF_ENDPOINT_TYPE } from './../../../../../../cf-types';
   styleUrls: ['./cf-org-card.component.scss']
 })
 export class CfOrgCardComponent extends CardCell<APIResource<IOrganization>> implements OnInit, OnDestroy {
-  cardMenu: MetaCardMenuItem[];
+  cardMenu: MenuItem[];
   orgGuid: string;
   normalisedMemoryUsage: number;
   memoryLimit: string;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts
index d5018ccb88..ef96d027fc 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts
@@ -11,10 +11,10 @@ import {
   getDefaultRowState,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
-import { EntityMonitor } from '../../../../../../../store/src/monitors/entity-monitor';
+import { endpointEntityType } from '../../../../../../../store/src/helpers/stratos-entity-factory';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { CFAppState } from '../../../../../cf-app-state';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { quotaDefinitionEntityType } from '../../../../../cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../../../entity-relations/entity-relations.types';
@@ -22,7 +22,7 @@ import { createEntityRelationPaginationKey } from '../../../../../entity-relatio
 export class CfQuotasDataSourceService extends ListDataSource<APIResource> {
 
   constructor(store: Store<CFAppState>, cfGuid: string, listConfig?: IListConfig<APIResource>) {
-    const quotaPaginationKey = createEntityRelationPaginationKey(endpointSchemaKey, cfGuid);
+    const quotaPaginationKey = createEntityRelationPaginationKey(endpointEntityType, cfGuid);
     const action = new GetQuotaDefinitions(quotaPaginationKey, cfGuid);
 
     super({
@@ -44,8 +44,7 @@ export class CfQuotasDataSourceService extends ListDataSource<APIResource> {
       if (!this.sourceScheme || !row) {
         return of(getDefaultRowState());
       }
-      const entityMonitor = new EntityMonitor(this.store, this.getRowUniqueId(row), this.entityKey, this.sourceScheme);
-      return entityMonitor.entityRequest$.pipe(
+      return cfEntityCatalog.quotaDefinition.store.getEntityMonitor(this.getRowUniqueId(row)).entityRequest$.pipe(
         distinctUntilChanged(),
         map(requestInfo => ({
           deleting: requestInfo.deleting.busy,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts
index 42b046e9dd..2f0b04583f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts
@@ -10,14 +10,14 @@ import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../../../store/src/helpers/stratos-entity-factory';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 
 export class CfSecurityGroupsDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, cfGuid: string, listConfig?: IListConfig<APIResource>) {
-    const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey, cfGuid);
+    const paginationKey = createEntityRelationPaginationKey(endpointEntityType, cfGuid);
     const action = cfEntityCatalog.securityGroup.actions.getMultiple(cfGuid, paginationKey, {});
     super({
       store,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
index 52b60a12ee..b1ecf9ef80 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
@@ -21,9 +21,10 @@ import {
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { IServiceInstance } from '../../../../../cf-api-svc.types';
+import { isUserProvidedServiceInstance } from '../../../../../features/cloud-foundry/cf.helpers';
 import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
-import { CANCEL_ORG_ID_PARAM, CANCEL_SPACE_ID_PARAM } from '../../../add-service-instance/csi-mode.service';
+import { CANCEL_ORG_ID_PARAM, CANCEL_SPACE_ID_PARAM, CSI_CANCEL_URL } from '../../../add-service-instance/csi-mode.service';
 import {
   TableCellAppCfOrgSpaceHeaderComponent,
 } from '../app/table-cell-app-cforgspace-header/table-cell-app-cforgspace-header.component';
@@ -61,7 +62,7 @@ export class CfServiceInstancesListConfigBase implements IListConfig<APIResource
   protected serviceInstanceColumns: ITableColumn<APIResource<IServiceInstance>>[] = [
     {
       columnId: 'name',
-      headerCell: () => 'Service Instance',
+      headerCell: () => 'Name',
       cellDefinition: {
         getValue: (row) => `${row.entity.name}`
       },
@@ -149,10 +150,15 @@ export class CfServiceInstancesListConfigBase implements IListConfig<APIResource
 
   private listActionEdit: IListAction<APIResource> = {
     action: (item: APIResource<IServiceInstance>) =>
-      this.serviceActionHelperService.startEditServiceBindingStepper(item.metadata.guid, item.entity.cfGuid, {
-        [CANCEL_SPACE_ID_PARAM]: item.entity.space_guid,
-        [CANCEL_ORG_ID_PARAM]: item.entity.space.entity.organization_guid
-      }),
+      this.serviceActionHelperService.startEditServiceBindingStepper(
+        item.metadata.guid,
+        item.entity.cfGuid,
+        {
+          [CANCEL_SPACE_ID_PARAM]: item.entity.space_guid,
+          [CANCEL_ORG_ID_PARAM]: item.entity.space.entity.organization_guid,
+          [CSI_CANCEL_URL]: this.rootLocation
+        },
+        !!isUserProvidedServiceInstance(item.entity)),
     label: 'Edit',
     description: 'Edit Service Instance',
     createVisible: (row$: Observable<APIResource<IServiceInstance>>) =>
@@ -176,7 +182,8 @@ export class CfServiceInstancesListConfigBase implements IListConfig<APIResource
     protected store: Store<CFAppState>,
     protected datePipe: DatePipe,
     protected currentUserPermissionsService: CurrentUserPermissionsService,
-    private serviceActionHelperService: ServiceActionHelperService
+    private serviceActionHelperService: ServiceActionHelperService,
+    private rootLocation: string
   ) {
   }
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts
index 334d992dd6..58e54ea397 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts
@@ -11,7 +11,7 @@ import {
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
-import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../../../store/src/helpers/stratos-entity-factory';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginationEntityState } from '../../../../../../../store/src/types/pagination.types';
 import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
@@ -19,7 +19,7 @@ import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 
 export class CfServicesDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, endpointGuid: string, listConfig?: IListConfig<APIResource>) {
-    const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey);
+    const paginationKey = createEntityRelationPaginationKey(endpointEntityType);
     const getServicesAction = cfEntityCatalog.service.actions.getMultiple(endpointGuid, paginationKey, {});
     super({
       store,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
index 9f653f851f..4a9ee537ec 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
@@ -28,6 +28,7 @@ import {
   CANCEL_ORG_ID_PARAM,
   CANCEL_SPACE_ID_PARAM,
   CANCEL_USER_PROVIDED,
+  CSI_CANCEL_URL,
 } from '../../../add-service-instance/csi-mode.service';
 import {
   CfSpacesUserServiceInstancesDataSource,
@@ -64,7 +65,7 @@ export class CfUserServiceInstancesListConfigBase implements IListConfig<APIReso
   protected serviceInstanceColumns: ITableColumn<APIResource<IUserProvidedServiceInstance>>[] = [
     {
       columnId: 'name',
-      headerCell: () => 'Service Instance',
+      headerCell: () => 'Name',
       cellDefinition: {
         getValue: (row) => `${row.entity.name}`
       },
@@ -152,7 +153,8 @@ export class CfUserServiceInstancesListConfigBase implements IListConfig<APIReso
         {
           [CANCEL_SPACE_ID_PARAM]: item.entity.space_guid,
           [CANCEL_ORG_ID_PARAM]: item.entity.space.entity.organization_guid,
-          [CANCEL_USER_PROVIDED]: true
+          [CANCEL_USER_PROVIDED]: true,
+          [CSI_CANCEL_URL]: `/cloud-foundry/${this.cfSpaceService.cfGuid}/organizations/${this.cfSpaceService.orgGuid}/spaces/${this.cfSpaceService.spaceGuid}/service-instances`
         },
         true),
     label: 'Edit',
@@ -176,7 +178,7 @@ export class CfUserServiceInstancesListConfigBase implements IListConfig<APIReso
 
   constructor(
     protected store: Store<CFAppState>,
-    cfSpaceService: CloudFoundrySpaceService,
+    private cfSpaceService: CloudFoundrySpaceService,
     protected datePipe: DatePipe,
     protected currentUserPermissionsService: CurrentUserPermissionsService,
     private serviceActionHelperService: ServiceActionHelperService
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts
index ccfb93879a..fa308e0b71 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts
@@ -10,11 +10,11 @@ import {
   getDefaultRowState,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
-import { EntityMonitor } from '../../../../../../../store/src/monitors/entity-monitor';
+import { endpointEntityType } from '../../../../../../../store/src/helpers/stratos-entity-factory';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { GetOrganizationSpaceQuotaDefinitions } from '../../../../../actions/quota-definitions.actions';
 import { CFAppState } from '../../../../../cf-app-state';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { spaceQuotaEntityType } from '../../../../../cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../../../entity-relations/entity-relations.types';
@@ -22,7 +22,7 @@ import { createEntityRelationPaginationKey } from '../../../../../entity-relatio
 export class CfOrgSpaceQuotasDataSourceService extends ListDataSource<APIResource> {
 
   constructor(store: Store<CFAppState>, orgGuid: string, cfGuid: string, listConfig?: IListConfig<APIResource>) {
-    const quotaPaginationKey = createEntityRelationPaginationKey(endpointSchemaKey, cfGuid);
+    const quotaPaginationKey = createEntityRelationPaginationKey(endpointEntityType, cfGuid);
     const action = new GetOrganizationSpaceQuotaDefinitions(quotaPaginationKey, orgGuid, cfGuid);
 
     super({
@@ -44,8 +44,8 @@ export class CfOrgSpaceQuotasDataSourceService extends ListDataSource<APIResourc
       if (!this.sourceScheme || !row) {
         return of(getDefaultRowState());
       }
-      const entityMonitor = new EntityMonitor(this.store, this.getRowUniqueId(row), this.entityKey, this.sourceScheme);
-      return entityMonitor.entityRequest$.pipe(
+
+      return cfEntityCatalog.spaceQuota.store.getEntityMonitor(this.getRowUniqueId(row)).entityRequest$.pipe(
         distinctUntilChanged(),
         map(requestInfo => ({
           deleting: requestInfo.deleting.busy,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-list-config.service.ts
index e87ed733c5..f747341abe 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-list-config.service.ts
@@ -30,7 +30,13 @@ export class CfSpacesServiceInstancesListConfigService extends CfServiceInstance
     datePipe: DatePipe,
     currentUserPermissionsService: CurrentUserPermissionsService,
     serviceActionHelperService: ServiceActionHelperService) {
-    super(store, datePipe, currentUserPermissionsService, serviceActionHelperService);
+    super(
+      store,
+      datePipe,
+      currentUserPermissionsService,
+      serviceActionHelperService,
+      `/cloud-foundry/${cfSpaceService.cfGuid}/organizations/${cfSpaceService.orgGuid}/spaces/${cfSpaceService.spaceGuid}/service-instances`
+    );
     this.dataSource = new CfSpacesServiceInstancesDataSource(cfSpaceService.cfGuid, cfSpaceService.spaceGuid, this.store, this);
     this.serviceInstanceColumns.find(column => column.columnId === 'attachedApps').cellConfig = {
       breadcrumbs: 'space-services'
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts
index d124f0d47e..322d4bc454 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts
@@ -9,24 +9,20 @@ import { ISpaceFavMetadata } from '../../../../../../../../cloud-foundry/src/cf-
 import {
   CurrentUserPermissionsService,
 } from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
-import { getFavoriteFromEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
 import { truthyIncludingZeroString } from '../../../../../../../../core/src/core/utils.service';
 import { ConfirmationDialogConfig } from '../../../../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
-import {
-  FavoritesConfigMapper,
-} from '../../../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
-import {
-  MetaCardMenuItem,
-} from '../../../../../../../../core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
-import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../core/src/shared/shared.types';
 import { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
+import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { EndpointUser } from '../../../../../../../../store/src/types/endpoint.types';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
+import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
 import { IApp, ISpace } from '../../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
@@ -49,7 +45,7 @@ import { CfUserService } from '../../../../../data-services/cf-user.service';
   styleUrls: ['./cf-space-card.component.scss']
 })
 export class CfSpaceCardComponent extends CardCell<APIResource<ISpace>> implements OnInit, OnDestroy {
-  cardMenu: MetaCardMenuItem[];
+  cardMenu: MenuItem[];
   spaceGuid: string;
   appInstancesCount: number;
   appInstancesLimit: string;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.html
index 76bda159ca..427d921780 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.html
@@ -1,4 +1,5 @@
 <app-cf-role-checkbox [cfGuid]="row.entity.cfGuid"
+  [orgGuid]="config.isSpace ? row?.entity.organization?.metadata.guid : row?.metadata.guid"
   [orgName]="config.isSpace ? row?.entity.organization?.entity.name : row?.entity.name"
   [spaceName]="config.isSpace ? row?.entity.name : null" [spaceGuid]="config.isSpace ? row.metadata.guid : ''"
   [role]="config.role"></app-cf-role-checkbox>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-data-source.ts
index b99fead8d1..7c3cc59981 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-data-source.ts
@@ -31,6 +31,7 @@ export class ServiceInstancesDataSource extends ListDataSource<APIResource> {
       paginationKey,
       isLocal: true,
       transformEntities: [
+        { type: 'filter', field: 'entity.name' },
         (entities: APIResource[], paginationState: PaginationEntityState) => {
           return entities.filter(e => e.entity.service_guid === serviceGuid);
         }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts
index 20878f7924..89c39ee4fa 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts
@@ -6,6 +6,7 @@ import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'
 import {
   CurrentUserPermissionsService,
 } from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
+import { ITableText } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import { ServicesService } from '../../../../../features/service-catalog/services.service';
 import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
 import { CfServiceInstancesListConfigBase } from '../cf-services/cf-service-instances-list-config.base';
@@ -20,13 +21,26 @@ import { ServiceInstancesDataSource } from './service-instances-data-source';
 @Injectable()
 export class ServiceInstancesListConfigService extends CfServiceInstancesListConfigBase {
 
+  enableTextFilter = true;
+  text: ITableText = {
+    title: null,
+    filter: 'Search by name',
+    noEntries: 'There are no service instances',
+  };
+
   constructor(
     store: Store<CFAppState>,
     servicesService: ServicesService,
     datePipe: DatePipe,
     currentUserPermissionsService: CurrentUserPermissionsService,
     serviceActionHelperService: ServiceActionHelperService) {
-    super(store, datePipe, currentUserPermissionsService, serviceActionHelperService);
+    super(
+      store,
+      datePipe,
+      currentUserPermissionsService,
+      serviceActionHelperService,
+      `/marketplace/${servicesService.cfGuid}/${servicesService.serviceGuid}/instances`
+    );
     // Remove 'Service' column
     this.serviceInstanceColumns.splice(1, 1);
     this.dataSource = new ServiceInstancesDataSource(servicesService.cfGuid, servicesService.serviceGuid, store, this);
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
index 649162074c..640c95bcf2 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
@@ -8,12 +8,10 @@ import {
   CurrentUserPermissionsService,
 } from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
-import {
-  MetaCardMenuItem,
-} from '../../../../../../../../core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
-import { ComponentEntityMonitorConfig } from '../../../../../../../../core/src/shared/shared.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
+import { ComponentEntityMonitorConfig } from '../../../../../../../../store/src/types/shared.types';
 import { IServiceInstance } from '../../../../../../cf-api-svc.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import {
@@ -25,6 +23,7 @@ import {
 import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
 import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
+import { CSI_CANCEL_URL } from '../../../../add-service-instance/csi-mode.service';
 
 @Component({
   selector: 'app-service-instance-card',
@@ -103,7 +102,7 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
   static done = false;
   serviceInstanceEntity: APIResource<IServiceInstance>;
   cfGuid: string;
-  cardMenu: MetaCardMenuItem[];
+  cardMenu: MenuItem[];
 
   serviceInstanceTags: AppChip[];
   hasMultipleBindings = new BehaviorSubject(true);
@@ -130,7 +129,9 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
   private edit = () => this.serviceActionHelperService.startEditServiceBindingStepper(
     this.serviceInstanceEntity.metadata.guid,
     this.serviceInstanceEntity.entity.cfGuid,
-    null
+    {
+      [CSI_CANCEL_URL]: '/services'
+    }
   )
 
   getServiceName = () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts
index f3a4c57132..0f597ef543 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts
@@ -70,7 +70,13 @@ export class ServiceInstancesWallListConfigService extends CfServiceInstancesLis
     currentUserPermissionsService: CurrentUserPermissionsService,
     serviceActionHelperService: ServiceActionHelperService
   ) {
-    super(store, datePipe, currentUserPermissionsService, serviceActionHelperService);
+    super(
+      store,
+      datePipe,
+      currentUserPermissionsService,
+      serviceActionHelperService,
+      `/services`
+    );
     const multiFilterConfigs = [
       createCfOrgSpaceFilterConfig('cf', 'Cloud Foundry', this.cfOrgSpaceService.cf),
       createCfOrgSpaceFilterConfig('org', 'Organization', this.cfOrgSpaceService.org),
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts
index 0b2fdcf274..0103bc36be 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts
@@ -8,17 +8,16 @@ import {
   CurrentUserPermissionsService,
 } from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
-import {
-  MetaCardMenuItem,
-} from '../../../../../../../../core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
-import { ComponentEntityMonitorConfig } from '../../../../../../../../core/src/shared/shared.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
+import { ComponentEntityMonitorConfig } from '../../../../../../../../store/src/types/shared.types';
 import { IUserProvidedServiceInstance } from '../../../../../../cf-api-svc.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
 import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
+import { CSI_CANCEL_URL } from '../../../../add-service-instance/csi-mode.service';
 
 
 @Component({
@@ -29,7 +28,7 @@ import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-lab
 export class UserProvidedServiceInstanceCardComponent extends CardCell<APIResource<IUserProvidedServiceInstance>> {
   serviceInstanceEntity: APIResource<IUserProvidedServiceInstance>;
   cfGuid: string;
-  cardMenu: MetaCardMenuItem[];
+  cardMenu: MenuItem[];
 
   serviceInstanceTags: AppChip[];
   hasMultipleBindings = new BehaviorSubject(true);
@@ -120,7 +119,9 @@ export class UserProvidedServiceInstanceCardComponent extends CardCell<APIResour
   private edit = () => this.serviceActionHelperService.startEditServiceBindingStepper(
     this.serviceInstanceEntity.metadata.guid,
     this.serviceInstanceEntity.entity.cfGuid,
-    null,
+    {
+      [CSI_CANCEL_URL]: '/services'
+    },
     true
   )
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.spec.ts
index 0ecf090c2a..d7788eb41e 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
 
-import { StratosStatus } from '../../../../../core/src/shared/shared.types';
 import { EntityService } from '../../../../../store/src/entity-service';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
+import { StratosStatus } from '../../../../../store/src/types/shared.types';
 import { generateCfBaseTestModulesNoShared } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import * as servicesHelpers from '../../../features/service-catalog/services-helper';
 import { ServicesService } from '../../../features/service-catalog/services.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts
index e4e4ba6ef9..8d47ae46c6 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts
@@ -6,8 +6,8 @@ import {
   getServicePlanAccessibilityCardStatus,
 } from '../../../../../cloud-foundry/src/features/service-catalog/services-helper';
 import { ServicesService } from '../../../../../cloud-foundry/src/features/service-catalog/services.service';
-import { StratosStatus } from '../../../../../core/src/shared/shared.types';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { StratosStatus } from '../../../../../store/src/types/shared.types';
 import { IServiceBroker, IServicePlan } from '../../../cf-api-svc.types';
 import { cfEntityCatalog } from '../../../cf-entity-catalog';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts
index 30a0022d4b..e797eab3c8 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts
@@ -7,10 +7,8 @@ import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
 import { cfUserEntityType, organizationEntityType, spaceEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { getCurrentUserCFGlobalStates } from '../../../../cloud-foundry/src/store/selectors/cf-current-user-role.selectors';
-import {
-  LocalPaginationHelpers,
-} from '../../../../core/src/shared/components/list/data-sources-controllers/local-list.helpers';
 import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
+import { LocalPaginationHelpers } from '../../../../store/src/helpers/local-list.helpers';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import {
   getDefaultPaginationEntityState,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/cloud-foundry.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/cloud-foundry.service.ts
index fe0acd6e1b..2482601268 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/cloud-foundry.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/cloud-foundry.service.ts
@@ -1,13 +1,11 @@
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
-import { endpointEntitySchema } from '../../../../core/src/base-entity-schemas';
 import { PaginationMonitor } from '../../../../store/src/monitors/pagination-monitor';
+import { stratosEntityCatalog } from '../../../../store/src/stratos-entity-catalog';
 import { APIResource, EntityInfo } from '../../../../store/src/types/api.types';
-import { endpointListKey, EndpointModel } from '../../../../store/src/types/endpoint.types';
+import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 
 @Injectable()
 export class CloudFoundryService {
@@ -18,11 +16,9 @@ export class CloudFoundryService {
   cfEndpointsMonitor: PaginationMonitor<EndpointModel>;
   waitForAppEntity$: Observable<EntityInfo<APIResource>>;
 
-  constructor(
-    store: Store<CFAppState>
-  ) {
+  constructor() {
 
-    this.cfEndpointsMonitor = new PaginationMonitor(store, endpointListKey, endpointEntitySchema, true);
+    this.cfEndpointsMonitor = stratosEntityCatalog.endpoint.store.getPaginationMonitor();
 
     this.cFEndpoints$ = this.cfEndpointsMonitor.currentPage$.pipe(
       map(endpoints => endpoints.filter(e => e.cnsi_type === 'cf'))
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/long-running-cf-op.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/long-running-cf-op.service.ts
index 443247c3a3..acec511ca3 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/long-running-cf-op.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/long-running-cf-op.service.ts
@@ -2,14 +2,17 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { LongRunningOperationsService } from '../../../../core/src/shared/services/long-running-op.service';
-import { ShowSnackBar } from '../../../../store/src/actions/snackBar.actions';
+import { SnackBarService } from '../../../../core/src/shared/services/snackbar.service';
 import { AppState } from '../../../../store/src/app-state';
-import { GetServiceInstance } from '../../actions/service-instances.actions';
+import { cfEntityCatalog } from '../../cf-entity-catalog';
 
 @Injectable()
 export class LongRunningCfOperationsService extends LongRunningOperationsService {
 
-  constructor(store: Store<AppState>) {
+  constructor(
+    store: Store<AppState>,
+    private snackBarService: SnackBarService
+  ) {
     super(store);
   }
 
@@ -17,23 +20,23 @@ export class LongRunningCfOperationsService extends LongRunningOperationsService
     const message = `The operation to create the service instance is taking a long time and will continue in the background.
      Please refresh the service instance list to check it's status
     ${bindApp ? ` and then bind the application via the Application page.` : '.'}`;
-    this.store.dispatch(new ShowSnackBar(message, 'Dismiss'));
+    this.snackBarService.show(message, 'Dismiss');
   }
 
   handleLongRunningUpdateService(serviceInstanceGuid: string, cfGuid: string) {
     const message = `The operation to update the service instance is taking a long time and will continue in the background.
      Please refresh the service instance list to check it's status`;
-    this.store.dispatch(new ShowSnackBar(message, 'Dismiss'));
     // Also attempt to fetch the service instance, this will update the `last operation` value to `update` and `in progress`
-    this.store.dispatch(new GetServiceInstance(serviceInstanceGuid, cfGuid));
+    this.snackBarService.show(message, 'Dismiss');
+    cfEntityCatalog.serviceInstance.api.get(serviceInstanceGuid, cfGuid);
   }
 
   handleLongRunningDeleteService(serviceInstanceGuid: string, cfGuid: string) {
     const message = `The operation to delete the service instance is taking a long time and will continue in the background.
      Please refresh the service instance list to check it's status`;
-    this.store.dispatch(new ShowSnackBar(message, 'Dismiss'));
+    this.snackBarService.show(message, 'Dismiss');
     // Also attempt to fetch the service instance, this will update the `last operation` value to `delete` and `in progress`
-    this.store.dispatch(new GetServiceInstance(serviceInstanceGuid, cfGuid));
+    cfEntityCatalog.serviceInstance.api.get(serviceInstanceGuid, cfGuid);
   }
 
 }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/services/application-state.service.ts b/src/frontend/packages/cloud-foundry/src/shared/services/application-state.service.ts
index 751994c0f0..af5283b27f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/services/application-state.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/services/application-state.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 
-import { StratosStatus, StratosStatusMetadata } from '../../../../core/src/shared/shared.types';
+import { StratosStatus, StratosStatusMetadata } from '../../../../store/src/types/shared.types';
 import { AppStat } from '../../store/types/app-metadata.types';
 
 export interface ApplicationStateData extends StratosStatusMetadata {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts b/src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts
index 585f41ed42..36c9cb2e38 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts
@@ -2,9 +2,8 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map } from 'rxjs/operators';
 
-import { STRATOS_ENDPOINT_TYPE } from '../../../../core/src/base-entity-schemas';
 import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
-import { endpointSchemaKey } from '../../../../store/src/helpers/entity-factory';
+import { endpointEntityType, STRATOS_ENDPOINT_TYPE } from '../../../../store/src/helpers/stratos-entity-factory';
 import { selectEntity } from '../../../../store/src/selectors/api.selectors';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
@@ -33,7 +32,7 @@ export class CfOrgSpaceLabelService {
     private spaceGuid?: string) {
     this.multipleConnectedEndpoints$ = haveMultiConnectedCfs(this.store);
     // FIXME: hide STRATOS_ENDPOINT_TYPE from extensions - STRAT-154
-    const endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
+    const endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointEntityType);
 
     this.cf$ = this.store.select<EndpointModel>(selectEntity(endpointEntityKey, this.cfGuid));
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/services/current-user-permissions.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/services/current-user-permissions.service.spec.ts
index 99dcb96deb..ddf7d54350 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/services/current-user-permissions.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/services/current-user-permissions.service.spec.ts
@@ -12,8 +12,6 @@ import {
   CfPermissionTypes,
   CfScopeStrings,
 } from '../../../../cloud-foundry/src/user-permissions/cf-user-permissions-checkers';
-import { endpointEntitySchema } from '../../../../core/src/base-entity-schemas';
-import { generateStratosEntities } from '../../../../core/src/base-entity-types';
 import { PermissionConfig } from '../../../../core/src/core/permissions/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../core/src/core/permissions/current-user-permissions.service';
 import { StratosScopeStrings } from '../../../../core/src/core/permissions/stratos-user-permissions.checker';
@@ -21,6 +19,8 @@ import { AppTestModule } from '../../../../core/test-framework/core-test.helper'
 import { AppState } from '../../../../store/src/app-state';
 import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from '../../../../store/src/entity-catalog-test.module';
 import { EntityCatalogEntityConfig } from '../../../../store/src/entity-catalog/entity-catalog.types';
+import { endpointEntityType, stratosEntityFactory } from '../../../../store/src/helpers/stratos-entity-factory';
+import { generateStratosEntities } from '../../../../store/src/stratos-entity-generator';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { BaseEntityValues } from '../../../../store/src/types/entity.types';
@@ -588,7 +588,7 @@ describe('CurrentUserPermissionsService with CF checker', () => {
     // Create request and requestData sections
     const entityMap = new Map<EntityCatalogEntityConfig, Array<TestStoreEntity | string>>([
       [
-        endpointEntitySchema,
+        stratosEntityFactory(endpointEntityType),
         endpoints.map(endpoint => ({
           guid: endpoint.guid,
           data: endpoint
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/cf-users.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/cf-users.reducer.ts
index 71079d216e..2395df2ff6 100644
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/cf-users.reducer.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/cf-users.reducer.ts
@@ -12,6 +12,7 @@ import {
 } from '../../actions/users.actions';
 import { IOrganization, ISpace } from '../../cf-api.types';
 import { cfUserEntityType } from '../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../cf-types';
 import {
   CfUser,
   CfUserMissingOrgRoles,
@@ -61,7 +62,7 @@ export function cfUserReducer(state: IRequestEntityTypeState<APIResource<CfUser>
 }
 
 export function endpointDisconnectUserReducer(state: IRequestEntityTypeState<APIResource<CfUser>>, action: DisconnectEndpoint) {
-  if (action.endpointType === 'cf') {
+  if (action.endpointType === CF_ENDPOINT_TYPE) {
     switch (action.type) {
       case DISCONNECT_ENDPOINTS_SUCCESS:
         const cfGuid = action.guid;
diff --git a/src/frontend/packages/cloud-foundry/src/store/selectors/cf-current-user-role.selectors.ts b/src/frontend/packages/cloud-foundry/src/store/selectors/cf-current-user-role.selectors.ts
index c3df05ca37..ee2fd00471 100644
--- a/src/frontend/packages/cloud-foundry/src/store/selectors/cf-current-user-role.selectors.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/selectors/cf-current-user-role.selectors.ts
@@ -1,7 +1,7 @@
 import { compose } from '@ngrx/store';
 
-import { PermissionValues } from '../../../../core/src/core/permissions/current-user-permissions.config';
 import {
+  PermissionValues,
   selectCurrentUserGlobalHasScopes,
   selectCurrentUserRolesState,
 } from '../../../../store/src/selectors/current-user-role.selectors';
diff --git a/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-permissions-checkers.ts b/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-permissions-checkers.ts
index b38816caf9..1aead1cd0f 100644
--- a/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-permissions-checkers.ts
+++ b/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-permissions-checkers.ts
@@ -7,7 +7,6 @@ import {
   PermissionConfig,
   PermissionConfigLink,
   PermissionTypes,
-  PermissionValues,
 } from '../../../core/src/core/permissions/current-user-permissions.config';
 import {
   CurrentUserPermissionsService,
@@ -21,6 +20,7 @@ import {
   IPermissionCheckCombiner,
 } from '../../../core/src/core/permissions/current-user-permissions.types';
 import { GeneralEntityAppState } from '../../../store/src/app-state';
+import { PermissionValues } from '../../../store/src/selectors/current-user-role.selectors';
 import { connectedEndpointsSelector } from '../../../store/src/selectors/endpoint.selectors';
 import { CFFeatureFlagTypes, IFeatureFlag } from '../cf-api.types';
 import { cfEntityCatalog } from '../cf-entity-catalog';
@@ -396,7 +396,7 @@ export class CfUserPermissionsChecker extends BaseCurrentUserPermissionsChecker
   }
 
   private getAllEndpointGuids() {
-    return this.store.select(connectedEndpointsSelector).pipe(
+    return this.store.select(connectedEndpointsSelector()).pipe(
       map(endpoints => Object.values(endpoints).filter(e => e.cnsi_type === CF_ENDPOINT_TYPE).map(endpoint => endpoint.guid))
     );
   }
diff --git a/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts b/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts
index ec6687ced1..06340d5496 100644
--- a/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts
+++ b/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts
@@ -3,7 +3,6 @@ import { Action, Store } from '@ngrx/store';
 import { combineLatest, Observable, of } from 'rxjs';
 import { catchError, first, map, pairwise, share, skipWhile, switchMap, tap } from 'rxjs/operators';
 
-import { LoggerService } from '../../../core/src/core/logger.service';
 import { AppState } from '../../../store/src/app-state';
 import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
 import {
@@ -50,7 +49,6 @@ const createEndpointArray = (store: Store<AppState>, endpoints: string[] | Entit
 export const cfUserRolesFetch: EntityUserRolesFetch = (
   endpoints: string[] | EntityUserRolesEndpoint[],
   store: Store<AppState>,
-  logService: LoggerService,
   httpClient: HttpClient
 ) => {
   return createEndpointArray(store, endpoints).pipe(
@@ -61,7 +59,7 @@ export const cfUserRolesFetch: EntityUserRolesFetch = (
         cfEndpoints.forEach(endpoint => store.dispatch(new GetCfUserRelations(endpoint.guid, GET_CURRENT_CF_USER_RELATIONS_SUCCESS)))
       } else {
         // If some endpoints are not connected as admin, go out and fetch the current user's specific roles
-        const flagsAndRoleRequests = dispatchRoleRequests(cfEndpoints, store, logService, httpClient);
+        const flagsAndRoleRequests = dispatchRoleRequests(cfEndpoints, store, httpClient);
         const allRequestsCompleted = handleCfRequests(flagsAndRoleRequests);
         return combineLatest(allRequestsCompleted).pipe(
           map(succeeds => succeeds.every(succeeded => !!succeeded)),
@@ -84,7 +82,6 @@ interface IEndpointConnectionInfo {
 function dispatchRoleRequests(
   endpoints: EntityUserRolesEndpoint[],
   store: Store<AppState>,
-  logService: LoggerService,
   httpClient: HttpClient
 ): CfsRequestState {
   const requests: CfsRequestState = {};
@@ -117,7 +114,7 @@ function dispatchRoleRequests(
           );
         }),
         catchError(err => {
-          logService.warn('Failed to fetch current user permissions for a cf: ', err);
+          console.warn('Failed to fetch current user permissions for a cf: ', err);
           store.dispatch(new GetCfUserRelations(endpoint.guid, GET_CURRENT_CF_USER_RELATIONS_FAILED));
           return of(err);
         })
diff --git a/src/frontend/packages/cloud-foundry/test-framework/application-service-helper.ts b/src/frontend/packages/cloud-foundry/test-framework/application-service-helper.ts
index 6c07e9ba8f..18ed991825 100644
--- a/src/frontend/packages/cloud-foundry/test-framework/application-service-helper.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/application-service-helper.ts
@@ -1,7 +1,8 @@
 import { Store } from '@ngrx/store';
-import { Observable, of as observableOf } from 'rxjs';
+import { Observable, of as observableOf, of } from 'rxjs';
 import { map } from 'rxjs/internal/operators/map';
 
+import { EntityService } from '../../store/src/entity-service';
 import { RequestInfoState } from '../../store/src/reducers/api-request-reducer/types';
 import { APIResource, EntityInfo } from '../../store/src/types/api.types';
 import { IApp, IAppSummary, IDomain, ISpace } from '../src/cf-api.types';
@@ -81,6 +82,10 @@ export class ApplicationServiceMock {
   appSpace$: Observable<APIResource<ISpace>> = observableOf(createEntity<ISpace>({} as ISpace));
   applicationRunning$: Observable<boolean> = observableOf(false);
   orgDomains$: Observable<APIResource<IDomain>[]> = observableOf([]);
+  entityService: EntityService<APIResource<IApp<unknown>>> = {
+    waitForEntity$: of({}),
+    updatingSection$: of({})
+  } as EntityService<APIResource<IApp<unknown>>>
 }
 
 export function generateTestApplicationServiceProvider(appGuid: string, cfGuid: string) {
diff --git a/src/frontend/packages/cloud-foundry/test-framework/cf-test-helper.ts b/src/frontend/packages/cloud-foundry/test-framework/cf-test-helper.ts
index 0ef667db7e..c22514e227 100644
--- a/src/frontend/packages/cloud-foundry/test-framework/cf-test-helper.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/cf-test-helper.ts
@@ -1,7 +1,7 @@
 import { BaseTestModules } from '../../core/test-framework/core-test.helper';
 import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from '../../store/src/entity-catalog-test.module';
+import { generateStratosEntities } from '../../store/src/stratos-entity-generator';
 import { generateCFEntities } from '../src/cf-entity-generator';
-import { generateStratosEntities } from '../../core/src/base-entity-types';
 
 export const CFBaseTestModules = [
   ...BaseTestModules,
diff --git a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
index 2174658903..3fc7ed40e9 100644
--- a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
@@ -114,7 +114,7 @@ export function generateTestCfServiceProvider() {
     useFactory: (
       store: Store<CFAppState>,
     ) => {
-      const appService = new CloudFoundryService(store);
+      const appService = new CloudFoundryService();
       return appService;
     },
     deps: [Store]
diff --git a/src/frontend/packages/core/endpoints-health-checks.ts b/src/frontend/packages/core/endpoints-health-checks.ts
index 2c7624fd76..11e46ae3fc 100644
--- a/src/frontend/packages/core/endpoints-health-checks.ts
+++ b/src/frontend/packages/core/endpoints-health-checks.ts
@@ -1,20 +1,9 @@
 import { Injectable } from '@angular/core';
 
 import { entityCatalog } from '../store/src/entity-catalog/entity-catalog';
+import { EndpointHealthCheck } from '../store/src/entity-catalog/entity-catalog.types';
 import { EndpointModel } from '../store/src/types/endpoint.types';
 
-
-export class EndpointHealthCheck {
-  /**
-   * @param check To show an error, the check should either call a WrapperRequestActionFailed
-   * or kick off a chain that eventually calls a WrapperRequestActionFailed
-   */
-  constructor(
-    public endpointType: string,
-    public check: (endpoint: EndpointModel) => void
-  ) { }
-}
-
 @Injectable({
   providedIn: 'root'
 })
diff --git a/src/frontend/packages/core/misc/custom/custom-src-routing.module.ts_ b/src/frontend/packages/core/misc/custom/custom-src-routing.module.ts_
deleted file mode 100644
index a1f9fa4457..0000000000
--- a/src/frontend/packages/core/misc/custom/custom-src-routing.module.ts_
+++ /dev/null
@@ -1,21 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CustomModule } from './custom/custom.module';
-import { CustomRoutingModule } from './custom/custom-routing.module';
-
-// Default import customization module - DO NOT EDIT
-
-// This file is in the .gitignore - changes will not be flagged
-
-@NgModule({
-  imports: [
-    CustomModule,
-  ]
-})
-export class CustomImportModule { }
-
-@NgModule({
-  imports: [
-    CustomRoutingModule,
-  ]
-})
-export class CustomRoutingImportModule { }
diff --git a/src/frontend/packages/core/misc/custom/custom-src.module.ts_ b/src/frontend/packages/core/misc/custom/custom-src.module.ts_
deleted file mode 100644
index 3e536cc582..0000000000
--- a/src/frontend/packages/core/misc/custom/custom-src.module.ts_
+++ /dev/null
@@ -1,16 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CustomModule } from './custom/custom.module';
-
-// Default import customization module - DO NOT EDIT
-
-// This file is in the .gitignore - changes will not be flagged
-
-@NgModule({
-  imports: [
-    CustomModule,
-  ]
-})
-export class CustomImportModule { }
-
-@NgModule()
-export class CustomRoutingImportModule { }
diff --git a/src/frontend/packages/core/misc/custom/custom.scss b/src/frontend/packages/core/misc/custom/custom.scss
deleted file mode 100644
index f6d83b743c..0000000000
--- a/src/frontend/packages/core/misc/custom/custom.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-// Empty customization file - DO NOT EDIT
-
-// This file is in the .gitignore - changes will not be flagged
-
-// The customization build step will replace this file with the custom one if provided
diff --git a/src/frontend/packages/core/misc/custom/custom.yaml b/src/frontend/packages/core/misc/custom/custom.yaml
deleted file mode 100644
index db58c36ad7..0000000000
--- a/src/frontend/packages/core/misc/custom/custom.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Customization manifest
-
-files:
-  custom.scss: "sass/custom.scss"
-  favicon.ico: "favicon.ico"
-  login-bg.jpg: "assets/login-bg.jpg"
-  logo.png: "assets/logo.png"
-  nav-logo.png: "assets/nav-logo.png"
-  eula.html: "assets/eula.html" 
-
-folders:
-  - "app/custom:src/custom"
-  - "assets/custom"
-  - "sass/custom"
diff --git a/src/frontend/packages/core/misc/custom/eula.html b/src/frontend/packages/core/misc/custom/eula.html
deleted file mode 100644
index dfd92e3d98..0000000000
--- a/src/frontend/packages/core/misc/custom/eula.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!--
-  
-  NO EULA
-
-  This is the default EULA file to ensure there is a eula.html file present
-
--->
diff --git a/src/frontend/packages/core/ng-package.json b/src/frontend/packages/core/ng-package.json
new file mode 100644
index 0000000000..9a348247b8
--- /dev/null
+++ b/src/frontend/packages/core/ng-package.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../../../dist/core",
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/core/package.json b/src/frontend/packages/core/package.json
new file mode 100644
index 0000000000..63f4668511
--- /dev/null
+++ b/src/frontend/packages/core/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@stratosui/core",
+  "version": "0.0.1",
+  "stratos": {
+    "assets": {
+      "assets": "core/assets"
+    }
+  }
+}
diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index 9fc21b86f9..67ae92ae8b 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -48,7 +48,6 @@
 @import '../src/shared/components/user-avatar/user-avatar.component.theme';
 @import './components/text-status.theme';
 @import './components/hyperlinks.theme';
-@import './mat-themes';
 @import './mat-desktop';
 @import './fonts';
 @import './ansi-colors';
@@ -57,53 +56,28 @@
 
 @import '../../cloud-foundry/src/shared/components/schema-form/schema-form.component.theme';
 @import '../../cloud-foundry/src/features/services/services-wall/services-wall.component.theme';
-@import '../../cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.theme';
 @import '../../cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme';
 @import '../../cloud-foundry/src/features/applications/application/application-base.component.theme';
 @import '../../cloud-foundry/src/features/applications/deploy-application/deploy-application.component.theme';
 @import '../../cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-fs/deploy-application-fs.component.theme';
 @import '../../cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.theme';
 @import '../../cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.theme';
-@import '../../cloud-foundry/src/features/applications/application-wall/application-wall.component.theme';
 @import '../../core/src/features/error-page/error-page/error-page.component.theme';
 @import '../../core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.theme';
 @import '../../core/src/features/metrics/metrics/metrics.component.theme';
-
-// Defaults
-$side-nav-light-text: #fff;
-$side-nav-light-bg: #333;
-$side-nav-light-hover: #555;
-$side-nav-light-active: #484848;
-
 // Creates the app theme and applies it to the application
 // $theme = Angular Material Theme
 // $nav-theme - Colors for the Side Nav (optional)
 // $status-theme - Colors for status (optional)
-@mixin app-theme($theme, $nav-theme: null, $status-theme: null) {
-  $background-colors: map-get($theme, background);
-  $foreground-colors: map-get($theme, foreground);
-  $is-dark: map-get($theme, is-dark);
-  $app-background-color: white;
-  $app-background-text-color: rgba(mat-color($foreground-colors, base), .65);
-  $primary: map-get($theme, primary);
-  $accent: map-get($theme, accent);
-  $warn: map-get($theme, warn);
-  $subdued: mat-contrast($primary, 50);
-
-  @if $is-dark == true {
-    $app-background-color: lighten(mat-color($background-colors, background), 10%);
-    $subdued: lighten($subdued, 90);
-  } @else {
-    $app-background-color: darken(mat-color($background-colors, background), 2%);
-    $subdued: lighten($subdued, 50);
-  }
+@mixin app-theme($stratos-theme, $nav-theme: null, $status-theme: null) {
+  $theme: map-get($stratos-theme, theme);
+  $app-theme: map-get($stratos-theme, app-theme);
+  $app-background-color: map-get($app-theme, app-background-color);
 
   html {
     background-color: $app-background-color;
   }
 
-  // App Theme defines a set of colors used by stratos components
-  $app-theme: (app-background-color: $app-background-color, app-background-text-color: rgba(mat-color($foreground-colors, base), .65), side-nav: app-generate-nav-theme($theme, $nav-theme), status: app-generate-status-theme($theme, $status-theme), subdued-color: $subdued, ansi-colors: $ansi-color-palette); // Pass the Material theme and the App Theme to components that need to be themed
   @include dialog-error-theme($theme, $app-theme);
   @include login-page-theme($theme, $app-theme);
   @include side-nav-theme($theme, $app-theme);
@@ -122,7 +96,6 @@ $side-nav-light-active: #484848;
   @include app-hyperlinks($theme, $app-theme);
   @include app-no-content-message-theme($theme, $app-theme);
   @include app-boolean-indicator-theme($theme, $app-theme);
-  @include cf-security-group-theme($theme);
   @include loading-page-theme($theme, $app-theme);
   @include app-log-viewer-theme($theme, $app-theme);
   @include app-deploy-app-theme($theme, $app-theme);
@@ -164,23 +137,3 @@ $side-nav-light-active: #484848;
   @include restore-endpoints-theme($theme, $app-theme);
   @include metrics-component-theme($theme, $app-theme);
 }
-
-@function app-generate-nav-theme($theme, $nav-theme: null) {
-  @if ($nav-theme) {
-    @return $nav-theme;
-  } @else {
-    // Use default palette for side navigation
-    @return (background: $side-nav-light-bg, background-top: $side-nav-light-bg, text: darken($side-nav-light-text, 10%), active: $side-nav-light-active, active-text: $side-nav-light-text, hover: $side-nav-light-hover, hover-text: $side-nav-light-text);
-  }
-}
-
-@function app-generate-status-theme($theme, $status-theme: null) {
-  @if ($status-theme) {
-    @return $status-theme;
-  } @else {
-    $warn: map-get($theme, warn);
-    $primary: map-get($theme, primary);
-    $white: #fff; // Use default palette for status
-    @return (success: map-get($mat-green, 500), warning: map-get($mat-orange, 500), danger: mat-color($warn), tentative: map-get($mat-grey, 500), busy: mat-color($primary), text: $white, info: map-get($mat-blue, 500));
-  }
-}
diff --git a/src/frontend/packages/core/sass/colors.scss b/src/frontend/packages/core/sass/colors.scss
deleted file mode 100644
index 75071fe6ba..0000000000
--- a/src/frontend/packages/core/sass/colors.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-// @import './suse-theme';
-$dark-grey: rgb(95, 95, 95);
-$middle-grey: rgb(167, 169, 172);
-$light-grey: rgb(220, 221, 222);
-// $blue: map-get($suse-blue, 500);
-
-// See here for palette info: https://github.com/angular/material2/blob/master/src/lib/core/theming/_palette.scss
diff --git a/src/frontend/packages/core/sass/theme.scss b/src/frontend/packages/core/sass/theme.scss
index 365cd4750e..11ba592a9f 100644
--- a/src/frontend/packages/core/sass/theme.scss
+++ b/src/frontend/packages/core/sass/theme.scss
@@ -1,45 +1,46 @@
 @import '~@angular/material/theming';
-@import './mat-themes';
 @import './all-theme';
-@import './mat-colors';
 
-// Custom theme support
-@import './custom';
+// Import the theme
+@import '~@stratosui/theme';
 
-body.stratos {
-  .dark-theme {
-    // Dark Theme defaults
-    $dark-primary: mat-palette($mat-blue);
-    $dark-accent: mat-palette($mat-amber, A400, A100, A700);
-    $dark-warn: mat-palette($mat-red);
-    $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
+$stratos-dark-theme-supported: false !default;
 
-    $stratos-dark-theme: $dark-theme !default;
-    $stratos-dark-nav-theme: null !default;
-    $stratos-dark-status-theme: null !default;
+// Themes - stratos-theme() function must be supplied by the theme
+$stratos-themes: stratos-theme();
 
-    @include angular-material-theme($stratos-dark-theme);
-    @include app-theme($stratos-dark-theme, $stratos-dark-nav-theme, $stratos-dark-status-theme);
+// stratos-theme() can return a single theme rather than a map of default and dark themes
+@if not map-has-key($stratos-themes, 'default') {
+  $tmp: $stratos-themes;
+  $stratos-themes: (
+    default: $tmp
+  )
+}
+
+// Import any custom scss that the theme defines
+@import '~@stratosui/theme/extensions';
+
+// Default theme ( = light theme)
+$stratos-theme: map-get($stratos-themes, default);
+$theme: map-get($stratos-theme, theme);
+
+@if map-has-key($stratos-themes, 'dark') {
+  $stratos-dark-theme-supported: true;
+  $dark-stratos-theme: map-get($stratos-themes, dark);
+  $dark-theme: map-get($dark-stratos-theme, theme);
+
+  body.stratos {
+    .dark-theme {
+      @include angular-material-theme($dark-theme);
+      @include app-theme($dark-stratos-theme);
+    }
   }
 }
 
 .default {
-  // Themes palettes and colors
-  $oss-theme-primary: mat-palette($mat-blue);
-  $oss-theme-accent: mat-palette($mat-blue);
-  $oss-theme-warn: mat-palette($mat-red);
-  $oss-theme: mat-light-theme($oss-theme-primary, $oss-theme-accent, $oss-theme-warn);
-
-  // Default to using the open source theme
-  $stratos-theme: $oss-theme !default;
-  $stratos-nav-theme: null !default;
-  $stratos-status-theme: null !default;
-
-  @include angular-material-theme($stratos-theme);
-  @include app-theme($stratos-theme, $stratos-nav-theme, $stratos-status-theme);
+  @include angular-material-theme($theme);
+  @include app-theme($stratos-theme);
 }
 
-$stratos-dark-theme-supported: true !default;
-
-// Create the theme
+// Import mat-core
 @include mat-core;
diff --git a/src/frontend/packages/core/src/app.component.ts b/src/frontend/packages/core/src/app.component.ts
index 542077cb5e..7e7be0556e 100644
--- a/src/frontend/packages/core/src/app.component.ts
+++ b/src/frontend/packages/core/src/app.component.ts
@@ -1,13 +1,13 @@
-import { AfterContentInit, Component, HostBinding, OnDestroy, OnInit, Inject } from '@angular/core';
+import { DOCUMENT } from '@angular/common';
+import { AfterContentInit, Component, HostBinding, Inject, OnDestroy, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { create } from 'rxjs-spy';
 
 import { AuthOnlyAppState } from '../../store/src/app-state';
-import { ThemeService } from './core/theme.service';
+import { ThemeService } from '../../store/src/theme.service';
 import { environment } from './environments/environment';
 import { LoggedInService } from './logged-in.service';
-import { DOCUMENT } from '@angular/common';
 
 @Component({
   selector: 'app-root',
diff --git a/src/frontend/packages/core/src/app.module.ts b/src/frontend/packages/core/src/app.module.ts
index 7ba9fb46a1..24bfcbbe56 100644
--- a/src/frontend/packages/core/src/app.module.ts
+++ b/src/frontend/packages/core/src/app.module.ts
@@ -4,40 +4,40 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { Params, RouteReuseStrategy, RouterStateSnapshot } from '@angular/router';
 import { DefaultRouterStateSerializer, RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router-store';
 import { Store } from '@ngrx/store';
+import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import { debounceTime, filter, withLatestFrom } from 'rxjs/operators';
 
 import { CfAutoscalerModule } from '../../cf-autoscaler/src/cf-autoscaler.module';
 import { CloudFoundryPackageModule } from '../../cloud-foundry/src/cloud-foundry-package.module';
 import { SetRecentlyVisitedEntityAction } from '../../store/src/actions/recently-visited.actions';
-import {
-  UpdateUserFavoriteMetadataAction,
-} from '../../store/src/actions/user-favourites-actions/update-user-favorite-metadata-action';
 import { GeneralEntityAppState, GeneralRequestDataState } from '../../store/src/app-state';
 import { EntityCatalogModule } from '../../store/src/entity-catalog.module';
 import { entityCatalog } from '../../store/src/entity-catalog/entity-catalog';
 import { EntityCatalogHelper } from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service';
 import { EntityCatalogHelpers } from '../../store/src/entity-catalog/entity-catalog.helper';
-import { endpointSchemaKey } from '../../store/src/helpers/entity-factory';
+import { FavoritesConfigMapper } from '../../store/src/favorite-config-mapper';
+import { endpointEntityType, STRATOS_ENDPOINT_TYPE } from '../../store/src/helpers/stratos-entity-factory';
 import { getAPIRequestDataState, selectEntity } from '../../store/src/selectors/api.selectors';
 import { internalEventStateSelector } from '../../store/src/selectors/internal-events.selectors';
 import { recentlyVisitedSelector } from '../../store/src/selectors/recently-visitied.selectors';
 import { AppStoreModule } from '../../store/src/store.module';
+import { stratosEntityCatalog } from '../../store/src/stratos-entity-catalog';
+import { generateStratosEntities } from '../../store/src/stratos-entity-generator';
 import { EndpointModel } from '../../store/src/types/endpoint.types';
 import { IFavoriteMetadata, UserFavorite } from '../../store/src/types/user-favorites.types';
+import { UserFavoriteManager } from '../../store/src/user-favorite-manager';
 import { TabNavService } from '../tab-nav.service';
 import { XSRFModule } from '../xsrf.module';
 import { AppComponent } from './app.component';
 import { RouteModule } from './app.routing';
-import { STRATOS_ENDPOINT_TYPE } from './base-entity-schemas';
-import { generateStratosEntities } from './base-entity-types';
 import { CoreModule } from './core/core.module';
 import { CustomizationService } from './core/customizations.types';
 import { DynamicExtensionRoutes } from './core/extension/dynamic-extension-routes';
 import { ExtensionService } from './core/extension/extension-service';
 import { getGitHubAPIURL, GITHUB_API_URL } from './core/github.helpers';
 import { CurrentUserPermissionsService } from './core/permissions/current-user-permissions.service';
-import { UserFavoriteManager } from './core/user-favorite-manager';
 import { CustomImportModule } from './custom-import.module';
+import { environment } from './environments/environment';
 import { AboutModule } from './features/about/about.module';
 import { DashboardModule } from './features/dashboard/dashboard.module';
 import { HomeModule } from './features/home/home.module';
@@ -46,7 +46,6 @@ import { NoEndpointsNonAdminComponent } from './features/no-endpoints-non-admin/
 import { SetupModule } from './features/setup/setup.module';
 import { LoggedInService } from './logged-in.service';
 import { CustomReuseStrategy } from './route-reuse-stragegy';
-import { FavoritesConfigMapper } from './shared/components/favorites-meta-card/favorite-config-mapper';
 import { endpointEventKey, GlobalEventData, GlobalEventService } from './shared/global-events.service';
 import { SidePanelService } from './shared/services/side-panel.service';
 import { SharedModule } from './shared/shared.module';
@@ -80,6 +79,18 @@ export class CustomRouterStateSerializer
   }
 }
 
+const storeDebugImports = environment.production ? [] : [
+  StoreDevtoolsModule.instrument({
+    maxAge: 100,
+    logOnly: !environment.production
+  })
+];
+
+@NgModule({
+  imports: storeDebugImports
+})
+class AppStoreDebugModule { }
+
 /**
  * `HttpXsrfTokenExtractor` which retrieves the token from a cookie.
  */
@@ -94,6 +105,7 @@ export class CustomRouterStateSerializer
     RouteModule,
     CloudFoundryPackageModule,
     AppStoreModule,
+    AppStoreDebugModule,
     BrowserModule,
     SharedModule,
     BrowserAnimationsModule,
@@ -159,7 +171,7 @@ export class AppModule {
           if (!backendErrors.length) {
             return res;
           }
-          const entityConfig = entityCatalog.getEntity(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
+          const entityConfig = entityCatalog.getEntity(STRATOS_ENDPOINT_TYPE, endpointEntityType);
           res.push(new GlobalEventData(true, {
             endpoint: selectEntity<EndpointModel>(entityConfig.entityKey, eventId)(state),
             count: backendErrors.length
@@ -248,7 +260,7 @@ export class AppModule {
 
   private syncFavorite(favorite: UserFavorite<IFavoriteMetadata>, entities: GeneralRequestDataState) {
     if (favorite) {
-      const isEndpoint = (favorite.entityType === endpointSchemaKey);
+      const isEndpoint = (favorite.entityType === endpointEntityType);
       // If the favorite is an endpoint ensure we look in the stratosEndpoint part of the store instead of, for example, cfEndpoint
       const entityKey = isEndpoint ? entityCatalog.getEntityKey({
         ...favorite,
@@ -258,10 +270,10 @@ export class AppModule {
       if (entity) {
         const newMetadata = this.favoritesConfigMapper.getEntityMetadata(favorite, entity);
         if (this.metadataHasChanged(favorite.metadata, newMetadata)) {
-          this.store.dispatch(new UpdateUserFavoriteMetadataAction({
+          stratosEntityCatalog.userFavorite.api.updateFavorite({
             ...favorite,
             metadata: newMetadata
-          }));
+          });
         }
       }
     }
diff --git a/src/frontend/packages/core/src/base-entity-schemas.ts b/src/frontend/packages/core/src/base-entity-schemas.ts
deleted file mode 100644
index 19da225c8b..0000000000
--- a/src/frontend/packages/core/src/base-entity-schemas.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import {
-  endpointSchemaKey,
-  entityFactory,
-  systemInfoSchemaKey,
-  userFavouritesSchemaKey,
-  userProfileSchemaKey,
-} from '../../store/src/helpers/entity-factory';
-import { EntitySchema } from '../../store/src/helpers/entity-schema';
-
-export const metricEntityType = 'metrics';
-
-export const STRATOS_ENDPOINT_TYPE = 'stratos';
-export const ENDPOINT_TYPE = 'endpoint';
-
-class StratosEntitySchema extends EntitySchema {
-  constructor(entityType: string) {
-    super(entityType, STRATOS_ENDPOINT_TYPE);
-  }
-}
-
-export const userFavoritesEntitySchema = new StratosEntitySchema(entityFactory(userFavouritesSchemaKey).entityType);
-export const endpointEntitySchema = new StratosEntitySchema(entityFactory(endpointSchemaKey).entityType);
-export const userProfileEntitySchema = new StratosEntitySchema(entityFactory(userProfileSchemaKey).entityType);
-export const systemInfoEntitySchema = new StratosEntitySchema(entityFactory(systemInfoSchemaKey).entityType);
diff --git a/src/frontend/packages/core/src/base-entity-types.ts b/src/frontend/packages/core/src/base-entity-types.ts
deleted file mode 100644
index 15cee657b0..0000000000
--- a/src/frontend/packages/core/src/base-entity-types.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import {
-  StratosCatalogEndpointEntity,
-  StratosCatalogEntity,
-} from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
-import {
-  addOrUpdateUserFavoriteMetadataReducer,
-  deleteUserFavoriteMetadataReducer,
-} from '../../store/src/reducers/favorite.reducer';
-import { systemEndpointsReducer } from '../../store/src/reducers/system-endpoints.reducer';
-import {
-  endpointEntitySchema,
-  STRATOS_ENDPOINT_TYPE,
-  systemInfoEntitySchema,
-  userFavoritesEntitySchema,
-  userProfileEntitySchema,
-} from './base-entity-schemas';
-import { BaseEndpointAuth } from './features/endpoints/endpoint-auth';
-import {
-  MetricsEndpointDetailsComponent,
-} from './features/metrics/metrics-endpoint-details/metrics-endpoint-details.component';
-
-//
-// These types are used to represent the base stratos types.
-//
-
-/**
- * This is used as a fake endpoint type to allow the store to be initiated correctly
- */
-const stratosType = {
-  logoUrl: '',
-  authTypes: [],
-  type: STRATOS_ENDPOINT_TYPE,
-  schema: null
-};
-
-/**
- * DefaultEndpointEntityType is used to represent a general endpoint
- * This should not be used to actually attempt to render an endpoint and is instead used as a way to fill the
- */
-class DefaultEndpointCatalogEntity extends StratosCatalogEntity {
-  constructor() {
-    super({
-      schema: endpointEntitySchema,
-      type: endpointEntitySchema.entityType,
-      endpoint: stratosType,
-    }, {
-      dataReducers: [
-        systemEndpointsReducer
-      ]
-    });
-  }
-}
-
-class UserFavoriteCatalogEntity extends StratosCatalogEntity {
-  constructor() {
-    super({
-      schema: userFavoritesEntitySchema,
-      type: userFavoritesEntitySchema.entityType,
-      endpoint: stratosType,
-    }, {
-      dataReducers: [
-        addOrUpdateUserFavoriteMetadataReducer,
-        deleteUserFavoriteMetadataReducer,
-      ]
-    });
-  }
-}
-
-class UserProfileCatalogEntity extends StratosCatalogEntity {
-  constructor() {
-    super({
-      schema: userProfileEntitySchema,
-      type: userProfileEntitySchema.entityType,
-      endpoint: stratosType,
-    });
-  }
-}
-
-class SystemInfoCatalogEntity extends StratosCatalogEntity {
-  constructor() {
-    super({
-      schema: systemInfoEntitySchema,
-      type: systemInfoEntitySchema.entityType,
-      endpoint: stratosType,
-    });
-  }
-}
-
-export function generateStratosEntities() {
-  return [
-    new DefaultEndpointCatalogEntity(),
-    new SystemInfoCatalogEntity(),
-    new UserFavoriteCatalogEntity(),
-    new UserProfileCatalogEntity(),
-    // TODO: metrics location to be sorted - STRAT-152
-    new StratosCatalogEndpointEntity({
-      type: 'metrics',
-      label: 'Metrics',
-      labelPlural: 'Metrics',
-      tokenSharing: true,
-      logoUrl: '/core/assets/endpoint-icons/metrics.svg',
-      authTypes: [BaseEndpointAuth.UsernamePassword, BaseEndpointAuth.None],
-      renderPriority: 1,
-      listDetailsComponent: MetricsEndpointDetailsComponent,
-    },
-      metadata => `/endpoints/metrics/${metadata.guid}`
-    )
-  ];
-}
-
diff --git a/src/frontend/packages/core/src/features/endpoints/endpoint-auth.ts b/src/frontend/packages/core/src/core/endpoint-auth.ts
similarity index 60%
rename from src/frontend/packages/core/src/features/endpoints/endpoint-auth.ts
rename to src/frontend/packages/core/src/core/endpoint-auth.ts
index 757b0677e5..0fa06e90d1 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoint-auth.ts
+++ b/src/frontend/packages/core/src/core/endpoint-auth.ts
@@ -1,9 +1,17 @@
-import { EndpointAuthTypeNames } from './endpoint-helpers';
 import { Validators } from '@angular/forms';
-import { EndpointType, EndpointAuthTypeConfig } from '../../core/extension/extension-types';
-import { CredentialsAuthFormComponent } from './connect-endpoint-dialog/auth-forms/credentials-auth-form.component';
-import { SSOAuthFormComponent } from './connect-endpoint-dialog/auth-forms/sso-auth-form.component';
-import { NoneAuthFormComponent } from './connect-endpoint-dialog/auth-forms/none-auth-form.component';
+
+import { EndpointAuthTypeConfig, EndpointType } from '../../../store/src/extension-types';
+import {
+  CredentialsAuthFormComponent,
+} from '../features/endpoints/connect-endpoint-dialog/auth-forms/credentials-auth-form.component';
+import { NoneAuthFormComponent } from '../features/endpoints/connect-endpoint-dialog/auth-forms/none-auth-form.component';
+import { SSOAuthFormComponent } from '../features/endpoints/connect-endpoint-dialog/auth-forms/sso-auth-form.component';
+
+export enum EndpointAuthTypeNames {
+  CREDS = 'creds',
+  SSO = 'sso',
+  NONE = 'none'
+}
 
 export abstract class BaseEndpointAuth {
   static readonly UsernamePassword = {
diff --git a/src/frontend/packages/core/src/core/endpoints.service.spec.ts b/src/frontend/packages/core/src/core/endpoints.service.spec.ts
index 006d10ccb7..3ac576abcd 100644
--- a/src/frontend/packages/core/src/core/endpoints.service.spec.ts
+++ b/src/frontend/packages/core/src/core/endpoints.service.spec.ts
@@ -1,8 +1,8 @@
 import { inject, TestBed } from '@angular/core/testing';
-
-import { CoreTestingModule } from '../../test-framework/core-test.modules';
 import { createBasicStoreModule } from '@stratosui/store/testing';
+
 import { PaginationMonitorFactory } from '../../../store/src/monitors/pagination-monitor.factory';
+import { CoreTestingModule } from '../../test-framework/core-test.modules';
 import { CoreModule } from './core.module';
 import { EndpointsService } from './endpoints.service';
 import { UtilsService } from './utils.service';
diff --git a/src/frontend/packages/core/src/core/endpoints.service.ts b/src/frontend/packages/core/src/core/endpoints.service.ts
index 7160d50652..6354590f8a 100644
--- a/src/frontend/packages/core/src/core/endpoints.service.ts
+++ b/src/frontend/packages/core/src/core/endpoints.service.ts
@@ -7,10 +7,11 @@ import { first, map, skipWhile, withLatestFrom } from 'rxjs/operators';
 import { RouterNav } from '../../../store/src/actions/router.actions';
 import { EndpointOnlyAppState, IRequestEntityTypeState } from '../../../store/src/app-state';
 import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
+import { EndpointHealthCheck } from '../../../store/src/entity-catalog/entity-catalog.types';
 import { AuthState } from '../../../store/src/reducers/auth.reducer';
 import { endpointEntitiesSelector, endpointStatusSelector } from '../../../store/src/selectors/endpoint.selectors';
 import { EndpointModel, EndpointState } from '../../../store/src/types/endpoint.types';
-import { EndpointHealthCheck, EndpointHealthChecks } from '../../endpoints-health-checks';
+import { EndpointHealthChecks } from '../../endpoints-health-checks';
 import { endpointHasMetricsByAvailable } from '../features/endpoints/endpoint-helpers';
 import { UserService } from './user.service';
 
diff --git a/src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.spec.ts b/src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.spec.ts
index 5aee8a1959..067a4e1f69 100644
--- a/src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.spec.ts
+++ b/src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.spec.ts
@@ -2,13 +2,13 @@ import { OverlayContainer } from '@angular/cdk/overlay';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { BehaviorSubject, of } from 'rxjs';
 
+import { FavoritesConfigMapper } from '../../../../store/src/favorite-config-mapper';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { IFavoriteMetadata, UserFavorite } from '../../../../store/src/types/user-favorites.types';
+import { UserFavoriteManager } from '../../../../store/src/user-favorite-manager';
 import { BaseTestModulesNoShared } from '../../../test-framework/core-test.helper';
 import { ConfirmationDialogService } from '../../shared/components/confirmation-dialog.service';
 import { DialogConfirmComponent } from '../../shared/components/dialog-confirm/dialog-confirm.component';
-import { FavoritesConfigMapper } from '../../shared/components/favorites-meta-card/favorite-config-mapper';
-import { UserFavoriteManager } from '../user-favorite-manager';
 import { EntityFavoriteStarComponent } from './entity-favorite-star.component';
 
 describe('EntityFavoriteStarComponent', () => {
diff --git a/src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.ts b/src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.ts
index 6487ce3708..c345e7d523 100644
--- a/src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.ts
+++ b/src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.ts
@@ -2,12 +2,12 @@ import { Component, Input } from '@angular/core';
 import { Observable } from 'rxjs';
 import { first, tap } from 'rxjs/operators';
 
+import { FavoritesConfigMapper } from '../../../../store/src/favorite-config-mapper';
 import { IFavoriteMetadata, UserFavorite } from '../../../../store/src/types/user-favorites.types';
+import { UserFavoriteManager } from '../../../../store/src/user-favorite-manager';
 import { ConfirmationDialogConfig } from '../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../shared/components/confirmation-dialog.service';
-import { FavoritesConfigMapper } from '../../shared/components/favorites-meta-card/favorite-config-mapper';
 import { EndpointsService } from '../endpoints.service';
-import { UserFavoriteManager } from '../user-favorite-manager';
 
 @Component({
   selector: 'app-entity-favorite-star',
diff --git a/src/frontend/packages/core/src/core/extension/extension-service.ts b/src/frontend/packages/core/src/core/extension/extension-service.ts
index 82b7a305ff..c71151f5b7 100644
--- a/src/frontend/packages/core/src/core/extension/extension-service.ts
+++ b/src/frontend/packages/core/src/core/extension/extension-service.ts
@@ -1,4 +1,4 @@
-import { Injectable, NgModule, ModuleWithProviders } from '@angular/core';
+import { Injectable, ModuleWithProviders, NgModule } from '@angular/core';
 import { ActivatedRoute, Route, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
@@ -6,6 +6,7 @@ import { Observable } from 'rxjs';
 import { AppState, GeneralEntityAppState } from '../../../../store/src/app-state';
 import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
 import { IPageSideNavTab } from '../../features/dashboard/page-side-nav/page-side-nav.component';
+import { CurrentUserPermissionsService } from '../permissions/current-user-permissions.service';
 
 export const extensionsActionRouteKey = 'extensionsActionsKey';
 
@@ -23,7 +24,12 @@ export interface StratosTabMetadata {
   link: string;
   icon?: string;
   iconFont?: string;
-  hidden?: (store: Store<AppState>, esf: EntityServiceFactory, activatedRoute: ActivatedRoute) => Observable<boolean>;
+  hidden?: (
+    store: Store<AppState>,
+    esf: EntityServiceFactory,
+    activatedRoute: ActivatedRoute,
+    cups: CurrentUserPermissionsService
+  ) => Observable<boolean>;
 }
 
 export interface StratosTabMetadataConfig extends StratosTabMetadata {
@@ -97,7 +103,7 @@ function addExtensionTab(tab: StratosTabType, target: any, props: StratosTabMeta
   });
   extensionMetadata.tabs[tab].push({
     ...props
-  });  
+  });
 }
 
 function addExtensionAction(action: StratosActionType, target: any, props: StratosActionMetadata) {
diff --git a/src/frontend/packages/core/src/core/logger.service.spec.ts b/src/frontend/packages/core/src/core/logger.service.spec.ts
index e2f904e060..1720fe0b84 100644
--- a/src/frontend/packages/core/src/core/logger.service.spec.ts
+++ b/src/frontend/packages/core/src/core/logger.service.spec.ts
@@ -1,7 +1,7 @@
 import { inject, TestBed } from '@angular/core/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratosui/store/testing';
 import { LoggerService } from './logger.service';
 
 describe('LoggerService', () => {
diff --git a/src/frontend/packages/core/src/core/permissions/current-user-permissions.config.ts b/src/frontend/packages/core/src/core/permissions/current-user-permissions.config.ts
index a91481dd62..9e08107255 100644
--- a/src/frontend/packages/core/src/core/permissions/current-user-permissions.config.ts
+++ b/src/frontend/packages/core/src/core/permissions/current-user-permissions.config.ts
@@ -1,3 +1,5 @@
+import { PermissionValues } from '../../../../store/src/selectors/current-user-role.selectors';
+
 export type PermissionConfigType = PermissionConfig[] | PermissionConfig | PermissionConfigLink;
 export interface IPermissionConfigs {
   [permissionString: string]: PermissionConfigType;
@@ -6,7 +8,6 @@ export interface IPermissionConfigs {
 export type PermissionTypes = string;
 export type CurrentUserPermissions = string;
 export type ScopeStrings = string;
-export type PermissionValues = string;
 export class PermissionConfig {
   constructor(
     public type: PermissionTypes,
diff --git a/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.spec.ts b/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.spec.ts
index e8e69c7782..90d5401db5 100644
--- a/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.spec.ts
+++ b/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.spec.ts
@@ -5,12 +5,12 @@ import { first, tap } from 'rxjs/operators';
 import { AppState } from '../../../../store/src/app-state';
 import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from '../../../../store/src/entity-catalog-test.module';
 import { EntityCatalogEntityConfig } from '../../../../store/src/entity-catalog/entity-catalog.types';
+import { endpointEntityType, stratosEntityFactory } from '../../../../store/src/helpers/stratos-entity-factory';
+import { generateStratosEntities } from '../../../../store/src/stratos-entity-generator';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { BaseEntityValues } from '../../../../store/src/types/entity.types';
 import { PaginationState } from '../../../../store/src/types/pagination.types';
 import { AppTestModule } from '../../../test-framework/core-test.helper';
-import { endpointEntitySchema } from '../../base-entity-schemas';
-import { generateStratosEntities } from '../../base-entity-types';
 import { PermissionConfig } from './current-user-permissions.config';
 import { CurrentUserPermissionsService } from './current-user-permissions.service';
 import { StratosPermissionStrings, StratosPermissionTypes, StratosScopeStrings } from './stratos-user-permissions.checker';
@@ -138,7 +138,7 @@ describe('CurrentUserPermissionsService', () => {
     // Create request and requestData sections
     const entityMap = new Map<EntityCatalogEntityConfig, Array<TestStoreEntity | string>>([
       [
-        endpointEntitySchema,
+        stratosEntityFactory(endpointEntityType),
         endpoints.map(endpoint => ({
           guid: endpoint.guid,
           data: endpoint
diff --git a/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.ts b/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.ts
index 0a7490fb0c..4ad096b7c5 100644
--- a/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.ts
+++ b/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.ts
@@ -4,10 +4,7 @@ import { combineLatest, Observable, of } from 'rxjs';
 import { distinctUntilChanged, map, switchMap } from 'rxjs/operators';
 
 import { InternalAppState } from '../../../../store/src/app-state';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
-import { selectEntity } from '../../../../store/src/selectors/api.selectors';
-import { EndpointModel } from '../../../../store/src/types/endpoint.types';
-import { ENDPOINT_TYPE, STRATOS_ENDPOINT_TYPE } from '../../base-entity-schemas';
+import { stratosEntityCatalog } from '../../../../store/src/stratos-entity-catalog';
 import { LoggerService } from '../logger.service';
 import {
   CurrentUserPermissions,
@@ -23,7 +20,7 @@ import {
 import { StratosUserPermissionsChecker } from './stratos-user-permissions.checker';
 
 
-export const CUSTOM_USER_PERMISSION_CHECKERS = 'custom_user_perm_checkers'
+export const CUSTOM_USER_PERMISSION_CHECKERS = 'custom_user_perm_checkers';
 
 @Injectable()
 export class CurrentUserPermissionsService {
@@ -38,7 +35,7 @@ export class CurrentUserPermissionsService {
     this.allCheckers = [
       new StratosUserPermissionsChecker(store),
       ...nullSafeCustomCheckers
-    ]
+    ];
   }
   /**
    * @param action The action we're going to check the user's access to.
@@ -56,13 +53,13 @@ export class CurrentUserPermissionsService {
   ): Observable<boolean> {
     let actionConfig;
     if (typeof action === 'string') {
-      let permConfigType = this.getPermissionConfig(action);
+      const permConfigType = this.getPermissionConfig(action);
       if (!permConfigType) {
         return of(false); // Logging handled in getPermissionConfig
       }
       actionConfig = this.getConfig(permConfigType);
     } else {
-      actionConfig = this.getConfig(action)
+      actionConfig = this.getConfig(action);
     }
     const obs$ = this.getCanObservable(actionConfig, endpointGuid, ...args);
     return obs$ ?
@@ -79,8 +76,7 @@ export class CurrentUserPermissionsService {
     } else if (actionConfig) {
       return this.getSimplePermission(actionConfig, endpointGuid, ...args);
     } else if (endpointGuid) {
-      const key = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, ENDPOINT_TYPE);
-      return this.store.select(selectEntity<EndpointModel>(key, endpointGuid)).pipe(
+      return stratosEntityCatalog.endpoint.store.getEntityMonitor(endpointGuid).entity$.pipe(
         switchMap(endpoint => endpoint ?
           this.getFallbackPermission(endpointGuid, endpoint.cnsi_type) :
           of(false)
@@ -96,7 +92,7 @@ export class CurrentUserPermissionsService {
       'permissions check',
       actionConfig.type,
       of(false)
-    )
+    );
   }
 
   private getComplexPermission(permissionConfig: PermissionConfig[], endpointGuid?: string, ...args: any[]) {
@@ -116,7 +112,7 @@ export class CurrentUserPermissionsService {
       [{
         checks: [of(false)]
       }]
-    )
+    );
   }
 
   private getConfig(config: PermissionConfigType, tries = 0): PermissionConfig[] | PermissionConfig {
@@ -152,7 +148,7 @@ export class CurrentUserPermissionsService {
       'fallback permission',
       'N/A',
       of(null)
-    )
+    );
   }
 
   private getPermissionConfig(key: CurrentUserPermissions): PermissionConfigType {
@@ -161,7 +157,7 @@ export class CurrentUserPermissionsService {
       'permissions checker',
       key,
       null
-    )
+    );
   }
 
   /**
diff --git a/src/frontend/packages/core/src/core/permissions/stratos-user-permissions.checker.ts b/src/frontend/packages/core/src/core/permissions/stratos-user-permissions.checker.ts
index a0bcb58695..db4c382b26 100644
--- a/src/frontend/packages/core/src/core/permissions/stratos-user-permissions.checker.ts
+++ b/src/frontend/packages/core/src/core/permissions/stratos-user-permissions.checker.ts
@@ -5,8 +5,9 @@ import { GeneralEntityAppState } from '../../../../store/src/app-state';
 import {
   getCurrentUserStratosHasScope,
   getCurrentUserStratosRole,
+  PermissionValues,
 } from '../../../../store/src/selectors/current-user-role.selectors';
-import { IPermissionConfigs, PermissionConfig, PermissionTypes, PermissionValues } from './current-user-permissions.config';
+import { IPermissionConfigs, PermissionConfig, PermissionTypes } from './current-user-permissions.config';
 import {
   BaseCurrentUserPermissionsChecker,
   IConfigGroups,
diff --git a/src/frontend/packages/core/src/core/stateful-icon/stateful-icon.component.spec.ts b/src/frontend/packages/core/src/core/stateful-icon/stateful-icon.component.spec.ts
index f258f527ae..1a8cd63bc7 100644
--- a/src/frontend/packages/core/src/core/stateful-icon/stateful-icon.component.spec.ts
+++ b/src/frontend/packages/core/src/core/stateful-icon/stateful-icon.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { StratosStatus } from '../../shared/shared.types';
+import { StratosStatus } from '../../../../store/src/types/shared.types';
 import { MDAppModule } from '../md.module';
 import { StatefulIconComponent } from './stateful-icon.component';
 
diff --git a/src/frontend/packages/core/src/core/stateful-icon/stateful-icon.component.ts b/src/frontend/packages/core/src/core/stateful-icon/stateful-icon.component.ts
index 5ad05aa35d..fdcd63847a 100644
--- a/src/frontend/packages/core/src/core/stateful-icon/stateful-icon.component.ts
+++ b/src/frontend/packages/core/src/core/stateful-icon/stateful-icon.component.ts
@@ -1,5 +1,6 @@
-import { Component, Input, OnInit, TemplateRef, ViewChild } from '@angular/core';
-import { StratosStatus } from '../../shared/shared.types';
+import { Component, Input, TemplateRef } from '@angular/core';
+
+import { StratosStatus } from '../../../../store/src/types/shared.types';
 
 interface IconDefinition {
   icon: string;
diff --git a/src/frontend/packages/core/src/core/user-profile.service.ts b/src/frontend/packages/core/src/core/user-profile.service.ts
index f83b16a256..0a496d3adc 100644
--- a/src/frontend/packages/core/src/core/user-profile.service.ts
+++ b/src/frontend/packages/core/src/core/user-profile.service.ts
@@ -1,24 +1,15 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { combineLatest, Observable, of as observableOf, of } from 'rxjs';
+import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
-import {
-  FetchUserProfileAction,
-  UpdateUserPasswordAction,
-  UpdateUserProfileAction,
-} from '../../../store/src/actions/user-profile.actions';
 import { AppState } from '../../../store/src/app-state';
-import { userProfilePasswordUpdatingKey } from '../../../store/src/effects/user-profile.effects';
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
 import { EntityService } from '../../../store/src/entity-service';
-import { EntityServiceFactory } from '../../../store/src/entity-service-factory.service';
-import { ActionState, getDefaultActionState, rootUpdatingKey } from '../../../store/src/reducers/api-request-reducer/types';
+import { ActionState, getDefaultActionState } from '../../../store/src/reducers/api-request-reducer/types';
 import { AuthState } from '../../../store/src/reducers/auth.reducer';
-import { selectRequestInfo, selectUpdateInfo } from '../../../store/src/selectors/api.selectors';
+import { stratosEntityCatalog } from '../../../store/src/stratos-entity-catalog';
 import { SessionData } from '../../../store/src/types/auth.types';
 import { UserProfileInfo, UserProfileInfoEmail, UserProfileInfoUpdates } from '../../../store/src/types/user-profile.types';
-import { userProfileEntitySchema } from '../base-entity-schemas';
 
 
 @Injectable()
@@ -32,21 +23,22 @@ export class UserProfileService {
 
   userProfile$: Observable<UserProfileInfo>;
 
-  private stratosUserConfig = entityCatalog.getEntity(userProfileEntitySchema.endpointType, userProfileEntitySchema.entityType);
+  private userGuid$: Observable<string>;
 
   constructor(
     private store: Store<AppState>,
-    esf: EntityServiceFactory
   ) {
-    if (!this.stratosUserConfig) {
-      console.error('Can not get user profile entity');
-      this.userProfile$ = of({} as UserProfileInfo);
-      return;
-    }
+    this.userGuid$ = this.store.select(s => s.auth).pipe(
+      filter((auth: AuthState) => !!(auth && auth.sessionData)),
+      map((auth: AuthState) => auth.sessionData),
+      filter((sessionData: SessionData) => !!sessionData.user),
+      first(),
+      map(data => data.user.guid)
+    );
 
-    this.entityService = this.createFetchUserAction().pipe(
+    this.entityService = this.userGuid$.pipe(
       first(),
-      map(action => esf.create<UserProfileInfo>(action.guid, action)),
+      map(userGuid => stratosEntityCatalog.userProfile.store.getEntityService(userGuid)),
       publishReplay(1),
       refCount()
     );
@@ -60,27 +52,16 @@ export class UserProfileService {
       switchMap(service => service.isFetchingEntity$)
     );
 
-    this.isError$ = this.store.select(selectRequestInfo(this.stratosUserConfig.entityKey, FetchUserProfileAction.guid)).pipe(
+    this.isError$ = this.entityService.pipe(
+      switchMap(es => es.entityMonitor.entityRequest$),
       filter(requestInfo => !!requestInfo && !requestInfo.fetching),
       map(requestInfo => requestInfo.error)
-    );
-  }
-
-  private createFetchUserAction(): Observable<FetchUserProfileAction> {
-    return this.store.select(s => s.auth).pipe(
-      filter((auth: AuthState) => !!(auth && auth.sessionData)),
-      map((auth: AuthState) => auth.sessionData),
-      filter((sessionData: SessionData) => !!sessionData.user),
-      first(),
-      map(data => new FetchUserProfileAction(data.user.guid))
-    );
+    )
   }
 
   fetchUserProfile() {
     // Once we have the user's guid, fetch their profile
-    this.createFetchUserAction().pipe(first()).subscribe(action => {
-      this.store.dispatch(action);
-    });
+    this.userGuid$.pipe(first()).subscribe(userGuid => stratosEntityCatalog.userProfile.api.get(userGuid));
   }
 
   getPrimaryEmailAddress(profile: UserProfileInfo): string {
@@ -135,11 +116,8 @@ export class UserProfileService {
     if (profileChanges.emailAddress) {
       this.setPrimaryEmailAddress(updatedProfile, profileChanges.emailAddress);
     }
-    this.store.dispatch(new UpdateUserProfileAction(updatedProfile, profileChanges.currentPassword));
-    const actionState = selectUpdateInfo(this.stratosUserConfig.entityKey,
-      FetchUserProfileAction.guid,
-      rootUpdatingKey);
-    return this.store.select(actionState).pipe(
+
+    return stratosEntityCatalog.userProfile.api.updateProfile<ActionState>(updatedProfile, profileChanges.currentPassword).pipe(
       filter(item => item && !item.busy)
     );
   }
@@ -149,11 +127,7 @@ export class UserProfileService {
       oldPassword: profileChanges.currentPassword,
       password: profileChanges.newPassword
     };
-    this.store.dispatch(new UpdateUserPasswordAction(profile.id, passwordUpdates));
-    const actionState = selectUpdateInfo(this.stratosUserConfig.entityKey,
-      FetchUserProfileAction.guid,
-      userProfilePasswordUpdatingKey);
-    return this.store.select(actionState).pipe(
+    return stratosEntityCatalog.userProfile.api.updatePassword<ActionState>(profile.id, passwordUpdates).pipe(
       filter(item => item && !item.busy)
     );
   }
diff --git a/src/frontend/packages/core/src/core/user.service.spec.ts b/src/frontend/packages/core/src/core/user.service.spec.ts
index 6fdaab8b3a..f831c61b18 100644
--- a/src/frontend/packages/core/src/core/user.service.spec.ts
+++ b/src/frontend/packages/core/src/core/user.service.spec.ts
@@ -1,7 +1,7 @@
 import { inject, TestBed } from '@angular/core/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratosui/store/testing';
 import { SharedModule } from '../shared/shared.module';
 import { CoreModule } from './core.module';
 import { UserService } from './user.service';
diff --git a/src/frontend/packages/core/src/core/utils.service.ts b/src/frontend/packages/core/src/core/utils.service.ts
index 83de981544..d3d1c3f837 100644
--- a/src/frontend/packages/core/src/core/utils.service.ts
+++ b/src/frontend/packages/core/src/core/utils.service.ts
@@ -11,56 +11,6 @@ export function getIdFromRoute(activatedRoute: ActivatedRoute, id: string) {
   return null;
 }
 
-export type OptionalKeys<T extends object> = Exclude<{
-  [K in keyof T]: T extends Record<K, T[K]>
-  ? K
-  : never
-}[keyof T], undefined>
-
-
-export type NonOptionalKeys<T extends object> = Exclude<{
-  [K in keyof T]: T extends Record<K, T[K]>
-  ? K
-  : never
-}[keyof T], undefined>
-
-export type NeverKeys<T extends object> = Exclude<{
-  [K in keyof T]: T[K] extends never
-  ? K
-  : never
-}[keyof T], undefined>
-
-
-/**
- * Remove keys such as typed indexes  (i.e. [key: string])
- * For magic see
- *  - https://github.com/Microsoft/TypeScript/issues/25987#issuecomment-441224690
- *  - https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-414808995
- */
-export type KnownKeys<T> = {
-  [K in keyof T]: string extends K ? never : number extends K ? never : K
-} extends { [_ in keyof T]: infer U } ? ({} extends U ? never : U) : never;
-
-/**
- * Pick all properties who's function has the specified return type U
- */
-export type FilteredByReturnType<T extends { [key: string]: (...args: any[]) => any }, U> = {
-  [P in keyof T]: ReturnType<T[P]> extends U ? T[P] : never
-};
-
-/**
- * Pick all properties who's function do not have the specified return type U
- */
-export type FilteredByNotReturnType<T extends { [key: string]: (...args: any[]) => any }, U> = {
-  [P in keyof T]: ReturnType<T[P]> extends U ? never : T[P]
-};
-
-// Note - Adding }[keyof T] to [P in keyof T] types should filter out properties of type `never`, however this fails with generics!
-export type FilteredByValueType<T extends { [key: string]: (...args: any[]) => any }, U> = {
-  [P in keyof T]: T[P] extends U ? never : T[P]
-};
-
-
 export const urlValidationExpression =
   '^' +
   // protocol identifier
@@ -319,13 +269,6 @@ export const safeUnsubscribe = (...subs: Subscription[]) => {
 export const truthyIncludingZero = (obj: any): boolean => !!obj || obj === 0;
 export const truthyIncludingZeroString = (obj: any): string => truthyIncludingZero(obj) ? obj.toString() : null;
 
-export const sortStringify = (obj: { [key: string]: string | string[] | number }): string => {
-  const keys = Object.keys(obj).sort();
-  return keys.reduce((res, key) => {
-    return res += `${key}-${obj[key]},`;
-  }, '');
-};
-
 /**
  * Real basic, shallow check
  */
diff --git a/src/frontend/packages/core/misc/custom/custom.module.ts_ b/src/frontend/packages/core/src/custom-import.module.ts
similarity index 57%
rename from src/frontend/packages/core/misc/custom/custom.module.ts_
rename to src/frontend/packages/core/src/custom-import.module.ts
index b4118c293d..3d84d8fdec 100644
--- a/src/frontend/packages/core/misc/custom/custom.module.ts_
+++ b/src/frontend/packages/core/src/custom-import.module.ts
@@ -2,7 +2,8 @@ import { NgModule } from '@angular/core';
 
 // Default empty customization module - DO NOT EDIT
 
-// This file is in the .gitignore - changes will not be flagged
+// These modules will be intercepted by the custom webpack configuration
+// They are only here so that on a fresh checkout, both modules are defined
 
 @NgModule()
 export class CustomImportModule { }
diff --git a/src/frontend/packages/core/src/environments/environment.prod.ts b/src/frontend/packages/core/src/environments/environment.prod.ts
index 651a68d984..da8e7d8dbd 100644
--- a/src/frontend/packages/core/src/environments/environment.prod.ts
+++ b/src/frontend/packages/core/src/environments/environment.prod.ts
@@ -1,10 +1,11 @@
+import { cfAPIVersion, proxyAPIVersion } from '../../../store/src/jetstream';
 import { LogLevel } from './../../../store/src/actions/log.actions';
 
 export const environment = {
   production: true,
   logLevel: LogLevel.WARN,
-  proxyAPIVersion: 'v1',
-  cfAPIVersion: 'v2',
+  proxyAPIVersion,
+  cfAPIVersion,
   logToConsole: true,
   logEnableConsoleActions: false,
   showObsDebug: false,
diff --git a/src/frontend/packages/core/src/environments/environment.ts b/src/frontend/packages/core/src/environments/environment.ts
index bb1db6f839..e10f7527a5 100644
--- a/src/frontend/packages/core/src/environments/environment.ts
+++ b/src/frontend/packages/core/src/environments/environment.ts
@@ -1,4 +1,5 @@
 import { LogLevel } from '../../../store/src/actions/log.actions';
+import { cfAPIVersion, proxyAPIVersion } from '../../../store/src/jetstream';
 
 // The file contents for the current environment will overwrite these during build.
 // The build system defaults to the dev environment which uses `environment.ts`, but if you do
@@ -7,8 +8,8 @@ import { LogLevel } from '../../../store/src/actions/log.actions';
 
 export const environment = {
   production: false,
-  proxyAPIVersion: 'v1',
-  cfAPIVersion: 'v2',
+  proxyAPIVersion,
+  cfAPIVersion,
   logLevel: LogLevel.DEBUG,
   logToConsole: true,
   logEnableConsoleActions: false,
diff --git a/src/frontend/packages/core/src/features/about/about.module.ts b/src/frontend/packages/core/src/features/about/about.module.ts
index c71cd11f55..9fe18f06af 100644
--- a/src/frontend/packages/core/src/features/about/about.module.ts
+++ b/src/frontend/packages/core/src/features/about/about.module.ts
@@ -5,8 +5,7 @@ import { SharedModule } from '../../shared/shared.module';
 import { AboutPageComponent } from './about-page/about-page.component';
 import { AboutRoutingModule } from './about.routing';
 import { DiagnosticsPageComponent } from './diagnostics-page/diagnostics-page.component';
-import { EulaPageComponent, EulaPageContentComponent } from './eula-page/eula-page.component';
-
+import { EulaPageComponent } from './eula-page/eula-page.component';
 
 
 @NgModule({
@@ -17,7 +16,6 @@ import { EulaPageComponent, EulaPageContentComponent } from './eula-page/eula-pa
   ],
   declarations: [
     AboutPageComponent,
-    EulaPageContentComponent,
     EulaPageComponent,
     DiagnosticsPageComponent
   ]
diff --git a/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.html b/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.html
index 27791db6f3..3a40946d0b 100644
--- a/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.html
+++ b/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.html
@@ -8,4 +8,4 @@ <h1>EULA</h1>
         </span>
     </div>
 </app-page-header>
-<app-eula-content></app-eula-content>
\ No newline at end of file
+<div [innerHtml]='eulaHtml'></div>
diff --git a/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.spec.ts b/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.spec.ts
index 20023d114b..113aac37d3 100644
--- a/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.spec.ts
@@ -1,3 +1,5 @@
+import { HttpClientModule } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
@@ -5,7 +7,7 @@ import { createBasicStoreModule } from '@stratosui/store/testing';
 import { TabNavService } from '../../../../tab-nav.service';
 import { CoreModule } from '../../../core/core.module';
 import { SharedModule } from '../../../shared/shared.module';
-import { EulaPageComponent, EulaPageContentComponent } from './eula-page.component';
+import { EulaPageComponent } from './eula-page.component';
 
 describe('EulaPageComponent', () => {
   let component: EulaPageComponent;
@@ -13,11 +15,13 @@ describe('EulaPageComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [EulaPageComponent, EulaPageContentComponent],
+      declarations: [EulaPageComponent],
       imports: [
         CoreModule,
         RouterTestingModule,
         SharedModule,
+        HttpClientModule,
+        HttpClientTestingModule,
         createBasicStoreModule(),
       ],
       providers: [TabNavService]
diff --git a/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.ts b/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.ts
index 8271e24c66..a93e345bf3 100644
--- a/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.ts
+++ b/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.ts
@@ -1,17 +1,12 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-eula-content',
-  templateUrl: '../../../../assets/eula.html'
-})
-export class EulaPageContentComponent { }
+import { Component } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
 
 @Component({
   selector: 'app-eula-page',
   templateUrl: './eula-page.component.html',
   styleUrls: ['./eula-page.component.scss']
 })
-export class EulaPageComponent implements OnInit {
+export class EulaPageComponent {
 
   public breadcrumbs = [
     {
@@ -19,10 +14,14 @@ export class EulaPageComponent implements OnInit {
     }
   ];
 
-  constructor() { }
-
-  ngOnInit() {
+  public eulaHtml = '';
 
+  // Load the EULA
+  constructor(http: HttpClient) {
+    http.get('/core/assets/eula.html', {responseType: 'text'}).subscribe(
+      html => this.eulaHtml = html,
+      () => this.eulaHtml = 'An error occurred retrieving the EULA'
+    );
   }
 
 }
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
index d212cac3c2..26a2d129ce 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
@@ -1,4 +1,3 @@
-@import '../../../../sass/colors';
 @import '../../../../sass/mixins';
 
 $app-sub-header-height: 48px;
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts
index c409c37976..8310e6723e 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts
@@ -9,11 +9,11 @@ import { distinctUntilChanged, filter, map, startWith, withLatestFrom } from 'rx
 
 import { CloseSideNav, DisableMobileNav, EnableMobileNav } from '../../../../../store/src/actions/dashboard-actions';
 import { GetCurrentUsersRelations } from '../../../../../store/src/actions/permissions.actions';
-import { GetUserFavoritesAction } from '../../../../../store/src/actions/user-favourites-actions/get-user-favorites-action';
 import { DashboardOnlyAppState } from '../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { DashboardState } from '../../../../../store/src/reducers/dashboard-reducer';
 import { selectDashboardState } from '../../../../../store/src/selectors/dashboard.selectors';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
 import { TabNavService } from '../../../../tab-nav.service';
 import { CustomizationService } from '../../../core/customizations.types';
 import { EndpointsService } from '../../../core/endpoints.service';
@@ -144,7 +144,7 @@ export class DashboardBaseComponent implements OnInit, OnDestroy, AfterViewInit
     });
 
     this.dispatchRelations();
-    this.store.dispatch(new GetUserFavoritesAction());
+    stratosEntityCatalog.userFavorite.api.getAll();
   }
 
   ngOnDestroy() {
@@ -190,7 +190,7 @@ export class DashboardBaseComponent implements OnInit, OnDestroy, AfterViewInit
           link: path + '/' + route.path
         };
         if (item.requiresEndpointType) {
-          // Upstream always likes to show Cloud Foundry related endpoints - other distributions can chane this behaviour
+          // Upstream always likes to show Cloud Foundry related endpoints - other distributions can change this behaviour
           const alwaysShow = this.cs.get().alwaysShowNavForEndpointTypes ?
             this.cs.get().alwaysShowNavForEndpointTypes(item.requiresEndpointType) : (item.requiresEndpointType === 'cf');
           item.hidden = alwaysShow ? of(false) : this.endpointsService.doesNotHaveConnectedEndpointType(item.requiresEndpointType);
diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts
index a91f4bd200..b74dbed831 100644
--- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts
+++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts
@@ -4,12 +4,15 @@ import { Store } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
 
 import { AppState } from '../../../../../store/src/app-state';
+import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { selectIsMobile } from '../../../../../store/src/selectors/dashboard.selectors';
 import { TabNavService } from '../../../../tab-nav.service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { StratosTabMetadata } from '../../../core/extension/extension-service';
+import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { IBreadcrumb } from '../../../shared/components/breadcrumbs/breadcrumbs.types';
 
+
+
 export interface IPageSideNavTab extends StratosTabMetadata {
   hidden$?: Observable<boolean>;
 }
@@ -28,7 +31,7 @@ export class PageSideNavComponent implements OnInit {
     }
     this.pTabs = tabs.map(tab => ({
       ...tab,
-      hidden$: tab.hidden$ || (tab.hidden ? tab.hidden(this.store, this.esf, this.activatedRoute) : of(false))
+      hidden$: tab.hidden$ || (tab.hidden ? tab.hidden(this.store, this.esf, this.activatedRoute, this.cups) : of(false))
     }));
   }
   get tabs(): IPageSideNavTab[] {
@@ -45,6 +48,7 @@ export class PageSideNavComponent implements OnInit {
     private store: Store<AppState>,
     private esf: EntityServiceFactory,
     private activatedRoute: ActivatedRoute,
+    private cups: CurrentUserPermissionsService
   ) {
     this.isMobile$ = this.store.select(selectIsMobile);
   }
diff --git a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.theme.scss b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.theme.scss
index 7c2b8a671e..e4023c6b4c 100644
--- a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.theme.scss
+++ b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.theme.scss
@@ -4,6 +4,17 @@
   $side-nav-colors: map-get($app-theme, side-nav);
   $side-nav-bottom-color: map-get($app-theme, subdued-color);
   $side-nav-hover-color: mat-color($side-nav-colors, hover);
+  $header-span: map-get($app-theme, header-background-span);
+
+  $side-nav-top-background: map-get($side-nav-colors, background);
+  $side-nav-top-foreground: map-get($side-nav-colors, text);
+
+  // Does the header background color span across the top, or is the sidenav background color used for the top-left portion
+  @if $header-span == true {
+    $side-nav-top-background: map-get($app-theme, header-background-color);
+    $side-nav-top-foreground: map-get($app-theme, header-foreground-color);
+  }
+
   .side-nav {
     &__nav-toggle {
       color: mat-color($side-nav-colors, text);
@@ -12,7 +23,8 @@
       background-color: mat-color($side-nav-colors, background);
     }
     &__top {
-      background-color: mat-color($side-nav-colors, background-top);
+      background-color: $side-nav-top-background;
+      color: $side-nav-top-foreground;
     }
     &__item {
       color: mat-color($side-nav-colors, text);
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
index 5251a66479..2aee2629c1 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
@@ -5,9 +5,9 @@ import { BehaviorSubject, Observable } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
 import { GeneralEntityAppState } from '../../../../../store/src/app-state';
+import { BrowserStandardEncoder } from '../../../../../store/src/browser-encoder';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
-import { BrowserStandardEncoder } from '../../../helper';
 import {
   BackupEndpointConfigUI,
   BackupEndpointConnectionTypes,
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
index 3ad6856b48..9c41ea8a3d 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
@@ -1,17 +1,13 @@
 import { Component } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { Store } from '@ngrx/store';
 import * as moment from 'moment';
 import { Observable, of, Subject } from 'rxjs';
 import { filter, first, map } from 'rxjs/operators';
 
-import { GetAllEndpoints } from '../../../../../../store/src/actions/endpoint.actions';
-import { AppState } from '../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
-import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { httpErrorResponseToSafeString } from '../../../../../../store/src/jetstream';
+import { stratosEntityCatalog } from '../../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
-import { httpErrorResponseToSafeString } from '../../../../jetstream.helpers';
 import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../shared/components/confirmation-dialog.service';
 import { ITableListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source-types';
@@ -74,8 +70,6 @@ export class BackupEndpointsComponent {
 
   constructor(
     public service: BackupEndpointsService,
-    private store: Store<AppState>,
-    private paginationMonitorFactory: PaginationMonitorFactory,
     private confirmDialog: ConfirmationDialogService,
   ) {
     this.setupSelectStep();
@@ -84,17 +78,7 @@ export class BackupEndpointsComponent {
 
 
   setupSelectStep() {
-    const action = new GetAllEndpoints();
-    const endpointObs = getPaginationObservables<EndpointModel>({
-      store: this.store,
-      action,
-      paginationMonitor: this.paginationMonitorFactory.create(
-        action.paginationKey,
-        action,
-        true
-      )
-    }, true);
-
+    const endpointObs = stratosEntityCatalog.endpoint.store.getAll.getPaginationService();
 
     const endpoints$ = endpointObs.entities$.pipe(
       filter(entities => !!entities),
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
index 8fa35048c1..38dee43257 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
@@ -5,10 +5,10 @@ import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { filter, map, switchMap } from 'rxjs/operators';
 
 import { GeneralEntityAppState } from '../../../../../store/src/app-state';
+import { BrowserStandardEncoder } from '../../../../../store/src/browser-encoder';
 import { selectSessionData } from '../../../../../store/src/reducers/auth.reducer';
 import { SessionData } from '../../../../../store/src/types/auth.types';
 import { LoggerService } from '../../../core/logger.service';
-import { BrowserStandardEncoder } from '../../../helper';
 
 interface BackupContent {
   payload: string;
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
index c3483dca50..3ddca26bd4 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
@@ -5,10 +5,10 @@ import { Store } from '@ngrx/store';
 import { Observable, of, Subject } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
-import { GetAllEndpoints } from '../../../../../../store/src/actions/endpoint.actions';
 import { GeneralEntityAppState } from '../../../../../../store/src/app-state';
+import { httpErrorResponseToSafeString } from '../../../../../../store/src/jetstream';
+import { stratosEntityCatalog } from '../../../../../../store/src/stratos-entity-catalog';
 import { getEventFiles } from '../../../../core/browser-helper';
-import { httpErrorResponseToSafeString } from '../../../../jetstream.helpers';
 import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../shared/components/confirmation-dialog.service';
 import { StepOnNextFunction, StepOnNextResult } from '../../../../shared/components/stepper/step/step.component';
@@ -79,7 +79,7 @@ export class RestoreEndpointsComponent {
     };
 
     const restoreSuccess = () => {
-      this.store.dispatch(new GetAllEndpoints());
+      stratosEntityCatalog.endpoint.api.getAll()
       result.next({
         success: true,
         redirect: true,
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/credentials-auth-form.component.ts b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/credentials-auth-form.component.ts
index cdf3c405d0..b585c0ab96 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/credentials-auth-form.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/credentials-auth-form.component.ts
@@ -1,6 +1,7 @@
-import { FormGroup } from '@angular/forms';
 import { Component, Input } from '@angular/core';
-import { IAuthForm } from '../../../../core/extension/extension-types';
+import { FormGroup } from '@angular/forms';
+
+import { IAuthForm } from '../../../../../../store/src/extension-types';
 
 @Component({
   selector: 'app-credentials-auth-form',
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/none-auth-form.component.ts b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/none-auth-form.component.ts
index c76f5a954c..3b6bb325ee 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/none-auth-form.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/none-auth-form.component.ts
@@ -1,6 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { IAuthForm } from '../../../../core/extension/extension-types';
+
+import { IAuthForm } from '../../../../../../store/src/extension-types';
 
 @Component({
   selector: 'app-none-auth-form',
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/sso-auth-form.component.ts b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/sso-auth-form.component.ts
index bdac43f89e..83243a24ec 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/sso-auth-form.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/sso-auth-form.component.ts
@@ -1,6 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { IAuthForm } from '../../../../core/extension/extension-types';
+
+import { IAuthForm } from '../../../../../../store/src/extension-types';
 
 @Component({
   selector: 'app-sso-auth-form',
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts
index 3d0f72fa4c..3a56bdbc23 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts
@@ -1,13 +1,11 @@
 import { Component, Inject, OnDestroy } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { Store } from '@ngrx/store';
 import { Subscription } from 'rxjs';
 
-import { ShowSnackBar } from '../../../../../store/src/actions/snackBar.actions';
-import { EndpointOnlyAppState } from '../../../../../store/src/app-state';
 import { EndpointsService } from '../../../core/endpoints.service';
 import { MarkdownPreviewComponent } from '../../../shared/components/markdown-preview/markdown-preview.component';
 import { SidePanelService } from '../../../shared/services/side-panel.service';
+import { SnackBarService } from '../../../shared/services/snackbar.service';
 import { ConnectEndpointConfig, ConnectEndpointService } from '../connect.service';
 
 
@@ -27,14 +25,14 @@ export class ConnectEndpointDialogComponent implements OnDestroy {
   constructor(
     public dialogRef: MatDialogRef<ConnectEndpointDialogComponent>,
     @Inject(MAT_DIALOG_DATA) public data: ConnectEndpointConfig,
-    private store: Store<EndpointOnlyAppState>,
     endpointsService: EndpointsService,
     private sidePanelService: SidePanelService,
+    private snackBarService: SnackBarService,
   ) {
-    this.connectService = new ConnectEndpointService(store, endpointsService, data);
+    this.connectService = new ConnectEndpointService(endpointsService, data);
 
     this.hasConnected = this.connectService.hasConnected$.subscribe(() => {
-      this.store.dispatch(new ShowSnackBar(`Connected endpoint '${this.data.name}'`));
+      this.snackBarService.show(`Connected endpoint '${this.data.name}'`);
       this.dialogRef.close();
     });
   }
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.ts b/src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.ts
index fc355c4928..0f6bc94595 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.ts
@@ -13,13 +13,12 @@ import {
 } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
 
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
-import { EndpointAuthTypeConfig, IAuthForm, IEndpointAuthComponent } from '../../../core/extension/extension-types';
+import { EndpointAuthTypeConfig, IAuthForm, IEndpointAuthComponent } from '../../../../../store/src/extension-types';
+import { BaseEndpointAuth } from '../../../core/endpoint-auth';
 import { safeUnsubscribe } from '../../../core/utils.service';
 import { ConnectEndpointConfig, ConnectEndpointData, ConnectEndpointService } from '../connect.service';
-import { BaseEndpointAuth } from '../endpoint-auth';
 
 @Component({
   selector: 'app-connect-endpoint',
diff --git a/src/frontend/packages/core/src/features/endpoints/connect.service.ts b/src/frontend/packages/core/src/features/endpoints/connect.service.ts
index d4e9dac73d..2ad24a7196 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect.service.ts
@@ -1,4 +1,3 @@
-import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of, Subject, Subscription } from 'rxjs';
 import {
   delay,
@@ -13,18 +12,12 @@ import {
 } from 'rxjs/operators';
 
 import { AuthParams, ConnectEndpoint } from '../../../../store/src/actions/endpoint.actions';
-import { GetSystemInfo } from '../../../../store/src/actions/system.actions';
-import { EndpointOnlyAppState } from '../../../../store/src/app-state';
-import { EndpointsEffect } from '../../../../store/src/effects/endpoint.effects';
-import { SystemEffects } from '../../../../store/src/effects/system.effects';
 import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
-import { endpointSchemaKey } from '../../../../store/src/helpers/entity-factory';
+import { EndpointType } from '../../../../store/src/extension-types';
 import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
-import { selectEntity, selectRequestInfo, selectUpdateInfo } from '../../../../store/src/selectors/api.selectors';
+import { stratosEntityCatalog } from '../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
-import { STRATOS_ENDPOINT_TYPE } from '../../base-entity-schemas';
 import { EndpointsService } from '../../core/endpoints.service';
-import { EndpointType } from '../../core/extension/extension-types';
 import { safeUnsubscribe } from '../../core/utils.service';
 
 export interface ConnectEndpointConfig {
@@ -65,15 +58,12 @@ export class ConnectEndpointService {
   private hasAttemptedConnect: boolean;
   private pData: ConnectEndpointData;
 
-  private endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
-
   // We need a delay to ensure the BE has finished registering the endpoint.
   // If we don't do this and if we're quick enough, we can navigate to the application page
   // and end up with an empty list where we should have results.
   private connectDelay = 1000;
 
   constructor(
-    private store: Store<EndpointOnlyAppState>,
     private endpointsService: EndpointsService,
     public config: ConnectEndpointConfig,
   ) {
@@ -87,33 +77,29 @@ export class ConnectEndpointService {
     ).subscribe(([oldVal, newVal]) => {
       if (!newVal.error && (oldVal.busy && !newVal.busy)) {
         // Has finished fetching
-        this.store.dispatch(new GetSystemInfo());
+        stratosEntityCatalog.endpoint.api.get(this.config.guid);
       }
     }));
 
     this.subs.push(this.connected$.pipe(
-      filter(([connected]) => connected),
+      filter(([isConnected]) => isConnected),
       delay(this.connectDelay),
       tap(() => this.hasConnected.next(true)),
-      distinctUntilChanged(([connected], [oldConnected]) => connected && oldConnected),
-    ).subscribe(([connected, endpoint]) => this.endpointsService.checkEndpoint(endpoint))
+      distinctUntilChanged(([isConnected], [oldIsConnected]) => isConnected && oldIsConnected),
+    ).subscribe(([, endpoint]) => this.endpointsService.checkEndpoint(endpoint))
     );
   }
 
   private setupObservables() {
-    this.update$ = this.store.select(
-      this.getUpdateSelector()
-    ).pipe(filter(update => !!update));
+    this.update$ = stratosEntityCatalog.endpoint.store.getEntityMonitor(this.config.guid).getUpdatingSection(ConnectEndpoint.UpdatingKey)
+      .pipe(filter(update => !!update));
 
-    this.fetchingInfo$ = this.store.select(
-      this.getRequestSelector()
-    ).pipe(
+    this.fetchingInfo$ = stratosEntityCatalog.endpoint.store.getEntityMonitor(this.config.guid).entityRequest$.pipe(
       filter(request => !!request),
-      map(request => request.fetching));
+      map(request => request.fetching)
+    );
 
-    this.connected$ = this.store.select(
-      this.getEntitySelector()
-    ).pipe(
+    this.connected$ = stratosEntityCatalog.endpoint.store.getEntityMonitor(this.config.guid).entity$.pipe(
       map(endpoint => {
         const isConnected = !!(endpoint && endpoint.api_endpoint && endpoint.user);
         return [isConnected, endpoint] as [boolean, EndpointModel];
@@ -149,28 +135,6 @@ export class ConnectEndpointService {
     );
   }
 
-  private getUpdateSelector() {
-    return selectUpdateInfo(
-      this.endpointEntityKey,
-      this.config.guid,
-      EndpointsEffect.connectingKey
-    );
-  }
-
-  private getRequestSelector() {
-    return selectRequestInfo(
-      this.endpointEntityKey,
-      SystemEffects.guid
-    );
-  }
-
-  private getEntitySelector() {
-    return selectEntity<EndpointModel>(
-      this.endpointEntityKey,
-      this.config.guid,
-    );
-  }
-
   public setData(data: ConnectEndpointData) {
     this.pData = data;
   }
@@ -179,25 +143,21 @@ export class ConnectEndpointService {
     this.hasAttemptedConnect = true;
     const { authType, authVal, systemShared, bodyContent } = this.pData;
 
-    this.store.dispatch(new ConnectEndpoint(
+    return stratosEntityCatalog.endpoint.api.connect<ActionState>(
       this.config.guid,
       this.config.type,
       authType,
       authVal,
       systemShared,
       bodyContent,
-    ));
-
-    return this.isBusy$.pipe(
+    ).pipe(
       pairwise(),
-      filter(([oldBusy, newBusy]) => {
-        return !(oldBusy === true && newBusy === false);
-      }),
-      withLatestFrom(this.update$),
-      map(([, updateSection]) => ({
+      filter(([oldV, newV]) => oldV.busy && !newV.busy),
+      map(([, newV]) => newV),
+      map(updateSection => ({
         success: !updateSection.error,
         errorMessage: updateSection.message
-      }))
+      })),
     );
   }
 
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.ts
index a046dc6b62..96bca56f21 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.ts
@@ -1,27 +1,21 @@
 import { AfterContentInit, Component, Input, ViewChild } from '@angular/core';
 import { NgForm, NgModel } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
-import { denormalize } from 'normalizr';
 import { Observable } from 'rxjs';
-import { filter, map, pairwise, withLatestFrom } from 'rxjs/operators';
+import { filter, map, pairwise } from 'rxjs/operators';
 
-import { GetAllEndpoints, RegisterEndpoint } from '../../../../../../store/src/actions/endpoint.actions';
-import { ShowSnackBar } from '../../../../../../store/src/actions/snackBar.actions';
-import { GeneralEntityAppState } from '../../../../../../store/src/app-state';
-import { EndpointsEffect } from '../../../../../../store/src/effects/endpoint.effects';
+import { getFullEndpointApiUrl } from '../../../../../../store/src/endpoint-utils';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import {
   StratosCatalogEndpointEntity,
 } from '../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
-import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
-import { getAPIRequestDataState, selectUpdateInfo } from '../../../../../../store/src/selectors/api.selectors';
-import { selectPaginationState } from '../../../../../../store/src/selectors/pagination.selectors';
-import { endpointEntitySchema, STRATOS_ENDPOINT_TYPE } from '../../../../base-entity-schemas';
+import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import { stratosEntityCatalog } from '../../../../../../store/src/stratos-entity-catalog';
 import { getIdFromRoute } from '../../../../core/utils.service';
 import { IStepperStep, StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
+import { SnackBarService } from '../../../../shared/services/snackbar.service';
 import { ConnectEndpointConfig } from '../../connect.service';
-import { getFullEndpointApiUrl, getSSOClientRedirectURI } from '../../endpoint-helpers';
+import { getSSOClientRedirectURI } from '../../endpoint-helpers';
 
 /* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/
 @Component({
@@ -58,23 +52,16 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
   endpointTypeSupportsSSO = false;
   endpoint: StratosCatalogEndpointEntity;
 
-  private endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
-
-  constructor(private store: Store<GeneralEntityAppState>, activatedRoute: ActivatedRoute, ) {
-
-    this.existingEndpoints = store.select(selectPaginationState(this.endpointEntityKey, GetAllEndpoints.storeKey))
-      .pipe(
-        withLatestFrom(store.select(getAPIRequestDataState)),
-        map(([pagination, entities]) => {
-          const pages = Object.values(pagination.ids);
-          const page = [].concat.apply([], pages);
-          const endpoints = page.length ? denormalize(page, [endpointEntitySchema], entities) : [];
-          return {
-            names: endpoints.map(ep => ep.name),
-            urls: endpoints.map(ep => getFullEndpointApiUrl(ep)),
-          };
-        })
-      );
+  constructor(
+    activatedRoute: ActivatedRoute,
+    private snackBarService: SnackBarService
+  ) {
+    this.existingEndpoints = stratosEntityCatalog.endpoint.store.getAll.getPaginationMonitor().currentPage$.pipe(
+      map(endpoints => ({
+        names: endpoints.map(ep => ep.name),
+        urls: endpoints.map(ep => getFullEndpointApiUrl(ep)),
+      }))
+    );
 
     const epType = getIdFromRoute(activatedRoute, 'type');
     const epSubType = getIdFromRoute(activatedRoute, 'subtype');
@@ -87,7 +74,7 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
 
   onNext: StepOnNextFunction = () => {
     const { subType, type } = this.endpoint.getTypeAndSubtype();
-    const action = new RegisterEndpoint(
+    return stratosEntityCatalog.endpoint.api.register<ActionState>(
       type,
       subType,
       this.nameField.value,
@@ -96,15 +83,8 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
       this.clientIDField ? this.clientIDField.value : '',
       this.clientSecretField ? this.clientSecretField.value : '',
       this.ssoAllowedField ? !!this.ssoAllowedField.value : false,
-    );
-
-    this.store.dispatch(action);
-
-    const update$ = this.store.select(
-      this.getUpdateSelector(action.guid())
-    ).pipe(filter(update => !!update));
-
-    return update$.pipe(pairwise(),
+    ).pipe(
+      pairwise(),
       filter(([oldVal, newVal]) => (oldVal.busy && !newVal.busy)),
       map(([oldVal, newVal]) => newVal),
       map(result => {
@@ -116,7 +96,7 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
           ssoAllowed: this.ssoAllowedField ? !!this.ssoAllowedField.value : false
         };
         if (!result.error) {
-          this.store.dispatch(new ShowSnackBar(`Successfully registered '${this.nameField.value}'`));
+          this.snackBarService.show(`Successfully registered '${this.nameField.value}'`);
         }
         const success = !result.error;
         return {
@@ -129,13 +109,6 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
     );
   }
 
-  private getUpdateSelector(guid) {
-    return selectUpdateInfo(
-      this.endpointEntityKey,
-      guid,
-      EndpointsEffect.registeringKey,
-    );
-  }
 
   ngAfterContentInit() {
     this.validate = this.form.statusChanges.pipe(
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts
index 9fc5b74dee..7be71e52aa 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts
@@ -1,9 +1,7 @@
 import { Component, OnDestroy } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { EndpointOnlyAppState } from '../../../../../../store/src/app-state';
 import { EndpointsService } from '../../../../core/endpoints.service';
 import { MarkdownPreviewComponent } from '../../../../shared/components/markdown-preview/markdown-preview.component';
 import { IStepperStep, StepOnNextResult } from '../../../../shared/components/stepper/step/step.component';
@@ -26,7 +24,6 @@ export class CreateEndpointConnectComponent implements OnDestroy, IStepperStep {
   public doConnect = false;
 
   constructor(
-    private store: Store<EndpointOnlyAppState>,
     private endpointsService: EndpointsService,
     private sidePanelService: SidePanelService,
   ) {
@@ -37,7 +34,7 @@ export class CreateEndpointConnectComponent implements OnDestroy, IStepperStep {
   }
 
   onEnter = (data: ConnectEndpointConfig) => {
-    this.connectService = new ConnectEndpointService(this.store, this.endpointsService, data);
+    this.connectService = new ConnectEndpointService(this.endpointsService, data);
   }
 
   onNext = (): Observable<StepOnNextResult> => this.doConnect ? this.connectService.submit().pipe(
diff --git a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts
index 1376e3e6b7..cb6120b12e 100644
--- a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts
@@ -1,21 +1,19 @@
 import { Component, OnDestroy } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { filter, first, map, pairwise, switchMap } from 'rxjs/operators';
 
-import { AppState } from '../../../../../../store/src/app-state';
+import { getFullEndpointApiUrl } from '../../../../../../store/src/endpoint-utils';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
-import { selectUpdateInfo } from '../../../../../../store/src/selectors/api.selectors';
+import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import { stratosEntityCatalog } from '../../../../../../store/src/stratos-entity-catalog';
 import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
-import { getFullEndpointApiUrl, getSSOClientRedirectURI } from '../../endpoint-helpers';
-import { UpdateEndpoint } from './../../../../../../store/src/actions/endpoint.actions';
+import { getSSOClientRedirectURI } from '../../endpoint-helpers';
 import {
   EntityCatalogSchemas,
   IStratosEndpointDefinition,
 } from './../../../../../../store/src/entity-catalog/entity-catalog.types';
-import { endpointEntitiesSelector } from './../../../../../../store/src/selectors/endpoint.selectors';
 import { EndpointModel } from './../../../../../../store/src/types/endpoint.types';
 import { getIdFromRoute, safeUnsubscribe } from './../../../../core/utils.service';
 import { IStepperStep } from './../../../../shared/components/stepper/step/step.component';
@@ -41,12 +39,11 @@ export class EditEndpointStepComponent implements OnDestroy, IStepperStep {
   existingEndpoints: Observable<EndpointModelMap>;
   endpoint$: Observable<EndpointModel>;
   definition$: Observable<IStratosEndpointDefinition<EntityCatalogSchemas>>;
-  existingEndpoinNames$: Observable<string[]>;
+  existingEndpointNames$: Observable<string[]>;
   formChangeSub: Subscription;
   setClientInfo = false;
 
   constructor(
-    private store: Store<AppState>,
     activatedRoute: ActivatedRoute,
   ) {
     this.editEndpoint = new FormGroup({
@@ -65,9 +62,14 @@ export class EditEndpointStepComponent implements OnDestroy, IStepperStep {
 
     this.endpointID = getIdFromRoute(activatedRoute, 'id');
 
-    this.existingEndpoints = this.store.select(endpointEntitiesSelector);
+    this.existingEndpoints = stratosEntityCatalog.endpoint.store.getAll.getPaginationMonitor().currentPage$.pipe(
+      map(endpoints => endpoints.reduce((res, endpoint) => {
+        res[endpoint.guid] = endpoint;
+        return res;
+      }, {}))
+    );
 
-    this.existingEndpoinNames$ = this.existingEndpoints.pipe(
+    this.existingEndpointNames$ = this.existingEndpoints.pipe(
       map(endpoints => Object.values(endpoints).filter((ep: EndpointModel) => ep.guid !== this.endpointID)),
       map((endpoints: EndpointModel[]) => endpoints.map(ep => ep.name))
     );
@@ -127,20 +129,19 @@ export class EditEndpointStepComponent implements OnDestroy, IStepperStep {
     return this.endpoint$.pipe(
       first(),
       switchMap(endpoint => {
-        const action = new UpdateEndpoint(
-          endpoint.cnsi_type,
+        return stratosEntityCatalog.endpoint.api.update<ActionState>(
           this.endpointID,
-          this.editEndpoint.value.name,
-          this.editEndpoint.value.skipSSL,
-          this.editEndpoint.value.setClientInfo,
-          this.editEndpoint.value.clientID,
-          this.editEndpoint.value.clientSecret,
-          this.editEndpoint.value.allowSSO,
-        );
-
-        this.store.dispatch(action);
-
-        return this.store.select(selectUpdateInfo('stratosEndpoint', this.endpointID, 'updating')).pipe(
+          this.endpointID, {
+          endpointType: endpoint.cnsi_type,
+          id: this.endpointID,
+          name: this.editEndpoint.value.name,
+          skipSSL: this.editEndpoint.value.skipSSL,
+          setClientInfo: this.editEndpoint.value.setClientInfo,
+          clientID: this.editEndpoint.value.clientID,
+          clientSecret: this.editEndpoint.value.clientSecret,
+          allowSSO: this.editEndpoint.value.allowSSO,
+        }
+        ).pipe(
           pairwise(),
           filter(([oldV, newV]) => oldV.busy && !newV.busy),
           map(([, newV]) => newV),
diff --git a/src/frontend/packages/core/src/features/endpoints/endpoint-helpers.ts b/src/frontend/packages/core/src/features/endpoints/endpoint-helpers.ts
index 39d567fe8b..10b9a13fff 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoint-helpers.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoint-helpers.ts
@@ -11,10 +11,6 @@ import {
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { EndpointListDetailsComponent } from '../../shared/components/list/list-types/endpoint/endpoint-list.helpers';
 
-export function getFullEndpointApiUrl(endpoint: EndpointModel) {
-  return endpoint && endpoint.api_endpoint ?
-    `${endpoint.api_endpoint.Scheme}://${endpoint.api_endpoint.Host}${endpoint.api_endpoint.Path}` : 'Unknown';
-}
 
 export function getEndpointUsername(endpoint: EndpointModel) {
   return endpoint && endpoint.user ? endpoint.user.name : '-';
@@ -27,12 +23,6 @@ export interface EndpointIcon {
   font: string;
 }
 
-export enum EndpointAuthTypeNames {
-  CREDS = 'creds',
-  SSO = 'sso',
-  NONE = 'none'
-}
-
 // Any initial endpointTypes listDetailsComponent should be added here
 export const coreEndpointListDetailsComponents: Type<EndpointListDetailsComponent>[] = [];
 
diff --git a/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts b/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts
index 7992db8c39..9ecf211ded 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts
@@ -10,7 +10,6 @@ import {
   ViewChild,
   ViewContainerRef,
 } from '@angular/core';
-import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
 import { Store } from '@ngrx/store';
 import { combineLatest, Subscription } from 'rxjs';
 import { delay, first, map, tap } from 'rxjs/operators';
@@ -32,6 +31,7 @@ import {
   EndpointsListConfigService,
 } from '../../../shared/components/list/list-types/endpoint/endpoints-list-config.service';
 import { ListConfig } from '../../../shared/components/list/list.component.types';
+import { SnackBarService } from '../../../shared/services/snackbar.service';
 
 @Component({
   selector: 'app-endpoints-page',
@@ -49,7 +49,6 @@ export class EndpointsPageComponent implements AfterViewInit, OnDestroy, OnInit
   @ViewChild('customNoEndpoints', { read: ViewContainerRef, static: true }) customNoEndpointsContainer;
   customContentComponentRef: ComponentRef<any>;
 
-  private snackBarRef: MatSnackBarRef<SimpleSnackBar>;
   private snackBarText = {
     message: `There are no connected endpoints, connect with your personal credentials to get started.`,
     action: 'Got it'
@@ -62,7 +61,7 @@ export class EndpointsPageComponent implements AfterViewInit, OnDestroy, OnInit
     public store: Store<EndpointOnlyAppState>,
     private ngZone: NgZone,
     private resolver: ComponentFactoryResolver,
-    private snackBar: MatSnackBar,
+    private snackBarService: SnackBarService,
     cs: CustomizationService
   ) {
     this.customizations = cs.get();
@@ -103,10 +102,10 @@ export class EndpointsPageComponent implements AfterViewInit, OnDestroy, OnInit
   }
 
   private showSnackBar(show: boolean) {
-    if (!this.snackBarRef && show) {
-      this.snackBarRef = this.snackBar.open(this.snackBarText.message, this.snackBarText.action, { duration: 20000 });
-    } else if (this.snackBarRef && !show) {
-      this.snackBarRef.dismiss();
+    if (show) {
+      this.snackBarService.show(this.snackBarText.message, this.snackBarText.action, 20000);
+    } else {
+      this.snackBarService.hide();
     }
   }
 
diff --git a/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.ts b/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.ts
index 9b6ab439b4..a404433a5e 100644
--- a/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.ts
+++ b/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.ts
@@ -7,14 +7,13 @@ import { first, map, withLatestFrom } from 'rxjs/operators';
 
 import { SendClearEndpointEventsAction } from '../../../../../store/src/actions/internal-events.actions';
 import { AppState } from '../../../../../store/src/app-state';
-import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
-import { EntityMonitor } from '../../../../../store/src/monitors/entity-monitor';
+import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { InternalEventMonitorFactory } from '../../../../../store/src/monitors/internal-event-monitor.factory';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { InternalEventState } from '../../../../../store/src/types/internal-events.types';
 import { getPreviousRoutingState } from '../../../../../store/src/types/routing.type';
-import { endpointEntitySchema } from '../../../base-entity-schemas';
-import { StratosStatus } from '../../../shared/shared.types';
+import { StratosStatus } from '../../../../../store/src/types/shared.types';
 import { eventReturnUrlParam } from '../../event-page/events-page/events-page.component';
 
 @Component({
@@ -36,13 +35,8 @@ export class ErrorPageComponent implements OnInit {
   ngOnInit() {
     const endpointId = this.activatedRoute.snapshot.params.endpointId;
     if (endpointId) {
-      const endpointMonitor = new EntityMonitor<EndpointModel>(
-        this.store,
-        endpointId,
-        endpointEntitySchema.key,
-        endpointEntitySchema
-      );
-      const cfEndpointEventMonitor = this.internalEventMonitorFactory.getMonitor(endpointSchemaKey, of([endpointId]));
+      const endpointMonitor = stratosEntityCatalog.endpoint.store.getEntityMonitor(endpointId);
+      const cfEndpointEventMonitor = this.internalEventMonitorFactory.getMonitor(endpointEntityType, of([endpointId]));
       this.errorDetails$ = cfEndpointEventMonitor.hasErroredOverTimeNoPoll(30).pipe(
         withLatestFrom(endpointMonitor.entity$),
         map(([errors, endpoint]) => {
diff --git a/src/frontend/packages/core/src/features/home/home/home-page.component.ts b/src/frontend/packages/core/src/features/home/home/home-page.component.ts
index 1c3a977d31..6700b83fa3 100644
--- a/src/frontend/packages/core/src/features/home/home/home-page.component.ts
+++ b/src/frontend/packages/core/src/features/home/home/home-page.component.ts
@@ -5,12 +5,12 @@ import { first, map } from 'rxjs/operators';
 
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
 import { AppState, IRequestEntityTypeState } from '../../../../../store/src/app-state';
+import { EntityCatalogHelpers } from '../../../../../store/src/entity-catalog/entity-catalog.helper';
 import { IUserFavoritesGroups } from '../../../../../store/src/types/favorite-groups.types';
 import { UserFavorite } from '../../../../../store/src/types/user-favorites.types';
+import { UserFavoriteManager } from '../../../../../store/src/user-favorite-manager';
 import { EndpointsService } from '../../../core/endpoints.service';
 import { LoggerService } from '../../../core/logger.service';
-import { UserFavoriteManager } from '../../../core/user-favorite-manager';
-import { EntityCatalogHelpers } from '../../../../../store/src/entity-catalog/entity-catalog.helper';
 
 @Component({
   selector: 'app-home-page',
diff --git a/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts b/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts
index fc31d4b577..72dfa2d0c1 100644
--- a/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts
+++ b/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts
@@ -1,7 +1,8 @@
 import { Observable, of as observableOf } from 'rxjs';
 
-import { StratosStatus } from '../../shared/shared.types';
-import { EndpointIcon, getFullEndpointApiUrl } from '../endpoints/endpoint-helpers';
+import { getFullEndpointApiUrl } from '../../../../store/src/endpoint-utils';
+import { StratosStatus } from '../../../../store/src/types/shared.types';
+import { EndpointIcon } from '../endpoints/endpoint-helpers';
 import { entityCatalog } from './../../../../store/src/entity-catalog/entity-catalog';
 import { MetricsEndpointProvider } from './services/metrics-service';
 
diff --git a/src/frontend/packages/core/src/features/metrics/services/metrics-service.ts b/src/frontend/packages/core/src/features/metrics/services/metrics-service.ts
index 9e9076acea..e9391d7fae 100644
--- a/src/frontend/packages/core/src/features/metrics/services/metrics-service.ts
+++ b/src/frontend/packages/core/src/features/metrics/services/metrics-service.ts
@@ -2,12 +2,11 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map, publishReplay, refCount } from 'rxjs/operators';
 
+import { getFullEndpointApiUrl } from '../../../../../store/src/endpoint-utils';
 import { PaginationMonitor } from '../../../../../store/src/monitors/pagination-monitor';
-import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
-import { endpointListKey, EndpointModel } from '../../../../../store/src/types/endpoint.types';
-import { endpointEntitySchema } from '../../../base-entity-schemas';
-import { getFullEndpointApiUrl } from '../../endpoints/endpoint-helpers';
+import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 
 export interface MetricsEndpointProvider {
   provider: EndpointModel;
@@ -22,14 +21,8 @@ export class MetricsService {
   haveNoMetricsEndpoints$: Observable<boolean>;
   haveNoConnectedMetricsEndpoints$: Observable<boolean>;
 
-  constructor(
-    private paginationMonitorFactory: PaginationMonitorFactory
-  ) {
-    this.endpointsMonitor = this.paginationMonitorFactory.create(
-      endpointListKey,
-      endpointEntitySchema,
-      true
-    );
+  constructor() {
+    this.endpointsMonitor = stratosEntityCatalog.endpoint.store.getPaginationMonitor()
 
     this.setupObservables();
   }
diff --git a/src/frontend/packages/core/src/features/setup/setup.module.ts b/src/frontend/packages/core/src/features/setup/setup.module.ts
index cd9593967a..c730116607 100644
--- a/src/frontend/packages/core/src/features/setup/setup.module.ts
+++ b/src/frontend/packages/core/src/features/setup/setup.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 
+import { ThemeService } from '../../../../store/src/theme.service';
 import { CoreModule } from '../../core/core.module';
-import { ThemeService } from '../../core/theme.service';
 import { SharedModule } from '../../shared/shared.module';
 import { DomainMismatchComponent } from './domain-mismatch/domain-mismatch.component';
 import { LocalAccountWizardComponent } from './local-account-wizard/local-account-wizard.component';
diff --git a/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.ts b/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.ts
index 54194241ee..75aa2b69bf 100644
--- a/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.ts
+++ b/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.ts
@@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms';
 import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material/core';
 import { Subscription } from 'rxjs';
-import { first, map, take, tap } from 'rxjs/operators';
+import { delay, first, map, take, tap } from 'rxjs/operators';
 
 import { UserProfileInfo, UserProfileInfoUpdates } from '../../../../../store/src/types/user-profile.types';
 import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
@@ -119,8 +119,7 @@ export class EditProfileInfoComponent implements OnInit, OnDestroy {
         updates[key] = this.editProfileForm.value[key];
       }
     }
-    const obs$ = this.userProfileService.updateProfile(this.profile, updates);
-    return obs$.pipe(
+    return this.userProfileService.updateProfile(this.profile, updates).pipe(
       take(1),
       map(([profileResult, passwordResult]) => {
         const okay = !profileResult.error && !passwordResult.error;
@@ -131,6 +130,7 @@ export class EditProfileInfoComponent implements OnInit, OnDestroy {
           message: okay ? '' : `An error occurred whilst updating your profile: ${message}`
         };
       }),
+      delay(300), // Ensure that the profile is updated before fetching to refresh local copy
       tap(() => this.userProfileService.fetchUserProfile())
     );
   }
diff --git a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.ts b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.ts
index d5984a3886..915ecd6aea 100644
--- a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.ts
+++ b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.ts
@@ -6,8 +6,8 @@ import { map } from 'rxjs/operators';
 import { SetPollingEnabledAction, SetSessionTimeoutAction } from '../../../../../store/src/actions/dashboard-actions';
 import { DashboardOnlyAppState } from '../../../../../store/src/app-state';
 import { selectDashboardState } from '../../../../../store/src/selectors/dashboard.selectors';
+import { ThemeService } from '../../../../../store/src/theme.service';
 import { UserProfileInfo } from '../../../../../store/src/types/user-profile.types';
-import { ThemeService } from '../../../core/theme.service';
 import { UserProfileService } from '../../../core/user-profile.service';
 import { UserService } from '../../../core/user.service';
 import { SetGravatarEnabledAction } from './../../../../../store/src/actions/dashboard-actions';
diff --git a/src/frontend/packages/core/misc/custom/index.html b/src/frontend/packages/core/src/index.html
similarity index 95%
rename from src/frontend/packages/core/misc/custom/index.html
rename to src/frontend/packages/core/src/index.html
index b6c415d27c..5756ba3e60 100644
--- a/src/frontend/packages/core/misc/custom/index.html
+++ b/src/frontend/packages/core/src/index.html
@@ -11,7 +11,7 @@
   <meta name="stratos_git_branch" content="@@stratos_git_branch@@">
   <meta name="stratos_git_commit" content="@@stratos_git_commit@@">  
   <meta name="stratos_build_date" content="@@stratos_build_date@@">
-  <link rel="icon" type="image/x-icon" href="core/favicon.ico">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
   <noscript>
     <style>
       .stratos {
diff --git a/src/frontend/packages/core/src/jetstream.helpers.ts b/src/frontend/packages/core/src/jetstream.helpers.ts
index 1a29978099..7de9c29e1e 100644
--- a/src/frontend/packages/core/src/jetstream.helpers.ts
+++ b/src/frontend/packages/core/src/jetstream.helpers.ts
@@ -1,72 +1,4 @@
 import { HttpErrorResponse } from '@angular/common/http';
 
-/**
- * Actual error response from stratos
- */
-export interface JetStreamErrorResponse<T = any> {
-  error: {
-    status: string;
-    statusCode: number;
-  };
-  /**
-   * Actual response from proxied endpoint
-   */
-  errorResponse: T;
-}
+import { isHttpErrorResponse, JetStreamErrorResponse } from '../../store/src/jetstream';
 
-export function isJetstreamError(err: any): JetStreamErrorResponse {
-  return !!(
-    err &&
-    err.error &&
-    err.error.status &&
-    err.error.statusCode &&
-    'errorResponse' in err
-  ) ? err as JetStreamErrorResponse : null;
-}
-
-// TODO It would be nice if the BE could return a unique para for us to check for. #3827
-// There is always a chance that this will return a false positive (more so with extensions).
-export function hasJetStreamError(pages: Partial<JetStreamErrorResponse>[]): JetStreamErrorResponse {
-  if (!pages || !pages.length) {
-    return null;
-  }
-  return pages.find(page => {
-    return isJetstreamError(page);
-  }) as JetStreamErrorResponse;
-}
-
-export function jetStreamErrorResponseToSafeString(response: JetStreamErrorResponse): string {
-  return response.error && response.error.status && response.error.statusCode ?
-    `${response.error.status}. Status Code ${response.error.statusCode}` :
-    null;
-}
-
-export function isHttpErrorResponse(obj: any): HttpErrorResponse {
-  const props = Object.keys(obj);
-  return (
-    props.indexOf('error') >= 0 &&
-    props.indexOf('headers') >= 0 &&
-    props.indexOf('ok') >= 0 &&
-    props.indexOf('status') >= 0 &&
-    props.indexOf('statusText') >= 0 &&
-    props.indexOf('url') >= 0
-  ) ? obj as HttpErrorResponse : null;
-}
-
-/**
- * Attempt to create a sensible string explaining the error object returned from a failed http request
- * @param err The raw error from a http request
- */
-export function httpErrorResponseToSafeString(err: any): string {
-  const httpResponse: HttpErrorResponse = isHttpErrorResponse(err);
-  if (httpResponse) {
-    if (httpResponse.error) {
-      if (typeof (httpResponse.error) === 'string') {
-        return httpResponse.error + ` (${httpResponse.status})`;
-      }
-      return httpResponse.error.error + ` (${httpResponse.status})`;
-    }
-    return JSON.stringify(httpResponse.error) + ` (${httpResponse.status})`;
-  }
-  return err.message;
-}
diff --git a/src/frontend/packages/core/src/public-api.ts b/src/frontend/packages/core/src/public-api.ts
new file mode 100644
index 0000000000..7da417a02d
--- /dev/null
+++ b/src/frontend/packages/core/src/public-api.ts
@@ -0,0 +1,19 @@
+/*
+ * Public API Surface of core
+ */
+
+// export * from './app.module';
+
+// Extensions
+export * from './core/extension/extension-service';
+
+// Customization
+export * from './core/customizations.types';
+
+// Modules
+export * from './core/core.module';
+export * from './core/md.module';
+export * from './shared/shared.module';
+
+// LoginPageComponent
+export { LoginPageComponent } from './features/login/login-page/login-page.component';
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.spec.ts b/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.spec.ts
index d5e18bd988..571f14e1ee 100644
--- a/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { endpointEntityType, stratosEntityFactory } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { BaseTestModules } from '../../../../test-framework/core-test.helper';
-import { endpointEntitySchema } from '../../../base-entity-schemas';
 import { AppActionMonitorIconComponent } from './app-action-monitor-icon.component';
 
 describe('AppActionMonitorIconComponent', () => {
@@ -21,7 +21,7 @@ describe('AppActionMonitorIconComponent', () => {
     fixture = TestBed.createComponent(AppActionMonitorIconComponent);
     component = fixture.componentInstance;
     component.id = '1';
-    component.schema = endpointEntitySchema;
+    component.schema = stratosEntityFactory(endpointEntityType);
     fixture.detectChanges();
   });
 
diff --git a/src/frontend/packages/core/src/shared/components/application-state/application-state-icon/application-state-icon.component.ts b/src/frontend/packages/core/src/shared/components/application-state/application-state-icon/application-state-icon.component.ts
index 0172efd67e..32c02fe9ca 100644
--- a/src/frontend/packages/core/src/shared/components/application-state/application-state-icon/application-state-icon.component.ts
+++ b/src/frontend/packages/core/src/shared/components/application-state/application-state-icon/application-state-icon.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 
-import { StratosStatus } from '../../../shared.types';
+import { StratosStatus } from '../../../../../../store/src/types/shared.types';
 
 
 @Component({
diff --git a/src/frontend/packages/core/src/shared/components/application-state/application-state.component.ts b/src/frontend/packages/core/src/shared/components/application-state/application-state.component.ts
index f548f70336..635c090751 100644
--- a/src/frontend/packages/core/src/shared/components/application-state/application-state.component.ts
+++ b/src/frontend/packages/core/src/shared/components/application-state/application-state.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
-import { StratosStatus, StratosStatusMetadata } from '../../shared.types';
+import { StratosStatus, StratosStatusMetadata } from '../../../../../store/src/types/shared.types';
 
 @Component({
   selector: 'app-application-state',
diff --git a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.ts b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.ts
index ca4bfcbc57..f0170d28b4 100644
--- a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.ts
+++ b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.ts
@@ -4,8 +4,8 @@ import { BehaviorSubject } from 'rxjs';
 
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
 import { AppState } from '../../../../../../store/src/app-state';
+import { StratosStatus } from '../../../../../../store/src/types/shared.types';
 import { UtilsService } from '../../../../core/utils.service';
-import { StratosStatus } from '../../../shared.types';
 import { determineCardStatus } from '../card-status/card-status.component';
 
 @Component({
diff --git a/src/frontend/packages/core/src/shared/components/cards/card-status/card-status.component.ts b/src/frontend/packages/core/src/shared/components/cards/card-status/card-status.component.ts
index 7fa6a0607c..eb41e0c7b0 100644
--- a/src/frontend/packages/core/src/shared/components/cards/card-status/card-status.component.ts
+++ b/src/frontend/packages/core/src/shared/components/cards/card-status/card-status.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { StratosStatus } from '../../../shared.types';
+import { StratosStatus } from '../../../../../../store/src/types/shared.types';
 
 
 export function determineCardStatus(value: number, limit: number): StratosStatus {
diff --git a/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts b/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts
index d0ea51b21d..06800db5f3 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts
+++ b/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts
@@ -2,8 +2,8 @@ import { Component, Input, OnInit } from '@angular/core';
 import { combineLatest, Observable, ReplaySubject, Subject } from 'rxjs';
 import { distinctUntilChanged, map, scan, startWith } from 'rxjs/operators';
 
-import { IFavoriteEntity } from '../../../core/user-favorite-manager';
-import { FavoritesConfigMapper, IFavoriteTypes } from '../favorites-meta-card/favorite-config-mapper';
+import { FavoritesConfigMapper, IFavoriteTypes } from '../../../../../store/src/favorite-config-mapper';
+import { IFavoriteEntity } from '../../../../../store/src/types/user-favorite-manager.types';
 
 
 @Component({
diff --git a/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.ts b/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.ts
index ffd96652f0..f8313df5a2 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.ts
+++ b/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.ts
@@ -5,12 +5,9 @@ import { map } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
 import { getFavoriteInfoObservable } from '../../../../../store/src/helpers/store-helpers';
-import {
-  IFavoriteEntity,
-  IFavoritesInfo,
-  IGroupedFavorites,
-  UserFavoriteManager,
-} from '../../../core/user-favorite-manager';
+import { IFavoriteEntity, IGroupedFavorites } from '../../../../../store/src/types/user-favorite-manager.types';
+import { IFavoritesInfo } from '../../../../../store/src/types/user-favorites.types';
+import { UserFavoriteManager } from '../../../../../store/src/user-favorite-manager';
 
 
 @Component({
diff --git a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts
index e95dea1c1a..40d15028a1 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts
+++ b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts
@@ -1,23 +1,18 @@
 import { Component, Input } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { isObservable, Observable, of as observableOf } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import {
-  RemoveUserFavoriteAction,
-} from '../../../../../store/src/actions/user-favourites-actions/remove-user-favorite-action';
-import { AppState } from '../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
-import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
+import { IFavoritesMetaCardConfig } from '../../../../../store/src/favorite-config-mapper';
+import { stratosEntityFactory, userFavouritesEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
+import { MenuItem } from '../../../../../store/src/types/menu-item.types';
+import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../store/src/types/shared.types';
+import { IFavoriteEntity } from '../../../../../store/src/types/user-favorite-manager.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../store/src/types/user-favorites.types';
-import { userFavoritesEntitySchema } from '../../../base-entity-schemas';
-import { IFavoriteEntity } from '../../../core/user-favorite-manager';
 import { isEndpointConnected } from '../../../features/endpoints/connect.service';
-import { ComponentEntityMonitorConfig, StratosStatus } from '../../shared.types';
 import { ConfirmationDialogConfig } from '../confirmation-dialog.config';
 import { ConfirmationDialogService } from '../confirmation-dialog.service';
-import { MetaCardMenuItem } from '../list/list-cards/meta-card/meta-card-base/meta-card.component';
-import { IFavoritesMetaCardConfig } from './favorite-config-mapper';
 
 
 @Component({
@@ -64,7 +59,7 @@ export class FavoritesMetaCardComponent {
   public endpointConnected$: Observable<boolean>;
   public name$: Observable<string>;
   public routerLink$: Observable<string>;
-  public actions$: Observable<MetaCardMenuItem[]>;
+  public actions$: Observable<MenuItem[]>;
 
   // Optional icon for the favorite
   public iconUrl$: Observable<string>;
@@ -72,9 +67,7 @@ export class FavoritesMetaCardComponent {
   @Input()
   set favoriteEntity(favoriteEntity: IFavoriteEntity) {
     if (!this.placeholder && favoriteEntity) {
-      const endpoint$ = this.store.select(endpointEntitiesSelector).pipe(
-        map(endpoints => endpoints[favoriteEntity.favorite.endpointId])
-      );
+      const endpoint$ = stratosEntityCatalog.endpoint.store.getEntityMonitor(favoriteEntity.favorite.endpointId).entity$;
       this.endpointConnected$ = endpoint$.pipe(map(endpoint => isEndpointConnected(endpoint)));
       this.actions$ = this.endpointConnected$.pipe(
         map(connected => connected ? this.config.menuItems : [])
@@ -83,7 +76,7 @@ export class FavoritesMetaCardComponent {
       this.favorite = favorite;
       this.metaFavorite = !this.endpoint || (this.endpoint && !this.endpointHasEntities) ? favorite : null;
       this.prettyName = prettyName || 'Unknown';
-      this.entityConfig = new ComponentEntityMonitorConfig(favorite.guid, userFavoritesEntitySchema);
+      this.entityConfig = new ComponentEntityMonitorConfig(favorite.guid, stratosEntityFactory(userFavouritesEntityType));
 
       // If this favorite is an endpoint, lookup the image for it from the entitiy catalog
       if (this.favorite.entityType === 'endpoint') {
@@ -113,7 +106,6 @@ export class FavoritesMetaCardComponent {
   }
 
   constructor(
-    private store: Store<AppState>,
     private confirmDialog: ConfirmationDialogService
   ) { }
 
@@ -131,7 +123,7 @@ export class FavoritesMetaCardComponent {
   }
 
   private removeFavorite = () => {
-    this.store.dispatch(new RemoveUserFavoriteAction(this.favorite));
+    stratosEntityCatalog.userFavorite.api.delete(this.favorite);
   }
 
   public toggleMoreError() {
diff --git a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts
index 91583e2005..513619c72b 100644
--- a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts
+++ b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts
@@ -122,4 +122,4 @@ export class JsonViewerComponent implements OnChanges {
 
     return segment;
   }
-}
\ No newline at end of file
+}
diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts
index b1fdfc75c7..16ea225294 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts
+++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts
@@ -31,6 +31,7 @@ import { IgnorePaginationMaxedState, SetResultCount } from '../../../../../../st
 import { AppState } from '../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
+import { LocalPaginationHelpers } from '../../../../../../store/src/helpers/local-list.helpers';
 import { PaginationMonitor } from '../../../../../../store/src/monitors/pagination-monitor';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { PaginatedAction, PaginationEntityState, PaginationParam } from '../../../../../../store/src/types/pagination.types';
@@ -46,7 +47,6 @@ import {
 } from './list-data-source-types';
 import { getDataFunctionList } from './local-filtering-sorting';
 import { LocalListController } from './local-list-controller';
-import { LocalPaginationHelpers } from './local-list.helpers';
 
 export type DataFunctionDefinitionType = 'sort' | 'filter';
 
diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
index bb0fb7391f..2d53920886 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
+++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
@@ -2,10 +2,10 @@ import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { tag } from 'rxjs-spy/operators/tag';
 import { distinctUntilChanged, map, publishReplay, refCount, switchMap, tap } from 'rxjs/operators';
 
+import { LocalPaginationHelpers } from '../../../../../../store/src/helpers/local-list.helpers';
 import { PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
 import { DataFunction } from './list-data-source';
 import { splitCurrentPage } from './local-list-controller.helpers';
-import { LocalPaginationHelpers } from './local-list.helpers';
 
 export class LocalListController<T = any> {
   public page$: Observable<T[]>;
diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.spec.ts
index ed7de6c1dd..2ccb12a2be 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.spec.ts
@@ -5,15 +5,15 @@ import { StoreModule } from '@ngrx/store';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 import { Observable, of } from 'rxjs';
 
+import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 import { EntitySchema } from '../../../../../../../../store/src/helpers/entity-schema';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
+import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import * as favoriteHelpers from '../../../../../../../../store/src/user-favorite-helpers';
+import { UserFavoriteManager } from '../../../../../../../../store/src/user-favorite-manager';
 import { CoreTestingModule } from '../../../../../../../test-framework/core-test.modules';
-import * as favoriteHelpers from '../../../../../../core/user-favorite-helpers';
-import { UserFavoriteManager } from '../../../../../../core/user-favorite-manager';
 import { SharedModule } from '../../../../../shared.module';
-import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../shared.types';
-import { FavoritesConfigMapper } from '../../../../favorites-meta-card/favorite-config-mapper';
 import { MetaCardComponent } from './meta-card.component';
 
 @Component({
diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.ts b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.ts
index 0aec42062f..59a95244d6 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.ts
@@ -2,25 +2,17 @@ import { Component, ContentChild, ContentChildren, Input, OnDestroy, QueryList }
 import { combineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
 import { first, map, tap } from 'rxjs/operators';
 
+import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
+import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
-import { getFavoriteFromEntity } from '../../../../../../core/user-favorite-helpers';
+import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
 import { safeUnsubscribe } from '../../../../../../core/utils.service';
-import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../shared.types';
-import { FavoritesConfigMapper } from '../../../../favorites-meta-card/favorite-config-mapper';
 import { MetaCardItemComponent } from '../meta-card-item/meta-card-item.component';
 import { MetaCardTitleComponent } from '../meta-card-title/meta-card-title.component';
 
 
-export interface MetaCardMenuItem {
-  icon?: string;
-  label: string;
-  action: () => void;
-  can?: Observable<boolean>;
-  disabled?: Observable<boolean>;
-  separator?: boolean;
-}
-
 export function createMetaCardMenuItemSeparator() {
   return {
     label: '-',
@@ -89,7 +81,7 @@ export class MetaCardComponent implements OnDestroy {
   }
 
   @Input('actionMenu')
-  set actionMenu(actionMenu: MetaCardMenuItem[]) {
+  set actionMenu(actionMenu: MenuItem[]) {
     if (actionMenu) {
       this.pActionMenu = actionMenu.map(menuItem => {
         if (!menuItem.can) {
@@ -107,7 +99,7 @@ export class MetaCardComponent implements OnDestroy {
       );
     }
   }
-  get actionMenu(): MetaCardMenuItem[] {
+  get actionMenu(): MenuItem[] {
     return this.pActionMenu;
   }
 
@@ -115,7 +107,7 @@ export class MetaCardComponent implements OnDestroy {
 
   public showMenu$: Observable<boolean>;
   public isDeleting$: Observable<boolean> = observableOf(false);
-  private pActionMenu: MetaCardMenuItem[];
+  private pActionMenu: MenuItem[];
 
   constructor(
     private entityMonitorFactory: EntityMonitorFactory,
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-favorite/table-cell-favorite.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-favorite/table-cell-favorite.component.ts
index 93f89e58de..cb239478f9 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-favorite/table-cell-favorite.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-favorite/table-cell-favorite.component.ts
@@ -1,9 +1,9 @@
 import { Component, Input } from '@angular/core';
 
+import { FavoritesConfigMapper } from '../../../../../../../store/src/favorite-config-mapper';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../../../store/src/types/user-favorites.types';
 import { TableCellCustom } from '../../list.types';
 import { ITableColumn } from '../table.types';
-import { FavoritesConfigMapper } from '../../../favorites-meta-card/favorite-config-mapper';
 
 export interface TableCellFavoriteComponentConfig<T, Y extends IFavoriteMetadata> {
   createUserFavorite: (entity: T) => UserFavorite<Y>;
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-request-monitor-icon/table-cell-request-monitor-icon.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-request-monitor-icon/table-cell-request-monitor-icon.component.spec.ts
index 04cb6b4ce1..8dac64962b 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-request-monitor-icon/table-cell-request-monitor-icon.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-request-monitor-icon/table-cell-request-monitor-icon.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { endpointEntityType, stratosEntityFactory } from '../../../../../../../store/src/helpers/stratos-entity-factory';
 import { BaseTestModules } from '../../../../../../test-framework/core-test.helper';
-import { endpointEntitySchema } from '../../../../../base-entity-schemas';
 import { AppMonitorComponentTypes } from '../../../app-action-monitor-icon/app-action-monitor-icon.component';
 import { TableCellRequestMonitorIconComponent } from './table-cell-request-monitor-icon.component';
 
@@ -24,7 +24,7 @@ describe('TableCellRequestMonitorIconComponent', () => {
     component.id = '1';
     component.config = () => ({
       entityKey: '',
-      schema: endpointEntitySchema,
+      schema: stratosEntityFactory(endpointEntityType),
       monitorState: AppMonitorComponentTypes.DELETE
     });
     component.row = {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
index 7f420a1f8c..afacea4130 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
@@ -5,14 +5,14 @@ import { map, pairwise, tap, withLatestFrom } from 'rxjs/operators';
 import { GetAllEndpoints } from '../../../../../../../store/src/actions/endpoint.actions';
 import { CreatePagination } from '../../../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../../../store/src/app-state';
-import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../../../store/src/helpers/stratos-entity-factory';
 import { EntityMonitorFactory } from '../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../../../../../store/src/monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { endpointEntitiesSelector } from '../../../../../../../store/src/selectors/endpoint.selectors';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
-import { endpointEntitySchema } from '../../../../../base-entity-schemas';
-import { DataFunctionDefinition, ListDataSource } from '../../data-sources-controllers/list-data-source';
+import { ListDataSource } from '../../data-sources-controllers/list-data-source';
+import { IListDataSourceConfig } from '../../data-sources-controllers/list-data-source-config';
 import { RowsState } from '../../data-sources-controllers/list-data-source-types';
 import { TableRowStateManager } from '../../list-table/table-row/table-row-state-manager';
 import { IListConfig } from '../../list.component.types';
@@ -55,7 +55,7 @@ export class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
     const { rowStateManager, sub } = rowStateHelper.getRowStateManager(
       paginationMonitorFactory,
       entityMonitorFactory,
-      GetAllEndpoints.storeKey,
+      action.paginationKey,
       action,
       EndpointRowStateSetUpManager,
       false
@@ -99,26 +99,26 @@ export class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
     rowsState: Observable<RowsState>,
     destroy: () => void,
     refresh: () => void
-  ) {
+  ): IListDataSourceConfig<EndpointModel, EndpointModel> {
     return {
       store,
       action,
-      schema: endpointEntitySchema,
-      getRowUniqueId: object => object.guid,
+      schema: action.entity[0],
+      getRowUniqueId: (object) => action.entity[0].getId(object),
       getEmptyType: () => ({
         name: '',
         system_shared_token: false,
         metricsAvailable: false,
         sso_allowed: false,
       }),
-      paginationKey: GetAllEndpoints.storeKey,
+      paginationKey: action.paginationKey,
       isLocal: true,
       transformEntities: [
         {
           type: 'filter',
           field: 'name'
         },
-      ] as DataFunctionDefinition[],
+      ],
       listConfig,
       rowsState,
       destroy,
@@ -130,7 +130,7 @@ export class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
     rowStateManager: TableRowStateManager,
     store: Store<AppState>
   ) {
-    const eventMonitor = internalEventMonitorFactory.getMonitor(endpointSchemaKey);
+    const eventMonitor = internalEventMonitorFactory.getMonitor(endpointEntityType);
     return eventMonitor.hasErroredOverTime().pipe(
       withLatestFrom(store.select(endpointEntitiesSelector)),
       tap(([errored, endpoints]) => Object.keys(errored).forEach(id => {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts
index 581680cd4f..dfdd1548a2 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts
@@ -9,28 +9,23 @@ import {
   ViewContainerRef,
 } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { CurrentUserPermissionsService } from 'frontend/packages/core/src/core/permissions/current-user-permissions.service';
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { Observable, of, ReplaySubject, Subscription } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
+import { getFullEndpointApiUrl } from '../../../../../../../../store/src/endpoint-utils';
 import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog';
 import {
   StratosCatalogEndpointEntity,
 } from '../../../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
+import { StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import { UserFavoriteEndpoint } from '../../../../../../../../store/src/types/user-favorites.types';
 import { safeUnsubscribe } from '../../../../../../core/utils.service';
-import {
-  coreEndpointListDetailsComponents,
-  getFullEndpointApiUrl,
-} from '../../../../../../features/endpoints/endpoint-helpers';
-import { StratosStatus } from '../../../../../shared.types';
-import { FavoritesConfigMapper } from '../../../../favorites-meta-card/favorite-config-mapper';
-import {
-  createMetaCardMenuItemSeparator,
-  MetaCardMenuItem,
-} from '../../../list-cards/meta-card/meta-card-base/meta-card.component';
+import { coreEndpointListDetailsComponents } from '../../../../../../features/endpoints/endpoint-helpers';
+import { createMetaCardMenuItemSeparator } from '../../../list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../list.types';
 import { BaseEndpointsDataSource } from '../base-endpoints-data-source';
 import { EndpointListDetailsComponent, EndpointListHelper } from '../endpoint-list.helpers';
@@ -48,7 +43,7 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
   public rowObs = new ReplaySubject<EndpointModel>();
   public favorite: UserFavoriteEndpoint;
   public address: string;
-  public cardMenu: MetaCardMenuItem[];
+  public cardMenu: MenuItem[];
   public endpointCatalogEntity: StratosCatalogEndpointEntity;
   public hasDetails = true;
   public endpointLink: string = null;
@@ -126,7 +121,6 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
     private endpointListHelper: EndpointListHelper,
     private componentFactoryResolver: ComponentFactoryResolver,
     private favoritesConfigMapper: FavoritesConfigMapper,
-    private currentUserPermissionsService: CurrentUserPermissionsService,
   ) {
     super();
     this.endpointIds$ = this.endpointIds.asObservable();
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-data-source.helpers.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-data-source.helpers.ts
index 3c9cc0c03e..e5862804f9 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-data-source.helpers.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-data-source.helpers.ts
@@ -1,12 +1,12 @@
-
 import { combineLatest } from 'rxjs';
 import { distinctUntilChanged, map, mergeMap, switchMap, tap } from 'rxjs/operators';
 
+import { DisconnectEndpoint } from '../../../../../../../store/src/actions/endpoint.actions';
 import { EntityMonitorFactory } from '../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitor } from '../../../../../../../store/src/monitors/pagination-monitor';
-import { TableRowStateManager } from '../../list-table/table-row/table-row-state-manager';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
-import { EndpointsEffect } from '../../../../../../../store/src/effects/endpoint.effects';
+import { TableRowStateManager } from '../../list-table/table-row/table-row-state-manager';
+
 
 export function EndpointRowStateSetUpManager(
   paginationMonitor: PaginationMonitor<EndpointModel>,
@@ -21,7 +21,7 @@ export function EndpointRowStateSetUpManager(
           .create(entity.guid, paginationMonitor.entityConfig);
         const request$ = entityMonitor.entityRequest$.pipe(
           map(request => {
-            const disconnect = request.updating[EndpointsEffect.disconnectingKey] || { busy: false };
+            const disconnect = request.updating[DisconnectEndpoint.UpdatingKey] || { busy: false };
             const unregister = request.deleting || { busy: false };
             const busy = disconnect.busy || unregister.busy;
             const blocked = unregister.busy;
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers.ts
index b621bc2513..e1ebaabf50 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers.ts
@@ -4,23 +4,19 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { map, pairwise } from 'rxjs/operators';
 
-import { DisconnectEndpoint, UnregisterEndpoint } from '../../../../../../../store/src/actions/endpoint.actions';
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
-import { ShowSnackBar } from '../../../../../../../store/src/actions/snackBar.actions';
-import { GetSystemInfo } from '../../../../../../../store/src/actions/system.actions';
 import { AppState } from '../../../../../../../store/src/app-state';
-import { EndpointsEffect } from '../../../../../../../store/src/effects/endpoint.effects';
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
-import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
-import { selectDeletionInfo, selectUpdateInfo } from '../../../../../../../store/src/selectors/api.selectors';
+import { ActionState } from '../../../../../../../store/src/reducers/api-request-reducer/types';
+import { stratosEntityCatalog } from '../../../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
-import { STRATOS_ENDPOINT_TYPE } from '../../../../../base-entity-schemas';
 import { LoggerService } from '../../../../../core/logger.service';
 import { CurrentUserPermissionsService } from '../../../../../core/permissions/current-user-permissions.service';
 import { StratosCurrentUserPermissions } from '../../../../../core/permissions/stratos-user-permissions.checker';
 import {
   ConnectEndpointDialogComponent,
 } from '../../../../../features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component';
+import { SnackBarService } from '../../../../services/snackbar.service';
 import { ConfirmationDialogConfig } from '../../../confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../confirmation-dialog.service';
 import { IListAction } from '../../list.component.types';
@@ -43,13 +39,13 @@ function isEndpointListDetailsComponent(obj: any): EndpointListDetailsComponent
 
 @Injectable()
 export class EndpointListHelper {
-  private endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
   constructor(
     private store: Store<AppState>,
     private dialog: MatDialog,
     private currentUserPermissionsService: CurrentUserPermissionsService,
     private confirmDialog: ConfirmationDialogService,
     private log: LoggerService,
+    private snackBarService: SnackBarService,
   ) { }
 
   endpointActions(): IListAction<EndpointModel>[] {
@@ -63,10 +59,10 @@ export class EndpointListHelper {
             false
           );
           this.confirmDialog.open(confirmation, () => {
-            this.store.dispatch(new DisconnectEndpoint(item.guid, item.cnsi_type));
-            this.handleUpdateAction(item, EndpointsEffect.disconnectingKey, ([oldVal, newVal]) => {
-              this.store.dispatch(new ShowSnackBar(`Disconnected endpoint '${item.name}'`));
-              this.store.dispatch(new GetSystemInfo());
+            const obs$ = stratosEntityCatalog.endpoint.api.disconnect<ActionState>(item.guid, item.cnsi_type);
+            this.handleAction(obs$, () => {
+              this.snackBarService.show(`Disconnected endpoint '${item.name}'`);
+              stratosEntityCatalog.systemInfo.api.getSystemInfo();
             });
           });
         },
@@ -112,9 +108,9 @@ export class EndpointListHelper {
             true
           );
           this.confirmDialog.open(confirmation, () => {
-            this.store.dispatch(new UnregisterEndpoint(item.guid, item.cnsi_type));
-            this.handleDeleteAction(item, ([oldVal, newVal]) => {
-              this.store.dispatch(new ShowSnackBar(`Unregistered ${item.name}`));
+            const obs$ = stratosEntityCatalog.endpoint.api.unregister<ActionState>(item.guid, item.cnsi_type);
+            this.handleAction(obs$, () => {
+              this.snackBarService.show(`Unregistered ${item.name}`);
             });
           });
         },
@@ -134,31 +130,16 @@ export class EndpointListHelper {
     ];
   }
 
-  private handleUpdateAction(item, effectKey, handleChange) {
-    this.handleAction(selectUpdateInfo(
-      this.endpointEntityKey,
-      item.guid,
-      effectKey,
-    ), handleChange);
-  }
-
-  private handleDeleteAction(item, handleChange) {
-    this.handleAction(selectDeletionInfo(
-      this.endpointEntityKey,
-      item.guid,
-    ), handleChange);
-  }
-
-  private handleAction(storeSelect, handleChange) {
-    const disSub = this.store.select(storeSelect).pipe(
-      pairwise())
-      .subscribe(([oldVal, newVal]) => {
-        // https://github.com/SUSE/stratos/issues/29 Generic way to handle errors ('Failed to disconnect X')
-        if (!newVal.error && (oldVal.busy && !newVal.busy)) {
-          handleChange([oldVal, newVal]);
-          disSub.unsubscribe();
-        }
-      });
+  private handleAction(obs$: Observable<ActionState>, handleChange: ([o, n]: [ActionState, ActionState]) => void) {
+    const disSub = obs$.pipe(
+      pairwise()
+    ).subscribe(([oldVal, newVal]) => {
+      // https://github.com/SUSE/stratos/issues/29 Generic way to handle errors ('Failed to disconnect X')
+      if (!newVal.error && (oldVal.busy && !newVal.busy)) {
+        handleChange([oldVal, newVal]);
+        disSub.unsubscribe();
+      }
+    });
   }
 
   createEndpointDetails(listDetailsComponent: any, container: ViewContainerRef, componentFactoryResolver: ComponentFactoryResolver):
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-data-source.ts
index 1f2999e41b..cdb066f099 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-data-source.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-data-source.ts
@@ -1,10 +1,10 @@
 import { Store } from '@ngrx/store';
 
-import { GetAllEndpoints } from '../../../../../../../store/src/actions/endpoint.actions';
 import { AppState } from '../../../../../../../store/src/app-state';
 import { EntityMonitorFactory } from '../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../../../../../store/src/monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
+import { stratosEntityCatalog } from '../../../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
 import { IListConfig } from '../../list.component.types';
 import { BaseEndpointsDataSource } from './base-endpoints-data-source';
@@ -23,7 +23,7 @@ export class EndpointsDataSource extends BaseEndpointsDataSource {
     super(
       store,
       listConfig,
-      new GetAllEndpoints(),
+      stratosEntityCatalog.endpoint.actions.getAll(),
       null,
       paginationMonitorFactory,
       entityMonitorFactory,
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service.ts
index 1848861dae..0f091dbd85 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service.ts
@@ -5,11 +5,11 @@ import { filter } from 'rxjs/operators';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { AppState } from '../../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
+import { FavoritesConfigMapper } from '../../../../../../../store/src/favorite-config-mapper';
 import { EntityMonitorFactory } from '../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../../../../../store/src/monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
-import { FavoritesConfigMapper } from '../../../favorites-meta-card/favorite-config-mapper';
 import { createTableColumnFavorite } from '../../list-table/table-cell-favorite/table-cell-favorite.component';
 import { ITableColumn } from '../../list-table/table.types';
 import { IListAction, IListConfig, ListViewTypes } from '../../list.component.types';
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.ts
index 32956ffa4b..0eb0e7d08b 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.ts
@@ -2,10 +2,9 @@ import { Component, Input } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { GetAllEndpoints } from '../../../../../../../../store/src/actions/endpoint.actions';
-import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
+import { getFullEndpointApiUrl } from '../../../../../../../../store/src/endpoint-utils';
+import { stratosEntityCatalog } from '../../../../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
-import { getFullEndpointApiUrl } from '../../../../../../features/endpoints/endpoint-helpers';
 import { TableCellCustom } from '../../../list.types';
 import { RowWithEndpointId } from '../table-cell-endpoint-name/table-cell-endpoint-name.component';
 
@@ -17,15 +16,11 @@ import { RowWithEndpointId } from '../table-cell-endpoint-name/table-cell-endpoi
 export class TableCellEndpointAddressComponent extends TableCellCustom<EndpointModel | RowWithEndpointId>  {
   public endpointAddress$: Observable<any>;
 
-  constructor(private entityServiceFactory: EntityServiceFactory) {
-    super();
-  }
-
   @Input('row')
   set row(row: EndpointModel | RowWithEndpointId) {
     /* tslint:disable-next-line:no-string-literal */
     const id = row['endpointId'] || row['guid'];
-    this.endpointAddress$ = this.entityServiceFactory.create(id, new GetAllEndpoints()).waitForEntity$.pipe(
+    this.endpointAddress$ = stratosEntityCatalog.endpoint.store.getEntityService(id).waitForEntity$.pipe(
       map(data => data.entity),
       map((data: any) => getFullEndpointApiUrl(data))
     );
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.spec.ts
index 02c3cb866a..6813bb19d8 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.spec.ts
@@ -26,7 +26,9 @@ describe('TableCellEndpointNameComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(TableCellEndpointNameComponent);
     component = fixture.componentInstance;
-    component.row = {} as EndpointModel;
+    component.row = {
+      guid: ''
+    } as EndpointModel;
     fixture.detectChanges();
   });
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.ts
index 62928cef55..d3c9c5940a 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.ts
@@ -1,10 +1,10 @@
 import { Component, Input } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/internal/operators/map';
+import { filter } from 'rxjs/operators';
 
-import { GetAllEndpoints } from '../../../../../../../../store/src/actions/endpoint.actions';
 import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog';
-import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
+import { stratosEntityCatalog } from '../../../../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
 import { EndpointsService } from '../../../../../../core/endpoints.service';
 import { TableCellCustom } from '../../../list.types';
@@ -22,27 +22,19 @@ export class TableCellEndpointNameComponent extends TableCellCustom<EndpointMode
 
   public endpoint$: Observable<any>;
 
-  constructor(
-    private entityServiceFactory: EntityServiceFactory,
-
-  ) {
-    super();
-  }
-
   @Input('row')
   set row(row: EndpointModel | RowWithEndpointId) {
     /* tslint:disable-next-line:no-string-literal */
     const id = row['endpointId'] || row['guid'];
-    this.endpoint$ = this.entityServiceFactory.create(
-      id,
-      new GetAllEndpoints()
-    ).waitForEntity$.pipe(
-      map(data => data.entity),
-      map((data: any) => {
+    this.endpoint$ = stratosEntityCatalog.endpoint.store.getEntityMonitor(id).entity$.pipe(
+      filter(data => !!data),
+      map(data => {
         const ep = entityCatalog.getEndpoint(data.cnsi_type, data.sub_type).definition;
-        data.canShowLink = data.connectionStatus === 'connected' || ep.unConnectable;
-        data.link = EndpointsService.getLinkForEndpoint(data);
-        return data;
+        return {
+          ...data,
+          canShowLink: data.connectionStatus === 'connected' || ep.unConnectable,
+          link: EndpointsService.getLinkForEndpoint(data)
+        };
       })
     );
   }
diff --git a/src/frontend/packages/core/src/shared/components/metrics-parent-range-selector/metrics-parent-range-selector.component.ts b/src/frontend/packages/core/src/shared/components/metrics-parent-range-selector/metrics-parent-range-selector.component.ts
index 9c5dec430a..016031c362 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-parent-range-selector/metrics-parent-range-selector.component.ts
+++ b/src/frontend/packages/core/src/shared/components/metrics-parent-range-selector/metrics-parent-range-selector.component.ts
@@ -1,10 +1,10 @@
 import { AfterContentInit, Component, ContentChildren, OnDestroy, QueryList } from '@angular/core';
 import { Subscription } from 'rxjs';
 
-import { IMetrics } from '../../../../../store/src/types/base-metric.types';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
+import { IMetrics } from '../../../../../store/src/types/base-metric.types';
+import { MetricQueryType } from '../../../../../store/src/types/metric.types';
 import { MetricsRangeSelectorManagerService } from '../../services/metrics-range-selector-manager.service';
-import { MetricQueryType } from '../../services/metrics-range-selector.types';
 import { MetricsChartComponent } from '../metrics-chart/metrics-chart.component';
 
 @Component({
diff --git a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.ts b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.ts
index d485087726..1fab0c74fc 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.ts
+++ b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.ts
@@ -6,8 +6,9 @@ import { MetricsAction } from '../../../../../store/src/actions/metrics.actions'
 import { EntityMonitor } from '../../../../../store/src/monitors/entity-monitor';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { IMetrics } from '../../../../../store/src/types/base-metric.types';
+import { MetricQueryType } from '../../../../../store/src/types/metric.types';
 import { MetricsRangeSelectorManagerService } from '../../services/metrics-range-selector-manager.service';
-import { ITimeRange, MetricQueryType } from '../../services/metrics-range-selector.types';
+import { ITimeRange } from '../../services/metrics-range-selector.types';
 
 @Component({
   selector: 'app-metrics-range-selector',
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.html b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.html
index 84b796dbea..387c40e4ba 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.html
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.html
@@ -3,7 +3,7 @@
     <div class="page-header__inner">
       <div class="page-header">
         <div>
-          <mat-toolbar class="page-header__toolbar" color="primary">
+          <mat-toolbar class="page-header__toolbar">
             <div *ngIf="isMobile$ | async" class="page-header__nav-toggle-wrapper">
               <button mat-icon-button *ngIf="!hideSideNavButton" (click)="toggleSidenav()">
                 <mat-icon class="page-header__nav-toggle">menu</mat-icon>
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
index c4d38813bd..1ee29645e9 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
@@ -12,6 +12,11 @@
   $menu-background-color: mat-color($background, card);
   $is-dark: map-get($theme, is-dark);
   $username-background: $menu-background-color;
+  $header-background: map-get($app-theme, header-background-color);
+  $header-foreground: map-get($app-theme, header-foreground-color);
+  $underflow-background: map-get($app-theme, underflow-background-color);
+  $underflow-foreground: map-get($app-theme, underflow-foreground-color);
+
   @if $is-dark == true {
     $username-background: lighten($menu-background-color, 5%);
   } @else {
@@ -20,6 +25,10 @@
   $username-color: mat-color($foreground, text);
 
   .page-header {
+    &__toolbar {
+      background-color: $header-background;
+      color: $header-foreground;
+    }
     &__warning-count {
       background-color: mat-color($primary);
       color: mat-contrast($primary, 500);
@@ -34,7 +43,8 @@
       color: $subdued;
     }
     &__underflow {
-      background-color: mat-color($primary);
+      background-color: $underflow-background;
+      color: $underflow-foreground;
     }
     &__divider {
       color: mat-contrast($primary, 500);
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.ts b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.ts
index ce65f784ba..6e836e74b3 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.ts
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.ts
@@ -10,15 +10,15 @@ import { ToggleSideNav } from '../../../../../store/src/actions/dashboard-action
 import { AddRecentlyVisitedEntityAction } from '../../../../../store/src/actions/recently-visited.actions';
 import { AppState } from '../../../../../store/src/app-state';
 import { EntityCatalogHelpers } from '../../../../../store/src/entity-catalog/entity-catalog.helper';
+import { FavoritesConfigMapper } from '../../../../../store/src/favorite-config-mapper';
 import { selectIsMobile } from '../../../../../store/src/selectors/dashboard.selectors';
 import { InternalEventSeverity } from '../../../../../store/src/types/internal-events.types';
+import { StratosStatus } from '../../../../../store/src/types/shared.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../store/src/types/user-favorites.types';
 import { TabNavService } from '../../../../tab-nav.service';
 import { UserProfileService } from '../../../core/user-profile.service';
 import { IPageSideNavTab } from '../../../features/dashboard/page-side-nav/page-side-nav.component';
 import { GlobalEventService, IGlobalEvent } from '../../global-events.service';
-import { StratosStatus } from '../../shared.types';
-import { FavoritesConfigMapper } from '../favorites-meta-card/favorite-config-mapper';
 import { selectDashboardState } from './../../../../../store/src/selectors/dashboard.selectors';
 import { UserProfileInfo } from './../../../../../store/src/types/user-profile.types';
 import { BREADCRUMB_URL_PARAM, IHeaderBreadcrumb, IHeaderBreadcrumbLink } from './page-header.types';
diff --git a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.ts b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.ts
index fcd86c1dc6..86af699f5c 100644
--- a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.ts
+++ b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.ts
@@ -5,7 +5,7 @@ import { Observable, of as observableOf } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
-import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
 import { recentlyVisitedSelector } from '../../../../../store/src/selectors/recently-visitied.selectors';
 import {
@@ -29,7 +29,7 @@ class RenderableRecent {
   public mostRecentHit: moment.Moment;
   public subText$: Observable<string>;
   constructor(readonly entity: IRecentlyVisitedEntity, private store: Store<AppState>) {
-    if (entity.entityType === endpointSchemaKey) {
+    if (entity.entityType === endpointEntityType) {
       this.subText$ = observableOf(entity.prettyType);
     } else {
       this.subText$ = this.store.select(endpointEntitiesSelector).pipe(
diff --git a/src/frontend/packages/core/src/shared/components/user-avatar/md5.ts b/src/frontend/packages/core/src/shared/components/user-avatar/md5.ts
index b92c749b30..da9418a3b4 100644
--- a/src/frontend/packages/core/src/shared/components/user-avatar/md5.ts
+++ b/src/frontend/packages/core/src/shared/components/user-avatar/md5.ts
@@ -273,4 +273,4 @@ export class MD5 {
       temp = this.WordToHex(this.a) + this.WordToHex(this.b) + this.WordToHex(this.c) + this.WordToHex(this.d);
       return temp.toLowerCase();
   }
-}
\ No newline at end of file
+}
diff --git a/src/frontend/packages/core/src/shared/entity.tokens.ts b/src/frontend/packages/core/src/shared/entity.tokens.ts
index 76df701c07..0a4b9da0e9 100644
--- a/src/frontend/packages/core/src/shared/entity.tokens.ts
+++ b/src/frontend/packages/core/src/shared/entity.tokens.ts
@@ -1,6 +1,4 @@
-import { InjectionToken, Injectable } from '@angular/core';
-import { EntityService } from '../../../store/src/entity-service';
+import { InjectionToken } from '@angular/core';
+
 export const CF_GUID = new InjectionToken<string>('cfGuid');
 export const APP_GUID = new InjectionToken<string>('appGuid');
-
-export const ENTITY_SERVICE = new InjectionToken<EntityService>(null);
diff --git a/src/frontend/packages/core/src/shared/global-events.service.spec.ts b/src/frontend/packages/core/src/shared/global-events.service.spec.ts
index 7359c9a610..a7629ca2e3 100644
--- a/src/frontend/packages/core/src/shared/global-events.service.spec.ts
+++ b/src/frontend/packages/core/src/shared/global-events.service.spec.ts
@@ -1,7 +1,7 @@
 import { TestBed } from '@angular/core/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratosui/store/testing';
 import { CoreModule } from '../core/core.module';
 import { GlobalEventService } from './global-events.service';
 import { SharedModule } from './shared.module';
diff --git a/src/frontend/packages/core/src/shared/global-events.service.ts b/src/frontend/packages/core/src/shared/global-events.service.ts
index fb59101347..ff9675a57e 100644
--- a/src/frontend/packages/core/src/shared/global-events.service.ts
+++ b/src/frontend/packages/core/src/shared/global-events.service.ts
@@ -3,8 +3,8 @@ import { Store } from '@ngrx/store';
 import { BehaviorSubject, combineLatest, Observable, ReplaySubject } from 'rxjs';
 import { debounceTime, distinctUntilChanged, map, publishReplay, refCount, startWith } from 'rxjs/operators';
 
+import { StratosStatus } from '../../../store/src/types/shared.types';
 import { GeneralEntityAppState } from './../../../store/src/app-state';
-import { StratosStatus } from './shared.types';
 
 export type GlobalEventTypes = 'warning' | 'error' | 'process' | 'complete';
 
diff --git a/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts b/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts
index c424ef13e6..bb8ef4dc09 100644
--- a/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts
+++ b/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts
@@ -4,10 +4,11 @@ import { Subject, Subscription } from 'rxjs';
 import { debounceTime, takeWhile, tap } from 'rxjs/operators';
 
 import { MetricsAction } from '../../../../store/src/actions/metrics.actions';
-import { IMetrics } from '../../../../store/src/types/base-metric.types';
 import { EntityMonitor } from '../../../../store/src/monitors/entity-monitor';
+import { IMetrics } from '../../../../store/src/types/base-metric.types';
+import { MetricQueryType } from '../../../../store/src/types/metric.types';
 import { MetricsRangeSelectorService } from './metrics-range-selector.service';
-import { ITimeRange, MetricQueryType } from './metrics-range-selector.types';
+import { ITimeRange } from './metrics-range-selector.types';
 
 @Injectable()
 export class MetricsRangeSelectorManagerService {
diff --git a/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts b/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts
index ee5b4e64c0..9789997fe0 100644
--- a/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts
+++ b/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts
@@ -3,7 +3,8 @@ import * as moment from 'moment';
 
 import { MetricQueryConfig, MetricsAction } from '../../../../store/src/actions/metrics.actions';
 import { IMetrics } from '../../../../store/src/types/base-metric.types';
-import { ITimeRange, MetricQueryType, StoreMetricTimeRange } from './metrics-range-selector.types';
+import { MetricQueryType } from '../../../../store/src/types/metric.types';
+import { ITimeRange, StoreMetricTimeRange } from './metrics-range-selector.types';
 
 @Injectable()
 export class MetricsRangeSelectorService {
diff --git a/src/frontend/packages/core/src/shared/services/metrics-range-selector.types.ts b/src/frontend/packages/core/src/shared/services/metrics-range-selector.types.ts
index bb39cc6bca..872a42e0c8 100644
--- a/src/frontend/packages/core/src/shared/services/metrics-range-selector.types.ts
+++ b/src/frontend/packages/core/src/shared/services/metrics-range-selector.types.ts
@@ -1,4 +1,7 @@
 import * as moment from 'moment';
+
+import { MetricQueryType } from '../../../../store/src/types/metric.types';
+
 export type momentTuple = [moment.DurationInputArg1, moment.unitOfTime.DurationConstructor];
 export interface ITimeRange {
   value?: string;
@@ -13,7 +16,4 @@ export interface StoreMetricTimeRange {
   step?: number;
 }
 
-export enum MetricQueryType {
-  QUERY = 'query',
-  RANGE_QUERY = 'query_range',
-}
+
diff --git a/src/frontend/packages/core/src/shared/services/snackbar.service.ts b/src/frontend/packages/core/src/shared/services/snackbar.service.ts
new file mode 100644
index 0000000000..13ba4eb2c6
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/services/snackbar.service.ts
@@ -0,0 +1,33 @@
+import { Injectable } from '@angular/core';
+import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
+
+import { SnackBarReturnComponent } from '../components/snackbar-return/snackbar-return.component';
+
+/**
+ * Servicve for showing snackbars
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class SnackBarService {
+
+  constructor(public snackBar: MatSnackBar) {}
+
+  private snackBars: MatSnackBarRef<SimpleSnackBar>[] = [];
+
+  public show(message: string, closeMessage?: string, duration: number = 5000) {
+    this.snackBars.push(this.snackBar.open(message, closeMessage, {
+      duration: closeMessage ? null :duration
+    }));
+  }
+
+  public showReturn(message: string, returnUrl: string, returnLabel: string) {
+    this.snackBars.push(this.snackBar.openFromComponent(SnackBarReturnComponent, {
+      data: { message, returnUrl, returnLabel }
+    }));
+  }
+
+  public hide() {
+    this.snackBars.forEach(snackBar => snackBar.dismiss());
+  }
+}
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index b7cc5252d8..f084315e99 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -314,11 +314,6 @@ import { UserPermissionDirective } from './user-permission.directive';
     MaxListMessageComponent,
     TableCellEditComponent
   ],
-  entryComponents: [
-    DialogConfirmComponent,
-    SnackBarReturnComponent,
-    MarkdownPreviewComponent,
-  ],
   providers: [
     ListConfig,
     EndpointListHelper,
diff --git a/src/frontend/packages/core/src/styles.scss b/src/frontend/packages/core/src/styles.scss
index efc3234fb7..c4e58757d0 100644
--- a/src/frontend/packages/core/src/styles.scss
+++ b/src/frontend/packages/core/src/styles.scss
@@ -1,7 +1,6 @@
 // @import "~@angular/material/prebuilt-themes/indigo-pink.css";
 @import '../sass/fonts';
 @import '../sass/icons';
-@import '../sass/colors';
 @import '../sass/theme';
 @import '../sass/mixins';
 @import '../sass/scroll-bar-measure';
diff --git a/src/frontend/packages/core/test-framework/core-test.modules.ts b/src/frontend/packages/core/test-framework/core-test.modules.ts
index f2e0bc6e7a..0110b5e1d5 100644
--- a/src/frontend/packages/core/test-framework/core-test.modules.ts
+++ b/src/frontend/packages/core/test-framework/core-test.modules.ts
@@ -1,8 +1,8 @@
 import { NgModule } from '@angular/core';
 
-import { generateStratosEntities } from '../../core/src/base-entity-types';
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../store/src/entity-catalog.module';
 import { entityCatalog, TestEntityCatalog } from '../../store/src/entity-catalog/entity-catalog';
+import { generateStratosEntities } from '../../store/src/stratos-entity-generator';
 
 @NgModule({
   imports: [
diff --git a/src/frontend/packages/core/test-framework/entity-service.helper.ts b/src/frontend/packages/core/test-framework/entity-service.helper.ts
deleted file mode 100644
index f01fb32974..0000000000
--- a/src/frontend/packages/core/test-framework/entity-service.helper.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Store } from '@ngrx/store';
-import { schema as normalizrSchema } from 'normalizr';
-import { EntityRequestAction } from '../../store/src/types/request.types';
-import { EntityServiceFactory } from '../../store/src/entity-service-factory.service';
-import { ENTITY_SERVICE } from '../src/shared/entity.tokens';
-import { AppState } from '../../store/src/app-state';
-
-export function generateTestEntityServiceProvider(
-  guid: string,
-  schema: normalizrSchema.Entity,
-  action: EntityRequestAction
-) {
-  function useFactory(
-    store: Store<AppState>,
-    entityServiceFactory: EntityServiceFactory
-  ) {
-    return entityServiceFactory.create(
-      guid,
-      action
-    );
-  }
-
-  return {
-    provide: ENTITY_SERVICE,
-    useFactory,
-    deps: [Store, EntityServiceFactory]
-  };
-}
diff --git a/src/frontend/packages/core/tsconfig.app.json b/src/frontend/packages/core/tsconfig.app.json
index 4dbcf96be1..e35700247d 100644
--- a/src/frontend/packages/core/tsconfig.app.json
+++ b/src/frontend/packages/core/tsconfig.app.json
@@ -5,7 +5,8 @@
   },
   "files": [
     "src/main.ts",
-    "src/polyfills.ts"
+    "src/polyfills.ts",
+    "src/_custom-import.module.ts"
   ],
   "include": [
     "src/frontend/packages/**/*.d.ts"
diff --git a/src/frontend/packages/core/tsconfig.lib.json b/src/frontend/packages/core/tsconfig.lib.json
new file mode 100644
index 0000000000..975aec9f97
--- /dev/null
+++ b/src/frontend/packages/core/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../../tsconfig.lib.json",
+  "compilerOptions": {
+    "outDir": "../../../../dist/core",
+  },
+  "exclude": [
+    "./src/test.ts",
+    "**/*.spec.ts",
+  ]
+}
diff --git a/src/frontend/packages/devkit/build.sh b/src/frontend/packages/devkit/build.sh
new file mode 100755
index 0000000000..a417da73fe
--- /dev/null
+++ b/src/frontend/packages/devkit/build.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# Build script for devkit
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+ROOT="$( cd "$( dirname "${DIR}" )" && cd ../../.. && pwd )"
+DIST=$ROOT/dist-devkit
+
+echo $DIST
+echo $DIR
+tsc
+if [ $? -eq 0 ]; then
+  echo "Copying supporting files"
+  # cp $DIR/package.json $DIST
+  # cp $DIR/src/schematics/*.json $DIST/schematics/
+  # cp $DIR/src/schematics/theme/*.json $DIST/schematics/theme
+  # cp $DIR/src/builders/*.json $DIST/builders/
+
+  cp $DIR/package.json $DIST
+  rsync -r --exclude=*.ts ${DIR}/src/ ${DIST}/
+fi
+
diff --git a/src/frontend/packages/devkit/package-lock.json b/src/frontend/packages/devkit/package-lock.json
new file mode 100644
index 0000000000..9ce1ec7eaa
--- /dev/null
+++ b/src/frontend/packages/devkit/package-lock.json
@@ -0,0 +1,14 @@
+{
+  "name": "@stratosui/tools",
+  "version": "0.0.1",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "typescript": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.2.tgz",
+      "integrity": "sha512-lmQ4L+J6mnu3xweP8+rOrUwzmN+MRAj7TgtJtDaXE5PMyX2kCrklhg3rvOsOIfNeAWMQWO2F1GPc1kMD2vLAfw==",
+      "dev": true
+    }
+  }
+}
diff --git a/src/frontend/packages/devkit/package.json b/src/frontend/packages/devkit/package.json
new file mode 100644
index 0000000000..88be8dba36
--- /dev/null
+++ b/src/frontend/packages/devkit/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "@stratosui/tools",
+  "version": "0.0.1",
+  "scripts": {
+    "build": "./build.sh",
+    "tsc": "tsc"
+  },
+  "dependencies": {
+    "@angular-devkit/core": "^9.1.7",
+    "@angular-devkit/schematics": "^9.1.7",
+    "typescript": "~3.8.2"
+  },
+  "devDependencies": {
+    "@angular-devkit/architect": "^1.0.0"
+  },
+  "builders": "builders/builders.json",
+  "schematics": "./schematics/collection.json"
+}
diff --git a/src/frontend/packages/devkit/src/build/assets.ts b/src/frontend/packages/devkit/src/build/assets.ts
new file mode 100644
index 0000000000..182f44ae1f
--- /dev/null
+++ b/src/frontend/packages/devkit/src/build/assets.ts
@@ -0,0 +1,20 @@
+import CopyPlugin = require('copy-webpack-plugin');
+
+import { StratosConfig } from '../lib/stratos.config';
+
+// Handler ensures all assets from packages are copied as part of the build
+export class AssetsHandler {
+
+  constructor() {}
+
+  public apply(webpackConfig: any, config: StratosConfig) {
+    const assetsCopyConfig = config.getAssets();
+    if (assetsCopyConfig.length > 0) {
+      // Add a plugin to copy assets - this will ensure we copy the assets from each extension and the theme
+      const plugins = [
+        new CopyPlugin(assetsCopyConfig)
+      ];
+      webpackConfig.plugins = webpackConfig.plugins.concat(plugins);
+    }
+  }
+}
diff --git a/src/frontend/packages/devkit/src/build/extensions.ts b/src/frontend/packages/devkit/src/build/extensions.ts
new file mode 100644
index 0000000000..1b4816edd3
--- /dev/null
+++ b/src/frontend/packages/devkit/src/build/extensions.ts
@@ -0,0 +1,68 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { NormalModuleReplacementPlugin } from 'webpack';
+
+import { StratosConfig } from '../lib/stratos.config';
+
+const importModuleRegex = /src\/frontend\/packages\/core\/src\/custom-import.module.ts/;
+
+/**
+ * Generates the file _custom-import.module.ts containing the code to import
+ * the extensions modules discovered from the packages being included.
+ *
+ * This also adds a module replacement into the build process, so that this generated file
+ * is used instead of the default one in the repository, which does not import
+ * any extensions.
+ */
+
+export class ExtensionsHandler {
+
+  constructor() {}
+
+  // Write out the _custom-import.module.ts file importing all of the required extensions
+  public apply(webpackConfig: any, config: StratosConfig, options: any) {
+
+    // Generate the module file to import the appropriate extensions
+    const dir = path.dirname(options.main);
+    const overrideFile = path.resolve(path.join(dir, './_custom-import.module.ts'));
+
+    fs.writeFileSync(overrideFile, '// This file is auto-generated - DO NOT EDIT\n\n');
+    fs.appendFileSync(overrideFile, 'import { NgModule } from \'@angular/core\';\n');
+
+    const moduleImports = {
+      imports: []
+    };
+
+    const routingMmoduleImports = {
+      imports: []
+    };
+
+    config.getExtensions().forEach(e => {
+      let modules = e.module;
+      moduleImports.imports.push(e.module);
+      if (e.routingModule) {
+        routingMmoduleImports.imports.push(e.routingModule);
+        modules += ', ' + e.routingModule;
+      }
+
+      fs.appendFileSync(overrideFile, 'import { ' + modules + ' } from \'' + e.package + '\';\n');
+    });
+
+    this.writeModule(overrideFile, 'CustomImportModule', moduleImports);
+    this.writeModule(overrideFile, 'CustomRoutingImportModule', routingMmoduleImports);
+
+    webpackConfig.plugins.push(new NormalModuleReplacementPlugin(
+      importModuleRegex,
+      overrideFile
+    ));
+  }
+
+  private writeModule(file: string, name: string, imports: any) {
+    fs.appendFileSync(file, '\n@NgModule(\n');
+    let json = JSON.stringify(imports, null, 2);
+    json = json.replace(/['"]+/g, '');
+    fs.appendFileSync(file, json);
+    fs.appendFileSync(file, ')\n');
+    fs.appendFileSync(file, 'export class ' + name + ' {}\n\n');
+  }
+}
diff --git a/src/frontend/packages/devkit/src/build/index.transform.ts b/src/frontend/packages/devkit/src/build/index.transform.ts
new file mode 100644
index 0000000000..7282558c2b
--- /dev/null
+++ b/src/frontend/packages/devkit/src/build/index.transform.ts
@@ -0,0 +1,82 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+import { StratosConfig } from '../lib/stratos.config';
+
+/**
+ * Transforms the index.html file
+ *
+ * Adds in the Git metadata
+ * Adds in the custom loader from the theme, if there is one
+ */
+export class IndexHtmlHandler {
+
+  constructor(public config: StratosConfig) {}
+
+  public apply(src: string): string {
+
+    // Patch different page title if there is one
+    const title = this.config.stratosConfig.title || 'Stratos';
+    src = src.replace(/@@TITLE@@/g, title);
+
+    // // Git Information
+    const gitMetadata = this.config.gitMetadata;
+    src = src.replace(/@@stratos_git_project@@/g, gitMetadata.project );
+    src = src.replace(/@@stratos_git_branch@@/g, gitMetadata.branch );
+    src = src.replace(/@@stratos_git_commit@@/g, gitMetadata.commit );
+
+    // // Date and Time that the build was made (approximately => it is when this script is run)
+    src = src.replace(/@@stratos_build_date@@/g, new Date().toString() );
+
+    // Loading view (provided by theme)
+
+    let loadingTheme = this.config.getTheme();
+    const hasTheme = loadingTheme.stratos && loadingTheme.theme;
+
+    // Custom loading indicator should default to the loading screen in the default theme, if custom theme does not have one
+    if (!hasTheme || hasTheme && !loadingTheme.json.stratos.theme.loadingCss) {
+      loadingTheme = this.config.getDefaultTheme();
+    }
+
+    const themePackageJson = loadingTheme.json;
+    const themePackageFolder = loadingTheme.dir;
+    const css = themePackageJson.stratos.theme.loadingCss;
+    const html = themePackageJson.stratos.theme.loadingHtml;
+
+    if (css) {
+      const cssFile = path.resolve(themePackageFolder, css);
+      if (fs.existsSync(cssFile)) {
+        const loadingCss = fs.readFileSync(cssFile, 'utf8');
+        src = src.replace(/\/\*\* @@LOADING_CSS@@ \*\*\//g, loadingCss);
+      }
+    }
+
+    if (html) {
+      const htmlFile = path.resolve(themePackageFolder, html);
+      if (fs.existsSync(htmlFile)) {
+        const loadingHtml = fs.readFileSync(htmlFile, 'utf8');
+        src = src.replace(/<!-- @@LOADING_HTML@@ -->/g, loadingHtml);
+      }
+    }
+    return src;
+  }
+}
+
+interface TargetOptions {
+  configuration?: string;
+  project: string;
+  target: string;
+}
+
+// Transform the index.html
+const indexTransform = (options: TargetOptions, content: string) => {
+
+  // Get the Stratos config - don't log a second time
+  const sConfig = new StratosConfig(__dirname, this.options, false);
+
+  const handler = new IndexHtmlHandler(sConfig);
+  const modified = handler.apply(content);
+  return Promise.resolve(modified);
+};
+
+module.exports = indexTransform;
diff --git a/src/frontend/packages/devkit/src/build/main.ts b/src/frontend/packages/devkit/src/build/main.ts
new file mode 100644
index 0000000000..d5954d0be2
--- /dev/null
+++ b/src/frontend/packages/devkit/src/build/main.ts
@@ -0,0 +1,42 @@
+import { StratosConfig } from '../lib/stratos.config';
+import { AssetsHandler } from './assets';
+import { ExtensionsHandler } from './extensions';
+import { SassHandler } from './sass';
+
+/**
+ * Webpack customizations for Stratos
+ *
+ * The runBuilder function is exported and used as the function to apply
+ * customizations to the Webpack configuration
+ */
+
+class StratosBuilder {
+
+  constructor(public webpackConfig, public options) { }
+
+  public run() {
+    // Read in the Stratos config file if present (and do so config initialization)
+    const sConfig = new StratosConfig(__dirname, this.options);
+
+    // Sass handler for themes and themable packages
+    const sass = new SassHandler();
+    sass.apply(this.webpackConfig, sConfig);
+
+    // Assets from extensions or theme
+    const assets = new AssetsHandler();
+    assets.apply(this.webpackConfig, sConfig);
+
+    // Extensions (code)
+    const ext = new ExtensionsHandler();
+    ext.apply(this.webpackConfig, sConfig, this.options);
+  }
+}
+
+// Apply the Stratos customizations to the webpack configuration
+const runBuilder = (config, options) => {
+  const builder = new StratosBuilder(config, options);
+  builder.run();
+  return config;
+};
+
+module.exports = runBuilder;
diff --git a/src/frontend/packages/devkit/src/build/sass.ts b/src/frontend/packages/devkit/src/build/sass.ts
new file mode 100644
index 0000000000..745a378e36
--- /dev/null
+++ b/src/frontend/packages/devkit/src/build/sass.ts
@@ -0,0 +1,88 @@
+import { StratosConfig } from '../lib/stratos.config';
+
+/**
+ * Sass Handler
+ *
+ * Provides some custom resolution of sass files so that the theming
+ * is applied to components and that the chosen theme is used.
+ *
+ * Essentially intercepts package imports of the form ~@startosui/theme
+ * and ensures the correct packaeg is used.
+ */
+export class SassHandler {
+
+  constructor() { }
+
+  //  Set options on the Webpack sass-loader plugin to use us as a custom importer
+  public apply(webpackConfig: any, config: StratosConfig) {
+    // Find the node-saas plugin and add a custom import resolver
+    webpackConfig.module.rules.forEach(rule => {
+      if (rule.include) {
+        rule.use.forEach(p => {
+          if (p.loader && p.loader.indexOf('sass-loader') > 0) {
+            p.options.sassOptions = {
+              importer: this.customSassImport(config)
+            };
+          }
+        });
+      }
+    });
+  }
+
+  private customSassImport(config: StratosConfig) {
+    const that = this;
+    return (url, resourcePath) => {
+      if (url === '~@stratosui/theme/extensions') {
+        // Generate SCSS to appy theming to the packages that need to be themed
+        return {
+          contents: that.getThemingForPackages(config)
+        };
+      } else if (url === '~@stratosui/theme') {
+        return {
+          file: config.resolvePackage(config.getTheme().name, '_index.scss')
+        };
+      } else if (url.indexOf('~') === 0) {
+        // See if we have an override
+        const pkg = url.substr(1);
+        const pkgParts = pkg.split('/');
+        let pkgName = '';
+        if (pkgParts[0].indexOf('@') === 0) {
+          // Package name has a scope
+          pkgName = pkgParts.shift() + '/' + pkgParts.shift();
+        } else {
+          pkgName = pkgParts.shift();
+        }
+        const pkgPath = pkgParts.join('/');
+        // See if we can resolve the package name
+        const knownPath = config.resolveKnownPackage(pkgName);
+        if (knownPath) {
+          return {
+            file: knownPath + '/_' + pkgPath + '.scss'
+          };
+        }
+      }
+
+      // We could not resolve, so leave to the default resolver
+      return null;
+    };
+  }
+
+  // Generate an import and include for each themable package so that we theme
+  // its components when the application is built.
+  private getThemingForPackages(c: StratosConfig): string {
+    let contents = '';
+    const themedPackages = c.getThemedPackages();
+    themedPackages.forEach(themingConfig => {
+      contents += `@import '${themingConfig.importPath}';\n`;
+    });
+
+    contents += '\n@mixin apply-theme($stratos-theme) {\n';
+    themedPackages.forEach(themingConfig => {
+      contents += `  @include ${themingConfig.mixin}($stratos-theme);\n`;
+    });
+    contents += '}\n';
+
+    return contents;
+  }
+
+}
diff --git a/src/frontend/packages/devkit/src/builders/builders.json b/src/frontend/packages/devkit/src/builders/builders.json
new file mode 100644
index 0000000000..2ad448ceee
--- /dev/null
+++ b/src/frontend/packages/devkit/src/builders/builders.json
@@ -0,0 +1,10 @@
+{
+  "$schema": "@angular-devkit/architect/src/builders-schema.json",
+  "builders": {
+    "stratos-theme": {
+      "implementation": "./theme.builder",
+      "schema": "./theme.builder.schema.json",
+      "description": "Stratos Theme builder"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/devkit/src/builders/theme.builder.schema.json b/src/frontend/packages/devkit/src/builders/theme.builder.schema.json
new file mode 100644
index 0000000000..6b1b7eac48
--- /dev/null
+++ b/src/frontend/packages/devkit/src/builders/theme.builder.schema.json
@@ -0,0 +1,13 @@
+{
+  "id": "StratosThemeBuilderSchema",
+  "title": "Stratos Theme builder",
+  "description": "Timestamp builder options",
+  "properties": {
+    "outputPath": {
+      "type": "string",
+      "description": "Path for the output",
+      "default": "./dist"
+    }
+  }
+}
+  
\ No newline at end of file
diff --git a/src/frontend/packages/devkit/src/builders/theme.builder.ts b/src/frontend/packages/devkit/src/builders/theme.builder.ts
new file mode 100644
index 0000000000..5d133e9d0a
--- /dev/null
+++ b/src/frontend/packages/devkit/src/builders/theme.builder.ts
@@ -0,0 +1,43 @@
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
+import { JsonObject } from '@angular-devkit/core';
+import * as FS from 'fs-extra';
+import * as Path from 'path';
+
+import { Packages } from '../lib/packages';
+
+export interface ThemeOptions extends JsonObject {
+  outputPath: string;
+}
+
+export default createBuilder(commandBuilder);
+
+async function commandBuilder(
+  options: ThemeOptions,
+  context: BuilderContext,
+  ): Promise<BuilderOutput> {
+    // A theme 'just' contains assets, so copy these to the dist folder
+    const outPath = Path.join(context.workspaceRoot, options.outputPath);
+
+    // Remove the dist folder and recreate it fresh
+    FS.removeSync(outPath);
+    FS.ensureDir(outPath);
+
+    // Get project root
+    const prjMetadata = await context.getProjectMetadata(context.target);
+
+    // Copy all files from root to the outPath
+
+    FS.copySync(prjMetadata.root, outPath);
+
+    // We can remove scripts from the package.json file
+    const pkgFile = Packages.loadPackageFile(outPath);
+    if (pkgFile !== null) {
+      delete pkgFile.scripts;
+      const pkgFilePath = Path.join(outPath, 'package.json');
+      FS.writeJsonSync(pkgFilePath, pkgFile, { spaces: 2});
+    }
+
+    return Promise.resolve(
+      { success: true}
+    );
+}
diff --git a/src/frontend/packages/devkit/src/lib/git.metadata.ts b/src/frontend/packages/devkit/src/lib/git.metadata.ts
new file mode 100644
index 0000000000..3fcc50d6ed
--- /dev/null
+++ b/src/frontend/packages/devkit/src/lib/git.metadata.ts
@@ -0,0 +1,37 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+const GIT_METADATA_FILE = '.stratos-git-metadata.json';
+
+/**
+ * Represents the Git Metadata read from the metadata file or the
+ * environment variables.
+ *
+ * This is embedded in the index.html file for diagnostic purposes
+ */
+export class GitMetadata {
+
+  public project: string;
+  public branch: string;
+  public commit: string;
+
+  public exists = false;
+
+  constructor(dir: string) {
+
+    this.project = process.env.project || process.env.STRATOS_PROJECT || '';
+    this.branch = process.env.branch || process.env.STRATOS_BRANCH || '';
+    this.commit = process.env.commit || process.env.STRATOS_COMMIT || '';
+
+    // Try and read the git metadata file
+    const gitMetadataFile = path.join(dir, GIT_METADATA_FILE);
+    if (fs.existsSync(gitMetadataFile)) {
+      const gitMetadata = JSON.parse(fs.readFileSync(gitMetadataFile).toString());
+      this.project = gitMetadata.project;
+      this.branch = gitMetadata.branch;
+      this.commit = gitMetadata.commit;
+      this.exists = true;
+    }
+  }
+
+}
diff --git a/src/frontend/packages/devkit/src/lib/log.ts b/src/frontend/packages/devkit/src/lib/log.ts
new file mode 100644
index 0000000000..8c23c0c0a1
--- /dev/null
+++ b/src/frontend/packages/devkit/src/lib/log.ts
@@ -0,0 +1,17 @@
+let logLevel = 1;
+
+export interface Logger {
+  log(msg: string): void;
+}
+
+export function setLogLevel(level: number) {
+  logLevel = level;
+}
+
+export function debug(msg) {
+  if (logLevel > 0) {
+    console.log(msg);
+  }
+}
+
+
diff --git a/src/frontend/packages/devkit/src/lib/packages.ts b/src/frontend/packages/devkit/src/lib/packages.ts
new file mode 100644
index 0000000000..0cc801f990
--- /dev/null
+++ b/src/frontend/packages/devkit/src/lib/packages.ts
@@ -0,0 +1,291 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+import { Logger } from './log';
+import { StratosConfig } from './stratos.config';
+
+// Helper for packages
+
+// A set of info for a package
+export interface PackageInfo {
+  name: string;
+  dir: string;
+  stratos: boolean;
+  json: any;
+  ignore: boolean;
+  extension?: ExtensionMetadata;
+  theme: boolean;
+  theming?: ThemingMetadata;
+  assets: AssetMetadata[];
+}
+
+// Basic info for the package.json file that we need
+export interface PackageJson {
+  name: string;
+  stratos?: StratosPakageMetadata;
+  scripts: { [key: string]: string };
+}
+
+// Custom stratos metadata that can be in the package.json file
+export interface StratosPakageMetadata {
+  module?: string;
+  routingModule?: string;
+  ignore?: boolean;
+  theme?: boolean;
+  theming?: string;
+  assets?: { [src: string]: string };
+}
+
+// Theming metadata
+export interface ThemingMetadata {
+  ref: string;
+  package: string;
+  scss: string;
+  mixin: string;
+  importPath: string;
+}
+
+// Extension metadata
+export interface ExtensionMetadata {
+  package: string;
+  module: string;
+  routingModule?: string;
+  themeable?: boolean;
+}
+
+// Assets metadata
+export interface AssetMetadata {
+  from: string;
+  to: string;
+  force: boolean;
+}
+
+// Helpers for getting list of dirs in a dir
+const isDirectory = source => fs.lstatSync(source).isDirectory();
+const getDirectories = source =>
+  fs.readdirSync(source).map(name => path.join(source, name)).filter(isDirectory);
+
+// Default theme to use
+export const DEFAULT_THEME = '@stratosui/theme';
+
+export class Packages {
+
+  public packages: PackageInfo[] = [];
+  public packageMap: Map<string, PackageInfo> = new Map<string, PackageInfo>();
+
+  public pkgReadMap: Map<string, PackageInfo> = new Map<string, PackageInfo>();
+
+  public theme: PackageInfo;
+
+  public logger: Logger;
+
+
+  // Try and find and load a package.json file in the specified folder
+  public static loadPackageFile(dir: string) {
+    const pkgFile = path.join(dir, 'package.json');
+    let pkg = null;
+    if (fs.existsSync(pkgFile)) {
+      try {
+        pkg = JSON.parse(fs.readFileSync(pkgFile, 'utf8').toString());
+      } catch (e) { }
+    }
+    return pkg;
+  }
+
+  constructor(public config: StratosConfig, public nodeModulesFolder: string, public localPackagesFolder) { }
+
+  public setLogger(logger: Logger) {
+    this.logger = logger;
+  }
+
+  public log(msg: string) {
+    if (this.logger) {
+      this.logger.log(msg);
+    }
+  }
+
+  // Look for packages
+  public scan(packageJson: any) {
+    this.pkgReadMap = new Map<string, PackageInfo>();
+
+    if (packageJson.peerDependencies) {
+      Object.keys(packageJson.peerDependencies).forEach(dep => {
+        this.addPackage(dep);
+      });
+    }
+
+    // Read all dependencies
+    if (packageJson.dependencies) {
+      Object.keys(packageJson.dependencies).forEach(dep => {
+        this.addPackage(dep);
+      });
+    }
+
+    // Local folders
+    // Find all local packages in the folder
+    getDirectories(this.localPackagesFolder).forEach(pkgDir => {
+      this.addPackage(pkgDir, true);
+    });
+
+    // Figure out the theme
+    if (!this.config.stratosConfig.theme) {
+      // Theme was not set, so find the first theme that is not the default theme
+      const theme = this.packages.find(pkg => pkg.theme && pkg.name !== DEFAULT_THEME);
+      if (!theme) {
+        this.theme = this.packageMap[DEFAULT_THEME];
+      } else {
+        this.theme = theme;
+      }
+    } else {
+      this.theme = this.packageMap[this.config.stratosConfig.theme];
+    }
+
+    // Ensure that the theme is last in the list, so that its resources are copied last
+    const index = this.packages.findIndex(pkg => pkg.name === this.theme.name);
+    if (index > -1) {
+      const items = this.packages.splice(index, 1);
+      this.packages.push(items[0]);
+    }
+
+    this.log('Packages:');
+    this.packages.forEach(pkg => this.log(` + ${pkg.name}`));
+  }
+
+  public addPackage(pkgName, isLocal = false) {
+    if (this.pkgReadMap[pkgName]) {
+      return;
+    }
+    this.pkgReadMap[pkgName] = true;
+
+    let pkgDir = pkgName;
+    if (!isLocal) {
+      pkgDir = path.join(this.nodeModulesFolder, pkgName);
+    }
+
+    // Read the package file
+    const pkgFile = Packages.loadPackageFile(pkgDir);
+    if (pkgFile !== null) {
+      // Check to see if we should include this package
+      if (this.includePackage(pkgFile)) {
+        // Process all of the peer dependencies first
+        if (pkgFile.peerDependencies) {
+          Object.keys(pkgFile.peerDependencies).forEach(dep => this.addPackage(dep));
+        }
+        const pkg = this.processPackage(pkgFile, pkgDir);
+        this.add(pkg);
+      }
+    }
+  }
+
+  private add(item: PackageInfo) {
+    if (!this.packageMap[item.name]) {
+      // We don't already have this package
+      this.packages.push(item);
+      this.packageMap[item.name] = item;
+    }
+  }
+
+  // Get all of the extensions
+  public getExtensions(): ExtensionMetadata[] {
+    const extensions: ExtensionMetadata[] = [];
+    this.packages.forEach(pkg => {
+      if (pkg.extension) {
+        extensions.push(pkg.extension);
+      }
+    });
+
+    return extensions;
+  }
+
+  // Should we include the specified package?
+  private includePackage(pkg: PackageJson): boolean {
+
+    // Must be a stratos package
+    if (!pkg.stratos) {
+      return false;
+    }
+
+    // If we don't have any explicit includes, then include it
+    if (!this.config.stratosConfig.packages) {
+      return true;
+    }
+
+    // Use the include set if one is specified
+    if (this.config.stratosConfig.packages.include) {
+      return this.config.stratosConfig.packages.include.includes(pkg.name);
+    }
+
+    // Remove any excluded extensions
+    if (this.config.stratosConfig.packages.exclude) {
+      return !this.config.stratosConfig.packages.exclude.includes(pkg.name);
+    }
+
+    return true;
+  }
+
+  // Process the package file and look for Stratos metadata
+  private processPackage(pkg: PackageJson, folder: string): PackageInfo {
+    const info: PackageInfo = {
+      name: pkg.name,
+      dir: folder,
+      stratos: !!pkg.stratos,
+      json: pkg,
+      ignore: pkg.stratos ? pkg.stratos.ignore || false : false,
+      theme: pkg.stratos && pkg.stratos.theme,
+      theming: this.getThemingConfig(pkg, folder),
+      assets: this.getAssets(pkg, folder)
+    };
+
+    // If this is an extension, add extension metadata
+    if (pkg.stratos && pkg.stratos.module) {
+      info.extension = {
+        package: pkg.name,
+        module: pkg.stratos.module,
+        routingModule: pkg.stratos.routingModule
+      };
+    }
+
+    return info;
+  }
+
+  // Get any theming metadata - this allows a package to theme its own components using the theme
+  private getThemingConfig(pkg: PackageJson, packagePath: string): ThemingMetadata {
+    if (pkg.stratos && pkg.stratos.theming) {
+      const refParts = pkg.stratos.theming.split('#');
+      if (refParts.length === 2) {
+        const themingConfig: ThemingMetadata = {
+          ref: pkg.stratos.theming,
+          package: pkg.name,
+          scss: refParts[0],
+          mixin: refParts[1],
+          importPath: path.join(packagePath, refParts[0])
+        };
+        this.log('Found themed package: ' + pkg.name + ' (' + pkg.stratos.theming + ')');
+        return themingConfig;
+      } else {
+        this.log('Invalid theming reference: ' + pkg.stratos.theming);
+      }
+    }
+
+    return null;
+  }
+
+  // Get any assets that the package has
+  private getAssets(pkg: PackageJson, packagePath: string): AssetMetadata[] {
+    const assets: AssetMetadata[] = [];
+    // Check for assets
+    if (pkg.stratos && pkg.stratos.assets) {
+      Object.keys(pkg.stratos.assets).forEach(src => {
+        let abs = path.join(packagePath, src);
+        abs = path.resolve(abs);
+        assets.push({
+          from: abs,
+          to: pkg.stratos.assets[src],
+          force: true
+        });
+      });
+    }
+    return assets.length ? assets : null;
+  }
+
+}
diff --git a/src/frontend/packages/devkit/src/lib/schematics.ts b/src/frontend/packages/devkit/src/lib/schematics.ts
new file mode 100644
index 0000000000..0ff11e421d
--- /dev/null
+++ b/src/frontend/packages/devkit/src/lib/schematics.ts
@@ -0,0 +1,140 @@
+import { normalize, split, tags, virtualFs, workspaces } from '@angular-devkit/core';
+import { Rule, SchematicsException, Tree } from '@angular-devkit/schematics';
+
+
+export const Builders = {
+  Theme: '@stratosui/devkit:stratos-theme'
+}
+
+export const Versions = {
+  Stratos: '0.1.0',
+}
+
+export const ProjectType = {
+  Theme: 'library',
+}
+
+// =========================================================================================================
+// Utilities from the Angular Schema repository
+// =========================================================================================================
+
+// See: https://github.com/angular/angular-cli/blob/master/packages/schematics/angular/utility/validation.ts
+
+export function validateProjectName(projectName: string) {
+  const errorIndex = getRegExpFailPosition(projectName);
+  const unsupportedProjectNames: string[] = [];
+  const packageNameRegex = /^(?:@[a-zA-Z0-9_-]+\/)?[a-zA-Z0-9_-]+$/;
+  if (errorIndex !== null) {
+    const firstMessage = tags.oneLine`
+    Project name "${projectName}" is not valid. New project names must
+    start with a letter, and must contain only alphanumeric characters or dashes.
+    When adding a dash the segment after the dash must also start with a letter.
+    `;
+    const msg = tags.stripIndent`
+    ${firstMessage}
+    ${projectName}
+    ${Array(errorIndex + 1).join(' ') + '^'}
+    `;
+    throw new SchematicsException(msg);
+  } else if (unsupportedProjectNames.indexOf(projectName) !== -1) {
+    throw new SchematicsException(
+      `Project name ${JSON.stringify(projectName)} is not a supported name.`);
+  } else if (!packageNameRegex.test(projectName)) {
+    throw new SchematicsException(`Project name ${JSON.stringify(projectName)} is invalid.`);
+  }
+}
+
+
+function getRegExpFailPosition(str: string): number | null {
+  const isScope = /^@.*\/.*/.test(str);
+  if (isScope) {
+    // Remove starting @
+    str = str.replace(/^@/, '');
+    // Change / to - for validation
+    str = str.replace(/\//g, '-');
+  }
+
+  const parts = str.indexOf('-') >= 0 ? str.split('-') : [str];
+  const matched: string[] = [];
+
+  const projectNameRegexp = /^[a-zA-Z][.0-9a-zA-Z]*(-[.0-9a-zA-Z]*)*$/;
+
+  parts.forEach(part => {
+    if (part.match(projectNameRegexp)) {
+      matched.push(part);
+    }
+  });
+
+  const compare = matched.join('-');
+
+  return (str !== compare) ? compare.length : null;
+}
+
+
+// See: https://github.com/angular/angular-cli/blob/master/packages/schematics/angular/utility/paths.ts
+
+export function relativePathToWorkspaceRoot(projectRoot: string | undefined): string {
+  const normalizedPath = split(normalize(projectRoot || ''));
+
+  if (normalizedPath.length === 0 || !normalizedPath[0]) {
+    return '.';
+  } else {
+    return normalizedPath.map(() => '..').join('/');
+  }
+}
+
+// See: https:// github.com/angular/angular-cli/blob/master/packages/schematics/angular/utility/workspace.ts
+export function updateWorkspace(
+  updater: (workspace: workspaces.WorkspaceDefinition) => void | PromiseLike<void>,
+): Rule;
+export function updateWorkspace(
+  updaterOrWorkspace: workspaces.WorkspaceDefinition
+    | ((workspace: workspaces.WorkspaceDefinition) => void | PromiseLike<void>),
+): Rule {
+  return async (tree: Tree) => {
+    const host = createHost(tree);
+
+    if (typeof updaterOrWorkspace === 'function') {
+
+      const { workspace } = await workspaces.readWorkspace('/', host);
+
+      const result = updaterOrWorkspace(workspace);
+      if (result !== undefined) {
+        await result;
+      }
+
+      await workspaces.writeWorkspace(workspace, host);
+    } else {
+      await workspaces.writeWorkspace(updaterOrWorkspace, host);
+    }
+  };
+}
+
+export async function getWorkspace(tree: Tree, path = '/') {
+  const host = createHost(tree);
+  const { workspace } = await workspaces.readWorkspace(path, host);
+  return workspace;
+}
+
+function createHost(tree: Tree): workspaces.WorkspaceHost {
+  return {
+    async readFile(path: string): Promise<string> {
+      const data = tree.read(path);
+      if (!data) {
+        throw new Error('File not found.');
+      }
+
+      return virtualFs.fileBufferToString(data);
+    },
+    async writeFile(path: string, data: string): Promise<void> {
+      return tree.overwrite(path, data);
+    },
+    async isDirectory(path: string): Promise<boolean> {
+      // approximate a directory check
+      return !tree.exists(path) && tree.getDir(path).subfiles.length > 0;
+    },
+    async isFile(path: string): Promise<boolean> {
+      return tree.exists(path);
+    },
+  };
+}
\ No newline at end of file
diff --git a/src/frontend/packages/devkit/src/lib/stratos.config.ts b/src/frontend/packages/devkit/src/lib/stratos.config.ts
new file mode 100644
index 0000000000..3e47b52281
--- /dev/null
+++ b/src/frontend/packages/devkit/src/lib/stratos.config.ts
@@ -0,0 +1,232 @@
+import * as fs from 'fs';
+import * as yaml from 'js-yaml';
+import * as path from 'path';
+
+import { GitMetadata } from './git.metadata';
+import { Logger } from './log';
+import { AssetMetadata, DEFAULT_THEME, ExtensionMetadata, PackageInfo, Packages, ThemingMetadata } from './packages';
+
+/**
+ * Represents the stratos.yaml file or the defaults if not found
+ *
+ * Also includes related config such as node_modules dirpath and angular.json file path
+ */
+
+export class StratosConfig implements Logger {
+
+  // File paths to a few files we need access to
+  public packageJsonFile: string;
+  public nodeModulesFile: string;
+  public angularJsonFile: string;
+
+  // angular.json contents
+  public angularJson: any;
+
+  // package.json contents
+  public packageJson: any;
+
+  // newProjectRoot from the angular.json file
+  // Used as the directory to check for local packages
+  public newProjectRoot: string;
+
+  // Stratos config file
+  public stratosConfig: any;
+
+  // Git Metadata
+  public gitMetadata: GitMetadata;
+
+  private loggingEnabled = true;
+
+  private packages: Packages;
+
+  constructor(dir: string, options?: any, loggingEnabled = true) {
+    this.angularJsonFile = this.findFileOrFolderInChain(dir, 'angular.json');
+    this.angularJson = JSON.parse(fs.readFileSync(this.angularJsonFile, 'utf8').toString());
+    this.loggingEnabled = loggingEnabled;
+
+    // The Stratos config file is optional - allows overriding default behaviour
+    this.stratosConfig = {};
+    if (this.angularJsonFile) {
+      // Read stratos.yaml if we can
+      const stratosYamlFile = path.join(path.dirname(this.angularJsonFile), 'stratos.yaml');
+      if (fs.existsSync(stratosYamlFile)) {
+        try {
+          this.stratosConfig = yaml.safeLoad(fs.readFileSync(stratosYamlFile, 'utf8'));
+          // this.log(this.stratosConfig);
+          this.log('Read stratos.yaml okay from: ' + stratosYamlFile);
+        } catch (e) {
+          this.log(e);
+        }
+      } else {
+        this.log('Using default configuration');
+      }
+    }
+
+    // Exclude the default packages... unless explicity `include`d
+    this.excludeExamples()
+
+    const mainDir = options ? path.dirname(options.main) : dir;
+
+    this.packageJsonFile = this.findFileOrFolderInChain(mainDir, 'package.json');
+    if (this.packageJsonFile !== null) {
+      this.packageJson = JSON.parse(fs.readFileSync(this.packageJsonFile, 'utf8').toString());
+    }
+
+    this.nodeModulesFile = this.findFileOrFolderInChain(mainDir, 'node_modules');
+
+    this.gitMetadata = new GitMetadata(path.dirname(this.angularJsonFile));
+    // this.log(this.gitMetadata);
+    if (this.gitMetadata.exists) {
+      this.log('Read git metadata file');
+    }
+
+    this.newProjectRoot = this.angularJson.newProjectRoot;
+
+    // Discover all packages
+
+    // Helper to discover and interpret packages
+    this.packages = new Packages(this, this.nodeModulesFile, this.newProjectRoot);
+    this.packages.setLogger(this);
+    this.packages.scan(this.packageJson);
+
+    this.log('Using theme ' + this.packages.theme.name);
+
+    const extensions = this.getExtensions();
+
+    if (extensions.length === 0) {
+      this.log('Building without any extensions');
+    } else {
+      this.log('Building with these extensions:');
+      extensions.forEach(ext => this.log(` + ${ext.package}`));
+    }
+  }
+
+  private excludeExamples() {
+    const examplePackages = ['@example/theme', '@example/extensions']
+    const exclude = [];
+    // Are examples explicitly in the include section?
+    if (this.stratosConfig &&
+      this.stratosConfig.packages &&
+      this.stratosConfig.packages.include &&
+      this.stratosConfig.packages.include.length > 0 // Will check if this is an array
+    ) {
+      examplePackages.forEach(ep => this.addIfMissing(this.stratosConfig.packages.include, ep, exclude))
+    } else {
+      exclude.push(...examplePackages);
+    }
+
+    // No op
+    if (exclude.length < 1) {
+      return;
+    }
+
+    // If examples are not in include section, add them to the exclude
+    if (!this.stratosConfig) {
+      this.stratosConfig = {}
+    }
+    if (!this.stratosConfig.packages) {
+      this.stratosConfig.packages = {}
+    }
+    if (!this.stratosConfig.packages.exclude) {
+      this.stratosConfig.packages.exclude = [];
+    }
+    exclude.forEach(e => this.addIfMissing(this.stratosConfig.packages.exclude, e));
+  }
+
+  private addIfMissing<T = string>(array: T[], entry: T, dest: T[] = array) {
+    if (array.indexOf(entry) < 0) {
+      dest.push(entry)
+    }
+  }
+
+  public log(msg: any) {
+    if (this.loggingEnabled) {
+      console.log(msg);
+    }
+  }
+
+  public getTheme(): PackageInfo {
+    return this.packages.theme;
+  }
+
+  public getDefaultTheme(): PackageInfo {
+    return this.packages.packageMap[DEFAULT_THEME];
+  }
+
+  public getExtensions(): ExtensionMetadata[] {
+    return this.packages.packages.filter(p => !!p.extension).map(pkg => pkg.extension);
+  }
+
+  public getAssets(): AssetMetadata[] {
+    const assets: AssetMetadata[] = [];
+    this.packages.packages.forEach(pkg => {
+      if (pkg.assets) {
+        assets.push(...pkg.assets);
+      }
+    });
+
+    return assets;
+  }
+
+  public getThemedPackages(): ThemingMetadata[] {
+    return this.packages.packages.filter(p => !!p.theming).map(pkg => pkg.theming);
+  }
+
+  public getPackageJsonFolder() {
+    return path.dirname(this.packageJsonFile);
+  }
+
+  public getNodeModulesFolder() {
+    return path.dirname(this.nodeModulesFile);
+  }
+
+  // Go up the directory hierarchy and look for the named file or folder
+  private findFileOrFolderInChain(dir: string, name: string): string {
+    const parent = path.dirname(dir);
+    const itemPath = path.join(dir, name);
+    if (fs.existsSync(itemPath)) {
+      return itemPath;
+    }
+
+    if (parent === dir) {
+      return null;
+    }
+
+    return this.findFileOrFolderInChain(parent, name);
+  }
+
+  // Resolve a known package or return null if not a known package
+  public resolveKnownPackage(pkg: string): string {
+    const p = this.packages.packageMap[pkg];
+    if (p) {
+      let packagePath = p.dir;
+      if (!path.isAbsolute(packagePath)) {
+        packagePath = path.resolve(packagePath);
+      }
+      return packagePath;
+    }
+
+    return null;
+  }
+
+  // Resolve a package to a directory to a file path, if name is given
+  public resolvePackage(pkg: string, name?: string) {
+    let packagePath;
+    const pkgInfo = this.packages.packageMap[pkg];
+    if (pkgInfo) {
+      packagePath = pkgInfo.dir;
+    } else {
+      // Default to getting the package from the node_modules folder
+      packagePath = path.join(this.getNodeModulesFolder(), pkg);
+    }
+
+    if (!path.isAbsolute(packagePath)) {
+      packagePath = path.resolve(packagePath);
+    }
+
+    if (name) {
+      packagePath = path.join(packagePath, name);
+    }
+    return packagePath;
+  }
+}
diff --git a/src/frontend/packages/devkit/src/schematics/collection.json b/src/frontend/packages/devkit/src/schematics/collection.json
new file mode 100644
index 0000000000..77936e3b97
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/collection.json
@@ -0,0 +1,10 @@
+{
+  "$schema": "@angular-devkit/schematics/collection-schema.json",
+  "schematics": {
+    "theme": {
+      "factory": "./theme",
+      "description": "Stratos Theme",
+      "schema": "./theme/schema.json"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/devkit/src/schematics/theme/asset-files/README.md.template b/src/frontend/packages/devkit/src/schematics/theme/asset-files/README.md.template
new file mode 100644
index 0000000000..57e6cf5f22
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/asset-files/README.md.template
@@ -0,0 +1 @@
+# Assets go here
\ No newline at end of file
diff --git a/src/frontend/packages/core/misc/custom/login-bg.jpg b/src/frontend/packages/devkit/src/schematics/theme/asset-files/core/login-bg.jpg
similarity index 100%
rename from src/frontend/packages/core/misc/custom/login-bg.jpg
rename to src/frontend/packages/devkit/src/schematics/theme/asset-files/core/login-bg.jpg
diff --git a/src/frontend/packages/core/misc/custom/logo.png b/src/frontend/packages/devkit/src/schematics/theme/asset-files/core/logo.png
similarity index 100%
rename from src/frontend/packages/core/misc/custom/logo.png
rename to src/frontend/packages/devkit/src/schematics/theme/asset-files/core/logo.png
diff --git a/src/frontend/packages/core/misc/custom/nav-logo-icon.png b/src/frontend/packages/devkit/src/schematics/theme/asset-files/core/nav-logo-icon.png
similarity index 100%
rename from src/frontend/packages/core/misc/custom/nav-logo-icon.png
rename to src/frontend/packages/devkit/src/schematics/theme/asset-files/core/nav-logo-icon.png
diff --git a/src/frontend/packages/core/misc/custom/nav-logo.png b/src/frontend/packages/devkit/src/schematics/theme/asset-files/core/nav-logo.png
similarity index 100%
rename from src/frontend/packages/core/misc/custom/nav-logo.png
rename to src/frontend/packages/devkit/src/schematics/theme/asset-files/core/nav-logo.png
diff --git a/src/frontend/packages/core/misc/custom/favicon.ico b/src/frontend/packages/devkit/src/schematics/theme/asset-files/favicon.ico
similarity index 100%
rename from src/frontend/packages/core/misc/custom/favicon.ico
rename to src/frontend/packages/devkit/src/schematics/theme/asset-files/favicon.ico
diff --git a/src/frontend/packages/devkit/src/schematics/theme/files/_index.scss.template b/src/frontend/packages/devkit/src/schematics/theme/files/_index.scss.template
new file mode 100644
index 0000000000..403e3c6403
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/files/_index.scss.template
@@ -0,0 +1,12 @@
+@import '~@stratosui/theme/helper';
+
+@import './sass/mat-colors';
+@import './sass/custom';
+
+@function stratos-theme() {
+  $theme-primary: mat-palette($mat-blue);
+  $theme-warn: mat-palette($mat-red);
+  $stratos-theme: mat-light-theme($theme-primary, $theme-primary, $theme-warn);
+  $theme: stratos-theme-helper($stratos-theme);
+  @return $theme
+}
\ No newline at end of file
diff --git a/src/frontend/packages/devkit/src/schematics/theme/files/package.json.template b/src/frontend/packages/devkit/src/schematics/theme/files/package.json.template
new file mode 100644
index 0000000000..783f7cb462
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/files/package.json.template
@@ -0,0 +1,18 @@
+{
+  "name": "<%= dasherize(packageName) %>",
+  "version": "0.0.1",
+  "stratos": {<% if(!!includeAssets) { %>
+    "assets": {
+      "assets/core": "core/assets",
+      "assets/favicon.ico": "favicon.ico"
+    }<% if(!!includeLoader) { %>,<% } %><% } %><% if(!!includeLoader) { %>
+    "theme":{
+      "loadingCss": "loader/loading.css",
+      "loadingHtml": "loader/loading.html"
+    }<% } %>
+  },
+  "peerDependencies": {
+    "@stratosui/theme": "^<%= startosLatestVersion %>"
+  }
+}
+
diff --git a/src/frontend/packages/devkit/src/schematics/theme/files/sass/custom.scss.template b/src/frontend/packages/devkit/src/schematics/theme/files/sass/custom.scss.template
new file mode 100644
index 0000000000..7e10c12722
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/files/sass/custom.scss.template
@@ -0,0 +1 @@
+// Place custom styles here
\ No newline at end of file
diff --git a/src/frontend/packages/core/sass/mat-colors.scss b/src/frontend/packages/devkit/src/schematics/theme/files/sass/mat-colors.scss.template
similarity index 100%
rename from src/frontend/packages/core/sass/mat-colors.scss
rename to src/frontend/packages/devkit/src/schematics/theme/files/sass/mat-colors.scss.template
diff --git a/src/frontend/packages/devkit/src/schematics/theme/index.ts b/src/frontend/packages/devkit/src/schematics/theme/index.ts
new file mode 100644
index 0000000000..9a868e1261
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/index.ts
@@ -0,0 +1,110 @@
+import { join, normalize, strings } from '@angular-devkit/core';
+import {
+  apply,
+  applyTemplates,
+  chain,
+  mergeWith,
+  move,
+  Rule,
+  SchematicContext,
+  SchematicsException,
+  Tree,
+  url,
+} from '@angular-devkit/schematics';
+
+import {
+  Builders,
+  getWorkspace,
+  ProjectType,
+  relativePathToWorkspaceRoot,
+  updateWorkspace,
+  validateProjectName,
+} from '../../lib/schematics';
+import { Versions } from './../../lib/schematics';
+import { ThemeOptionsSchema } from './schema';
+
+// Reference: https://github.com/angular/angular-cli/tree/master/packages/schematics/angular
+
+function addThemeToWorkspaceFile(
+  options: ThemeOptionsSchema,
+  projectRoot: string,
+  projectName: string,
+  distRoot: string,
+): Rule {
+  return updateWorkspace(workspace => {
+    if (workspace.projects.size === 0) {
+      workspace.extensions.defaultProject = projectName;
+    }
+
+    workspace.projects.add({
+      name: projectName,
+      root: projectRoot,
+      sourceRoot: `${projectRoot}/src`,
+      projectType: ProjectType.Theme,
+      targets: {
+        build: {
+          builder: Builders.Theme,
+          options: {
+            outputPath: `${distRoot}`,
+          },
+        },
+      }
+    });
+  });
+}
+
+export default function (options: ThemeOptionsSchema): Rule {
+  return async (host: Tree, context: SchematicContext) => {
+    if (!options.name) {
+      throw new SchematicsException(`Invalid options, "name" is required.`);
+    }
+    validateProjectName(options.name);
+
+    // If scoped project (i.e. "@foo/bar"), convert projectDir to "foo/bar".
+    const projectName = options.name;
+    const packageName = strings.dasherize(projectName);
+    let scopeName = null;
+    if (/^@.*\/.*/.test(options.name)) {
+      const [scope, name] = options.name.split('/');
+      scopeName = scope.replace(/^@/, '');
+      options.name = name;
+    }
+
+    const workspace = await getWorkspace(host);
+    const newProjectRoot = workspace.extensions.newProjectRoot as (string | undefined) || '';
+
+    const scopeFolder = scopeName ? strings.dasherize(scopeName) + '/' : '';
+    const folderName = `${scopeFolder}${strings.dasherize(options.name)}`;
+    const projectRoot = join(normalize(newProjectRoot), folderName);
+    const distRoot = `dist/${folderName}`;
+
+    const templateSource = apply(url('./files'), [
+      applyTemplates({
+        ...strings,
+        ...options,
+        packageName,
+        projectRoot,
+        distRoot,
+        relativePathToWorkspaceRoot: relativePathToWorkspaceRoot(projectRoot),
+        folderName,
+        startosLatestVersion: Versions.Stratos,
+      }),
+      move(projectRoot),
+    ]);
+
+    const optional = [];
+    if (options.includeLoader) {
+      optional.push(mergeWith(apply(url('./loader-files'), [ applyTemplates({}), move(`${projectRoot}/loader`)])));
+    }
+    if (options.includeAssets) {
+      optional.push(mergeWith(apply(url('./asset-files'), [ applyTemplates({}), move(`${projectRoot}/assets`)])));
+    }
+
+    return chain([
+      mergeWith(templateSource),
+      ...optional,
+      addThemeToWorkspaceFile(options, projectRoot, projectName, distRoot),
+    ]);
+  };
+}
+
diff --git a/src/frontend/packages/devkit/src/schematics/theme/loader-files/loading.css.template b/src/frontend/packages/devkit/src/schematics/theme/loader-files/loading.css.template
new file mode 100644
index 0000000000..9633b127db
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/loader-files/loading.css.template
@@ -0,0 +1,38 @@
+.stratos-initial-load-spinner-container {
+  align-items: center;
+  background-color: #0D2C40;
+  display: flex;
+  justify-content: center;
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+
+.stratos-initial-load-spinner-logo {
+  position: absolute;
+  height: 60px;
+}
+
+.stratos-initial-load-spinner {
+  animation: stratos-initial-load-animate 1s infinite linear;
+  box-sizing: border-box;
+  border: 5px solid rgba(86, 107, 121, 0.45);
+  border-radius: 50%;
+  border-top-color: #00B2E2;
+  display: inline-block;
+  height: 128px;
+  margin: 0 auto;
+  width: 128px;
+}
+
+@keyframes stratos-initial-load-animate {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  100% {
+    transform: rotate(359deg);
+  }
+}
diff --git a/src/frontend/packages/devkit/src/schematics/theme/loader-files/loading.html.template b/src/frontend/packages/devkit/src/schematics/theme/loader-files/loading.html.template
new file mode 100644
index 0000000000..cf66894e7b
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/loader-files/loading.html.template
@@ -0,0 +1,3 @@
+<div class="stratos-initial-load-spinner-container">
+  <i class="stratos-initial-load-spinner"></i>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/devkit/src/schematics/theme/schema.d.ts b/src/frontend/packages/devkit/src/schematics/theme/schema.d.ts
new file mode 100644
index 0000000000..394f1321c4
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/schema.d.ts
@@ -0,0 +1,25 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by json-schema-to-typescript.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+ * and run json-schema-to-typescript to regenerate this file.
+ */
+
+/**
+ * Creates a new generic Stratos Theme project in the current workspace.
+ */
+export interface ThemeOptionsSchema {
+  /**
+   * The name of the theme.
+   */
+  name?: string;
+  /**
+   * When true, a default set of assets will be included in the theme.
+   */
+  includeAssets?: boolean;
+  /**
+   * When true, a default loading indicator will be included in the theme.
+   */
+  includeLoader?: boolean;
+  [k: string]: unknown;
+}
diff --git a/src/frontend/packages/devkit/src/schematics/theme/schema.json b/src/frontend/packages/devkit/src/schematics/theme/schema.json
new file mode 100644
index 0000000000..ff296e8e2b
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/schema.json
@@ -0,0 +1,32 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsTheme",
+  "title": "Theme Options Schema",
+  "type": "object",
+  "description": "Creates a new generic Stratos Theme project in the current workspace.",
+  "long-description": "./theme-long.md",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "The name of the theme.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for the theme?"
+    },
+    "includeAssets": {
+      "description": "When true, a default set of assets will be included in the theme.",
+      "type": "boolean",
+      "default": false,
+      "x-prompt": "Include default set of assets?"
+    },
+    "includeLoader": {
+      "description": "When true, a default loading indicator will be included in the theme.",
+      "type": "boolean",
+      "default": false,
+      "x-prompt": "Include a default application loading screen?"
+    }
+  },
+  "required": []
+}
diff --git a/src/frontend/packages/devkit/src/schematics/theme/theme-long.md b/src/frontend/packages/devkit/src/schematics/theme/theme-long.md
new file mode 100644
index 0000000000..1347ed462a
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/theme-long.md
@@ -0,0 +1 @@
+A theme is a type of project that provides a UI theme for Stratos.
\ No newline at end of file
diff --git a/src/frontend/packages/devkit/tsconfig.json b/src/frontend/packages/devkit/tsconfig.json
new file mode 100644
index 0000000000..0a6818d257
--- /dev/null
+++ b/src/frontend/packages/devkit/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "outDir": "../../../../dist-devkit",
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "types": [
+      "node"
+    ]
+  }
+}
diff --git a/src/frontend/packages/example-extensions/package.json b/src/frontend/packages/example-extensions/package.json
new file mode 100644
index 0000000000..736edab2bc
--- /dev/null
+++ b/src/frontend/packages/example-extensions/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@example/extensions",
+  "version": "0.0.1",
+  "stratos": {
+    "module": "ExampleModule",
+    "routingModule": "ExampleRoutingModule"
+  }
+}
diff --git a/examples/custom-src/frontend/app/custom/acme-login/acme-login.component.html b/src/frontend/packages/example-extensions/src/acme-login/acme-login.component.html
similarity index 100%
rename from examples/custom-src/frontend/app/custom/acme-login/acme-login.component.html
rename to src/frontend/packages/example-extensions/src/acme-login/acme-login.component.html
diff --git a/examples/custom-src/frontend/app/custom/acme-login/acme-login.component.scss b/src/frontend/packages/example-extensions/src/acme-login/acme-login.component.scss
similarity index 96%
rename from examples/custom-src/frontend/app/custom/acme-login/acme-login.component.scss
rename to src/frontend/packages/example-extensions/src/acme-login/acme-login.component.scss
index 627f586c0b..0428d529ae 100644
--- a/examples/custom-src/frontend/app/custom/acme-login/acme-login.component.scss
+++ b/src/frontend/packages/example-extensions/src/acme-login/acme-login.component.scss
@@ -1,4 +1,3 @@
-@import '../../../sass/custom/acme-colors';
 .acme-login {
   &__card.mat-card {
     box-shadow: 0 0 20px 9px rgba(0, 0, 0, .2);
diff --git a/examples/custom-src/frontend/app/custom/acme-login/acme-login.component.spec.ts b/src/frontend/packages/example-extensions/src/acme-login/acme-login.component.spec.ts
similarity index 100%
rename from examples/custom-src/frontend/app/custom/acme-login/acme-login.component.spec.ts
rename to src/frontend/packages/example-extensions/src/acme-login/acme-login.component.spec.ts
diff --git a/examples/custom-src/frontend/app/custom/acme-login/acme-login.component.ts b/src/frontend/packages/example-extensions/src/acme-login/acme-login.component.ts
similarity index 61%
rename from examples/custom-src/frontend/app/custom/acme-login/acme-login.component.ts
rename to src/frontend/packages/example-extensions/src/acme-login/acme-login.component.ts
index 6f2402406d..2eb78c1013 100644
--- a/examples/custom-src/frontend/app/custom/acme-login/acme-login.component.ts
+++ b/src/frontend/packages/example-extensions/src/acme-login/acme-login.component.ts
@@ -1,10 +1,7 @@
 import { Component, ViewEncapsulation } from '@angular/core';
 import { Store } from '@ngrx/store';
-
-import { AppState } from '../../../../store/src/app-state';
-import { CustomizationService, CustomizationsMetadata } from '../../core/customizations.types';
-import { StratosLoginComponent } from '../../core/extension/extension-service';
-import { LoginPageComponent } from '../../features/login/login-page/login-page.component';
+import { CustomizationService, CustomizationsMetadata, LoginPageComponent, StratosLoginComponent } from '@stratosui/core';
+import { AppState } from '@stratosui/store';
 
 @StratosLoginComponent()
 @Component({
diff --git a/examples/custom-src/frontend/app/custom/acme-support-info/acme-support-info.component.html b/src/frontend/packages/example-extensions/src/acme-support-info/acme-support-info.component.html
similarity index 100%
rename from examples/custom-src/frontend/app/custom/acme-support-info/acme-support-info.component.html
rename to src/frontend/packages/example-extensions/src/acme-support-info/acme-support-info.component.html
diff --git a/examples/custom-src/frontend/app/custom/acme-support-info/acme-support-info.component.scss b/src/frontend/packages/example-extensions/src/acme-support-info/acme-support-info.component.scss
similarity index 100%
rename from examples/custom-src/frontend/app/custom/acme-support-info/acme-support-info.component.scss
rename to src/frontend/packages/example-extensions/src/acme-support-info/acme-support-info.component.scss
diff --git a/examples/custom-src/frontend/app/custom/acme-support-info/acme-support-info.component.spec.ts b/src/frontend/packages/example-extensions/src/acme-support-info/acme-support-info.component.spec.ts
similarity index 100%
rename from examples/custom-src/frontend/app/custom/acme-support-info/acme-support-info.component.spec.ts
rename to src/frontend/packages/example-extensions/src/acme-support-info/acme-support-info.component.spec.ts
diff --git a/examples/custom-src/frontend/app/custom/acme-support-info/acme-support-info.component.ts b/src/frontend/packages/example-extensions/src/acme-support-info/acme-support-info.component.ts
similarity index 100%
rename from examples/custom-src/frontend/app/custom/acme-support-info/acme-support-info.component.ts
rename to src/frontend/packages/example-extensions/src/acme-support-info/acme-support-info.component.ts
diff --git a/examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.html b/src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.html
similarity index 100%
rename from examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.html
rename to src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.html
diff --git a/examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.scss b/src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.scss
similarity index 100%
rename from examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.scss
rename to src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.scss
diff --git a/examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.spec.ts b/src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.spec.ts
similarity index 100%
rename from examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.spec.ts
rename to src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.spec.ts
diff --git a/examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.ts b/src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.ts
similarity index 79%
rename from examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.ts
rename to src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.ts
index d707ffcb6f..f50d7c65ca 100644
--- a/examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.ts
+++ b/src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { StratosTab, StratosTabType, StratosAction, StratosActionType } from '../../core/extension/extension-service';
+import { StratosAction, StratosActionType } from '@stratosui/core';
 
 @StratosAction({
   type: StratosActionType.Applications,
diff --git a/examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.html b/src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.html
similarity index 100%
rename from examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.html
rename to src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.html
diff --git a/examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.scss b/src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.scss
similarity index 100%
rename from examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.scss
rename to src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.scss
diff --git a/examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.spec.ts b/src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.spec.ts
similarity index 100%
rename from examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.spec.ts
rename to src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.spec.ts
diff --git a/examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.ts b/src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.ts
similarity index 83%
rename from examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.ts
rename to src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.ts
index b9af9223ab..d19395ee1b 100644
--- a/examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.ts
+++ b/src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-
-import { StratosTab, StratosTabType } from '../../core/extension/extension-service';
+import { StratosTab, StratosTabType } from '@stratosui/core';
 
 @StratosTab({
   icon: 'extension',
diff --git a/examples/custom-src/frontend/app/custom/custom-routing.module.ts b/src/frontend/packages/example-extensions/src/example-routing.module.ts
similarity index 80%
rename from examples/custom-src/frontend/app/custom/custom-routing.module.ts
rename to src/frontend/packages/example-extensions/src/example-routing.module.ts
index d2c405e805..6559ca3ebb 100644
--- a/examples/custom-src/frontend/app/custom/custom-routing.module.ts
+++ b/src/frontend/packages/example-extensions/src/example-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
 
 const customRoutes: Routes = [{
   path: 'example',
@@ -18,4 +18,4 @@ const customRoutes: Routes = [{
   ],
   declarations: []
 })
-export class CustomRoutingModule { }
+export class ExampleRoutingModule { }
diff --git a/examples/custom-src/frontend/app/custom/custom.module.ts b/src/frontend/packages/example-extensions/src/example.module.ts
similarity index 61%
rename from examples/custom-src/frontend/app/custom/custom.module.ts
rename to src/frontend/packages/example-extensions/src/example.module.ts
index 279ef8a0b3..c64227f931 100644
--- a/examples/custom-src/frontend/app/custom/custom.module.ts
+++ b/src/frontend/packages/example-extensions/src/example.module.ts
@@ -1,17 +1,20 @@
 import { NgModule } from '@angular/core';
+import {
+  CoreModule,
+  CustomizationService,
+  CustomizationsMetadata,
+  ExtensionService,
+  MDAppModule,
+  SharedModule,
+} from '@stratosui/core';
 
-import { CoreModule } from '../core/core.module';
-import { CustomizationService, CustomizationsMetadata } from '../core/customizations.types';
-import { MDAppModule } from '../core/md.module';
-import { SharedModule } from '../shared/shared.module';
 import { AcmeLoginComponent } from './acme-login/acme-login.component';
 import { AcmeSupportInfoComponent } from './acme-support-info/acme-support-info.component';
 import { AppActionExtensionComponent } from './app-action-extension/app-action-extension.component';
 import { AppTabExtensionComponent } from './app-tab-extension/app-tab-extension.component';
-import { ExtensionService } from '../core/extension/extension-service';
 
 const AcmeCustomizations: CustomizationsMetadata = {
-  copyright: '&copy; 2018 ACME Corp',
+  copyright: '&copy; 2020 ACME Corp',
   hasEula: true,
   supportInfoComponent: AcmeSupportInfoComponent,
 };
@@ -31,16 +34,9 @@ const AcmeCustomizations: CustomizationsMetadata = {
     AppTabExtensionComponent,
     AppActionExtensionComponent,
     AcmeSupportInfoComponent
-  ],
-  entryComponents: [
-    AcmeLoginComponent,
-    // You must specify the tab and action as an entry components
-    AppTabExtensionComponent,
-    AppActionExtensionComponent,
-    AcmeSupportInfoComponent
   ]
 })
-export class CustomModule {
+export class ExampleModule {
 
   constructor(cs: CustomizationService) {
     cs.set(AcmeCustomizations);
diff --git a/examples/custom-src/frontend/app/custom/nav-extension/example-component/example.component.html b/src/frontend/packages/example-extensions/src/nav-extension/example-component/example.component.html
similarity index 100%
rename from examples/custom-src/frontend/app/custom/nav-extension/example-component/example.component.html
rename to src/frontend/packages/example-extensions/src/nav-extension/example-component/example.component.html
diff --git a/examples/custom-src/frontend/app/custom/nav-extension/example-component/example.component.scss b/src/frontend/packages/example-extensions/src/nav-extension/example-component/example.component.scss
similarity index 100%
rename from examples/custom-src/frontend/app/custom/nav-extension/example-component/example.component.scss
rename to src/frontend/packages/example-extensions/src/nav-extension/example-component/example.component.scss
diff --git a/examples/custom-src/frontend/app/custom/nav-extension/example-component/example.component.ts b/src/frontend/packages/example-extensions/src/nav-extension/example-component/example.component.ts
similarity index 100%
rename from examples/custom-src/frontend/app/custom/nav-extension/example-component/example.component.ts
rename to src/frontend/packages/example-extensions/src/nav-extension/example-component/example.component.ts
diff --git a/examples/custom-src/frontend/app/custom/nav-extension/nav-extension.module.ts b/src/frontend/packages/example-extensions/src/nav-extension/nav-extension.module.ts
similarity index 69%
rename from examples/custom-src/frontend/app/custom/nav-extension/nav-extension.module.ts
rename to src/frontend/packages/example-extensions/src/nav-extension/nav-extension.module.ts
index 167fb93d96..41d79722aa 100644
--- a/examples/custom-src/frontend/app/custom/nav-extension/nav-extension.module.ts
+++ b/src/frontend/packages/example-extensions/src/nav-extension/nav-extension.module.ts
@@ -1,8 +1,8 @@
 import { NgModule } from '@angular/core';
-import { NavExtensionRoutingModule } from './nav-extension.routing';
+import { CoreModule, SharedModule } from '@stratosui/core';
+
 import { ExampleComponent } from './example-component/example.component';
-import { CoreModule } from '../../core/core.module';
-import { SharedModule } from '../../shared/shared.module';
+import { NavExtensionRoutingModule } from './nav-extension.routing';
 
 @NgModule({
   imports: [
@@ -12,9 +12,6 @@ import { SharedModule } from '../../shared/shared.module';
   ],
   declarations: [
     ExampleComponent
-  ],
-  entryComponents: [
-    ExampleComponent
   ]
 })
 export class NavExtensionModule {}
diff --git a/examples/custom-src/frontend/app/custom/nav-extension/nav-extension.routing.ts b/src/frontend/packages/example-extensions/src/nav-extension/nav-extension.routing.ts
similarity index 100%
rename from examples/custom-src/frontend/app/custom/nav-extension/nav-extension.routing.ts
rename to src/frontend/packages/example-extensions/src/nav-extension/nav-extension.routing.ts
diff --git a/src/frontend/packages/example-extensions/src/public-api.ts b/src/frontend/packages/example-extensions/src/public-api.ts
new file mode 100644
index 0000000000..9041d86a30
--- /dev/null
+++ b/src/frontend/packages/example-extensions/src/public-api.ts
@@ -0,0 +1,4 @@
+// Example Extensions
+
+export * from './example.module';
+export * from './example-routing.module';
\ No newline at end of file
diff --git a/src/frontend/packages/example-theme/_index.scss b/src/frontend/packages/example-theme/_index.scss
new file mode 100644
index 0000000000..a8d3f300e1
--- /dev/null
+++ b/src/frontend/packages/example-theme/_index.scss
@@ -0,0 +1,9 @@
+@import '~@stratosui/theme/helper';
+
+// Custom Theme
+@import './sass/custom';
+
+@function stratos-theme() {
+  $theme: stratos-theme-helper($stratos-theme);
+  @return $theme
+}
\ No newline at end of file
diff --git a/src/frontend/packages/example-theme/assets/core/custom/acme_logo.png b/src/frontend/packages/example-theme/assets/core/custom/acme_logo.png
new file mode 100644
index 0000000000..397545f790
Binary files /dev/null and b/src/frontend/packages/example-theme/assets/core/custom/acme_logo.png differ
diff --git a/src/frontend/packages/example-theme/assets/core/eula.html b/src/frontend/packages/example-theme/assets/core/eula.html
new file mode 100644
index 0000000000..1f2241fe1c
--- /dev/null
+++ b/src/frontend/packages/example-theme/assets/core/eula.html
@@ -0,0 +1,5 @@
+<p>AMCE Corp End User License Agreement</p>
+
+<p>PLEASE READ THIS AGREEMENT CAREFULLY.</p>
+
+<P>This is an exmaple EULA.</P>
diff --git a/src/frontend/packages/example-theme/assets/core/login-bg.jpg b/src/frontend/packages/example-theme/assets/core/login-bg.jpg
new file mode 100644
index 0000000000..2b2e8e42f7
Binary files /dev/null and b/src/frontend/packages/example-theme/assets/core/login-bg.jpg differ
diff --git a/src/frontend/packages/example-theme/assets/core/logo.png b/src/frontend/packages/example-theme/assets/core/logo.png
new file mode 100644
index 0000000000..8129763913
Binary files /dev/null and b/src/frontend/packages/example-theme/assets/core/logo.png differ
diff --git a/src/frontend/packages/example-theme/assets/favicon.ico b/src/frontend/packages/example-theme/assets/favicon.ico
new file mode 100644
index 0000000000..60f452c054
Binary files /dev/null and b/src/frontend/packages/example-theme/assets/favicon.ico differ
diff --git a/src/frontend/packages/example-theme/loader/loading.css b/src/frontend/packages/example-theme/loader/loading.css
new file mode 100644
index 0000000000..9633b127db
--- /dev/null
+++ b/src/frontend/packages/example-theme/loader/loading.css
@@ -0,0 +1,38 @@
+.stratos-initial-load-spinner-container {
+  align-items: center;
+  background-color: #0D2C40;
+  display: flex;
+  justify-content: center;
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+
+.stratos-initial-load-spinner-logo {
+  position: absolute;
+  height: 60px;
+}
+
+.stratos-initial-load-spinner {
+  animation: stratos-initial-load-animate 1s infinite linear;
+  box-sizing: border-box;
+  border: 5px solid rgba(86, 107, 121, 0.45);
+  border-radius: 50%;
+  border-top-color: #00B2E2;
+  display: inline-block;
+  height: 128px;
+  margin: 0 auto;
+  width: 128px;
+}
+
+@keyframes stratos-initial-load-animate {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  100% {
+    transform: rotate(359deg);
+  }
+}
diff --git a/src/frontend/packages/example-theme/loader/loading.html b/src/frontend/packages/example-theme/loader/loading.html
new file mode 100644
index 0000000000..cf66894e7b
--- /dev/null
+++ b/src/frontend/packages/example-theme/loader/loading.html
@@ -0,0 +1,3 @@
+<div class="stratos-initial-load-spinner-container">
+  <i class="stratos-initial-load-spinner"></i>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/example-theme/package.json b/src/frontend/packages/example-theme/package.json
new file mode 100644
index 0000000000..704b682b04
--- /dev/null
+++ b/src/frontend/packages/example-theme/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "@example/theme",
+  "version": "0.0.1",
+  "stratos": {
+    "assets": {
+      "assets/core": "core/assets",
+      "assets/favicon.ico": "favicon.ico"
+    },
+    "theme":{
+      "loadingCss": "loader/loading.css",
+      "loadingHtml": "loader/loading.html"
+    }
+  },
+  "peerDependencies": {
+    "@stratosui/theme": "0.0.1"
+  }
+}
diff --git a/src/frontend/packages/example-theme/sass/custom.scss b/src/frontend/packages/example-theme/sass/custom.scss
new file mode 100644
index 0000000000..e3eb84c38a
--- /dev/null
+++ b/src/frontend/packages/example-theme/sass/custom.scss
@@ -0,0 +1,18 @@
+// Custom ACME Theme
+
+// ACME Primary Material Design pallette
+// From http://mcg.mbitson.com/#!?mcgpalette0=%233f51b5
+$acme-primary: (50: #e8eaf6, 100: #c5cbe9, 200: #9fa8da, 300: #7985cb, 400: #5c6bc0, 500: #3f51b5, 600: #394aae, 700: #3140a5, 800: #29379d, 900: #1b278d, A100: #c6cbff, A200: #939dff, A400: #606eff, A700: #4757ff, contrast: (  50: #000000,  100: #000000,  200: #000000,  300: #000000,  400: #ffffff,  500: #ffffff,  600: #ffffff,  700: #ffffff,  800: #ffffff,  900: #ffffff,  A100: #000000,  A200: #000000,  A400: #ffffff,  A700: #ffffff, ));
+$mat-red: ( 50: #ffebee, 100: #ffcdd2, 200: #ef9a9a, 300: #e57373, 400: #ef5350, 500: #f44336, 600: #e53935, 700: #d32f2f, 800: #c62828, 900: #b71c1c, A100: #ff8a80, A200: #ff5252, A400: #ff1744, A700: #d50000, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
+
+// Common
+$acme-theme-primary: mat-palette($acme-primary);
+$acme-theme-warn: mat-palette($mat-red);
+
+// Dark Theme
+$stratos-dark-theme: mat-dark-theme($acme-theme-primary, $acme-theme-primary, $acme-theme-warn);
+
+// Default Theme
+$stratos-theme: mat-light-theme($acme-theme-primary, $acme-theme-primary, $acme-theme-warn);
+
+@import 'custom/acme';
diff --git a/src/frontend/packages/example-theme/sass/custom/acme-colors.scss b/src/frontend/packages/example-theme/sass/custom/acme-colors.scss
new file mode 100644
index 0000000000..878c2cda32
--- /dev/null
+++ b/src/frontend/packages/example-theme/sass/custom/acme-colors.scss
@@ -0,0 +1,7 @@
+$acme-primary: #00c081;
+$acme-secondary: #00243e;
+$acme-text: #fff;
+$acme-text-gray: #ccc;
+$acme-button-gray: #888;
+$acme-dark-blue: #06253a;
+$acme-blue: #073155;
diff --git a/src/frontend/packages/example-theme/sass/custom/acme.scss b/src/frontend/packages/example-theme/sass/custom/acme.scss
new file mode 100644
index 0000000000..75794ebb6e
--- /dev/null
+++ b/src/frontend/packages/example-theme/sass/custom/acme.scss
@@ -0,0 +1,71 @@
+// Style overrides
+// Acme Brand primary colour
+$acme-primary-color: #035a97;
+
+// Secondary blue colour
+$acme-secondary: #035a97;
+$acme-text: #fff;
+$acme-text-gray: #ccc;
+$acme-dark-blue: #06253a;
+$acme-blue: #073155;
+$acme-side-nav: $acme-secondary;
+$acme-side-nav-active: #003358;
+
+body.stratos {
+  app-page-subheader {
+    .page-subheader {
+      background-color: #fff;
+      color: #333;
+    }
+  }
+
+  .page-header__divider {
+    color: #333;
+  }
+
+  .page-header__menu-button-icon {
+    background-color: $acme-primary-color;
+    color: $acme-text;
+  }
+
+  .mat-tab-nav-bar.mat-primary.mat-background-primary {
+    .mat-tab-links {
+      background-color: #fff;
+      color: #333;
+    }
+    .mat-tab-link {
+      color: #333;
+    }
+    .mat-ink-bar {
+      background-color: $acme-primary-color;
+    }
+  }
+
+  .stratos-title__logo {
+    width: 160px;
+  }
+
+  .page-header .mat-toolbar.mat-primary {
+    background-color: #fff;
+    color: #333;
+  }
+
+  // Use Acme Blue Side Navigation
+  .side-nav,
+  .side-nav__top,
+  .side-nav__item--active:hover {
+    background-color: $acme-side-nav;
+  }
+  .side-nav__item--active,
+  .side-nav__item:hover {
+    background-color: $acme-side-nav-active;
+  }
+  .side-nav__bottom {
+    color: $acme-text-gray;
+  }
+
+  // Show the text Stratos beneath the Acme logo
+  .stratos-title > .stratos-title__header {
+    display: inline-block;
+  }
+}
diff --git a/src/frontend/packages/shared/karma.conf.js b/src/frontend/packages/shared/karma.conf.js
new file mode 100644
index 0000000000..3eb5065e1b
--- /dev/null
+++ b/src/frontend/packages/shared/karma.conf.js
@@ -0,0 +1,8 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    ...require('../../../../build/karma.conf.creator.js')('components')(config)
+  })
+}
diff --git a/src/frontend/packages/shared/ng-package.json b/src/frontend/packages/shared/ng-package.json
new file mode 100644
index 0000000000..a8096cce2b
--- /dev/null
+++ b/src/frontend/packages/shared/ng-package.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../../../dist/shared",
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/shared/package.json b/src/frontend/packages/shared/package.json
new file mode 100644
index 0000000000..fd22444357
--- /dev/null
+++ b/src/frontend/packages/shared/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@stratosui/shared",
+  "version": "0.0.1",
+  "peerDependencies": {
+    "@angular/common": "^8.2.9",
+    "@angular/core": "^8.2.9"
+  },
+  "stratos": {
+    "theming": "sass/_all-theme#apply-theme-stratos-shared"
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/shared/sass/_all-theme.scss b/src/frontend/packages/shared/sass/_all-theme.scss
new file mode 100644
index 0000000000..560ebec82e
--- /dev/null
+++ b/src/frontend/packages/shared/sass/_all-theme.scss
@@ -0,0 +1,9 @@
+@import '../src/components/stratos-title//stratos-title.component.theme';
+
+@mixin apply-theme-stratos-shared($stratos-theme) {
+
+  $theme: map-get($stratos-theme, theme);
+  $app-theme: map-get($stratos-theme, app-theme);
+
+  @include stratos-title-component-theme($theme, $app-theme);
+}
diff --git a/src/frontend/packages/shared/src/components.module.ts b/src/frontend/packages/shared/src/components.module.ts
new file mode 100644
index 0000000000..4fd18d9470
--- /dev/null
+++ b/src/frontend/packages/shared/src/components.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { StratosTitleComponent } from './components/stratos-title/stratos-title.component';
+
+@NgModule({
+  imports: [],
+  declarations: [
+    StratosTitleComponent
+  ],
+  exports: [
+    StratosTitleComponent
+  ]
+})
+export class StratosComponentsModule {
+
+  constructor() {}
+
+}
diff --git a/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.html b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.html
new file mode 100644
index 0000000000..b4864f004d
--- /dev/null
+++ b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.html
@@ -0,0 +1,4 @@
+<div class="stratos-title">
+  <img class="stratos-title__logo" src="/core/assets/logo.png" />
+  <h1 class="mat-h1 stratos-title__header">{{ title || 'Stratos' }}</h1>
+</div>
diff --git a/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.scss b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.scss
new file mode 100644
index 0000000000..be2b80bd6e
--- /dev/null
+++ b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.scss
@@ -0,0 +1,20 @@
+.stratos-title {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding-top: 24px;
+  &__logo {
+    align-self: center;
+    padding: 12px 0 16px;
+    width: 240px;
+  }
+  &__header {
+    display: none;
+    font-size: 28px;
+    font-weight: 500;
+    letter-spacing: 2px;
+    margin: 0;
+    text-align: center;
+    text-transform: uppercase;
+  }
+}
diff --git a/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.spec.ts b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.spec.ts
new file mode 100644
index 0000000000..4bc7ca3078
--- /dev/null
+++ b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { StratosTitleComponent } from './stratos-title.component';
+
+describe('StratosTitleComponent', () => {
+  let component: StratosTitleComponent;
+  let fixture: ComponentFixture<StratosTitleComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ StratosTitleComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(StratosTitleComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.theme.scss b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.theme.scss
new file mode 100644
index 0000000000..56e8a4a125
--- /dev/null
+++ b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.theme.scss
@@ -0,0 +1,6 @@
+@mixin stratos-title-component-theme($theme, $app-theme) {
+  $primary: map-get($theme, primary);
+  .stratos-title {
+    color: mat-color($primary);
+  }
+}
diff --git a/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.ts b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.ts
new file mode 100644
index 0000000000..b09b6f7d1f
--- /dev/null
+++ b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.ts
@@ -0,0 +1,12 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'app-stratos-title',
+  templateUrl: './stratos-title.component.html',
+  styleUrls: ['./stratos-title.component.scss']
+})
+export class StratosTitleComponent {
+
+  // Optional title
+  @Input() title: string;
+}
diff --git a/src/frontend/packages/shared/src/public-api.ts b/src/frontend/packages/shared/src/public-api.ts
new file mode 100644
index 0000000000..30b7c87a05
--- /dev/null
+++ b/src/frontend/packages/shared/src/public-api.ts
@@ -0,0 +1,5 @@
+// Stratos Components module
+
+export * from './components.module';
+
+export * from './components/stratos-title/stratos-title.component';
diff --git a/src/frontend/packages/shared/tsconfig.lib.json b/src/frontend/packages/shared/tsconfig.lib.json
new file mode 100644
index 0000000000..29e640092d
--- /dev/null
+++ b/src/frontend/packages/shared/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../../tsconfig.lib.json",
+  "compilerOptions": {
+    "outDir": "../../../../out-tsc/lib",
+  },
+  "exclude": [
+    "./src/test.ts",
+    "**/*.spec.ts",
+  ]
+}
diff --git a/src/frontend/packages/shared/tsconfig.spec.json b/src/frontend/packages/shared/tsconfig.spec.json
new file mode 100644
index 0000000000..cb4a7be918
--- /dev/null
+++ b/src/frontend/packages/shared/tsconfig.spec.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../../tsconfig.spec.json",
+  "compilerOptions": {
+    "outDir": "../../../../out-tsc/spec",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "src/test.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}
diff --git a/src/frontend/packages/shared/tslint.json b/src/frontend/packages/shared/tslint.json
new file mode 100644
index 0000000000..6ee5e859e0
--- /dev/null
+++ b/src/frontend/packages/shared/tslint.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../../../tslint.json",
+  "rules": {
+    "directive-selector": [
+      false,
+      "attribute",
+      "lib",
+      "camelCase"
+    ],
+    "component-selector": [
+      false,
+      "element",
+      "lib",
+      "kebab-case"
+    ]
+  }
+}
diff --git a/src/frontend/packages/store/ng-package.json b/src/frontend/packages/store/ng-package.json
index c77901ef24..babd6c3d91 100644
--- a/src/frontend/packages/store/ng-package.json
+++ b/src/frontend/packages/store/ng-package.json
@@ -2,6 +2,6 @@
   "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../../../dist/store",
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public-api.ts"
   }
 }
\ No newline at end of file
diff --git a/src/frontend/packages/store/package.json b/src/frontend/packages/store/package.json
index cb014d0a39..0184d8f74d 100644
--- a/src/frontend/packages/store/package.json
+++ b/src/frontend/packages/store/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "store",
+  "name": "@stratosui/store",
   "version": "0.0.1",
   "peerDependencies": {
     "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
diff --git a/src/frontend/packages/store/src/actions/dashboard-actions.ts b/src/frontend/packages/store/src/actions/dashboard-actions.ts
index 946b291c16..a2bc55101a 100644
--- a/src/frontend/packages/store/src/actions/dashboard-actions.ts
+++ b/src/frontend/packages/store/src/actions/dashboard-actions.ts
@@ -1,7 +1,7 @@
 import { Action } from '@ngrx/store';
 
-import { StratosTheme } from '../../../core/src/core/theme.service';
 import { DashboardState } from '../reducers/dashboard-reducer';
+import { StratosTheme } from '../types/theme.types';
 
 export const OPEN_SIDE_NAV = '[Dashboard] Open side nav';
 export const CLOSE_SIDE_NAV = '[Dashboard] Close side nav';
diff --git a/src/frontend/packages/store/src/actions/endpoint.actions.ts b/src/frontend/packages/store/src/actions/endpoint.actions.ts
index cd4540b8eb..2e4b8404ed 100644
--- a/src/frontend/packages/store/src/actions/endpoint.actions.ts
+++ b/src/frontend/packages/store/src/actions/endpoint.actions.ts
@@ -1,18 +1,20 @@
 import { Action } from '@ngrx/store';
 
-import { STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
-import { EndpointType } from '../../../core/src/core/extension/extension-types';
-import { endpointSchemaKey } from '../helpers/entity-factory';
+import { EndpointType } from '../extension-types';
+import { endpointEntityType, STRATOS_ENDPOINT_TYPE, stratosEntityFactory } from '../helpers/stratos-entity-factory';
 import { NormalizedResponse } from '../types/api.types';
 import { endpointListKey, EndpointModel, INewlyConnectedEndpointInfo } from '../types/endpoint.types';
 import { PaginatedAction } from '../types/pagination.types';
+import { EntityRequestAction } from '../types/request.types';
 
 export const GET_ENDPOINTS = '[Endpoints] Get all';
-export const GET_ENDPOINTS_START = '[Endpoints] Get all start';
-export const GET_ENDPOINTS_LOGIN = '[Endpoints] Get all at login';
 export const GET_ENDPOINTS_SUCCESS = '[Endpoints] Get all success';
 export const GET_ENDPOINTS_FAILED = '[Endpoints] Get all failed';
 
+export const GET_ENDPOINT = '[Endpoints] Get';
+export const GET_ENDPOINT_SUCCESS = '[Endpoints] Get success';
+export const GET_ENDPOINT_FAILED = '[Endpoints] Get failed';
+
 export const CONNECT_ENDPOINTS = '[Endpoints] Connect';
 export const CONNECT_ENDPOINTS_SUCCESS = '[Endpoints] Connect succeed';
 export const CONNECT_ENDPOINTS_FAILED = '[Endpoints] Connect failed';
@@ -37,14 +39,45 @@ export class EndpointActionComplete implements Action {
   constructor(
     public type: string,
     public guid: string,
+    /**
+     * Note - The underlying endpoints type (_cf_Endpoint, not _stratos_Endpoint)
+     */
     public endpointType: EndpointType,
     public endpoint: EndpointModel | INewlyConnectedEndpointInfo
   ) { }
 }
 
-export class EndpointAction implements Action {
-  type: string;
-  endpointType: EndpointType;
+export abstract class BaseEndpointAction implements EntityRequestAction {
+  public entityType = endpointEntityType;
+  public endpointType = STRATOS_ENDPOINT_TYPE;
+  public subType = '';
+  public entity = [stratosEntityFactory(endpointEntityType)]
+  constructor(public type: string) { }
+  actions: string[];
+}
+
+export abstract class SingleBaseEndpointAction extends BaseEndpointAction {
+  constructor(
+    actionType: string,
+    public guid: string,
+    /**
+     * The endpoint type of the endpoint
+     *    endpointType = stratos endpoint type... where it will be stored
+     *    endpointsType = specific type of the endpoint type... for instance 'metrics'
+     */
+    public endpointsType?: string
+  ) {
+    super(actionType);
+  }
+}
+
+abstract class MultipleBaseEndpointAction extends BaseEndpointAction implements PaginatedAction {
+  constructor(
+    actionType: string,
+    public paginationKey: string
+  ) {
+    super(actionType);
+  }
 }
 
 // Different Auth Type support for connecting to Endpoints
@@ -60,15 +93,34 @@ export interface AuthParamsToken {
 // All supported auth params types
 export type AuthParams = AuthParamsUsernamePassword | AuthParamsToken;
 
-export class GetAllEndpoints implements PaginatedAction {
+export class GetEndpoint extends SingleBaseEndpointAction {
+  constructor(
+    guid: string,
+  ) {
+    super(
+      GET_ENDPOINT,
+      guid
+    )
+  }
+  actions = [
+    GET_ENDPOINT,
+    GET_ENDPOINT_SUCCESS,
+    GET_ENDPOINT_FAILED
+  ];
+}
+
+export class GetAllEndpoints extends MultipleBaseEndpointAction {
   public static storeKey = endpointListKey;
-  constructor(public login = false) { }
-  entityType = endpointSchemaKey;
-  endpointType = STRATOS_ENDPOINT_TYPE;
-  paginationKey = GetAllEndpoints.storeKey;
-  type = GET_ENDPOINTS;
+  constructor(
+    public login = false
+  ) {
+    super(
+      GET_ENDPOINTS,
+      GetAllEndpoints.storeKey
+    )
+  }
   actions = [
-    GET_ENDPOINTS_START,
+    GET_ENDPOINTS,
     GET_ENDPOINTS_SUCCESS,
     GET_ENDPOINTS_FAILED
   ];
@@ -80,53 +132,82 @@ export class GetAllEndpoints implements PaginatedAction {
   };
 }
 
-export class GetAllEndpointsSuccess implements Action {
-  constructor(public payload: NormalizedResponse<EndpointModel>, public login = false) { }
+export class GetAllEndpointsSuccess extends GetAllEndpoints {
+  constructor(public payload: NormalizedResponse<EndpointModel>, public login = false) {
+    super(login)
+  }
   type = GET_ENDPOINTS_SUCCESS;
 }
 
-export class GetAllEndpointsFailed implements Action {
-  constructor(public message: string, public login = false) { }
-  type = GET_ENDPOINTS_FAILED;
-}
-
-export class ConnectEndpoint extends EndpointAction {
+export class ConnectEndpoint extends SingleBaseEndpointAction {
+  static UpdatingKey = 'connectingKey'
   constructor(
-    public guid: string,
-    public endpointType: EndpointType,
+    guid: string,
+    // Note - should not be called endpointType
+    connectEndpointType: EndpointType,
     public authType: string,
     public authValues: AuthParams,
     public systemShared: boolean,
     public body: string,
   ) {
-    super();
+    super(
+      CONNECT_ENDPOINTS,
+      guid,
+      connectEndpointType
+    );
   }
-  type = CONNECT_ENDPOINTS;
+  updatingKey = ConnectEndpoint.UpdatingKey;
+  actions = [
+    CONNECT_ENDPOINTS,
+    CONNECT_ENDPOINTS_SUCCESS,
+    CONNECT_ENDPOINTS_FAILED
+  ]
 }
 
-export class DisconnectEndpoint extends EndpointAction {
+export class DisconnectEndpoint extends SingleBaseEndpointAction {
+  static UpdatingKey = 'disconnecting'
   constructor(
-    public guid: string,
-    public endpointType: EndpointType,
+    guid: string,
+    // Note - should not be called endpointType
+    disconnectEndpointType: EndpointType,
   ) {
-    super();
+    super(
+      DISCONNECT_ENDPOINTS,
+      guid,
+      disconnectEndpointType
+    );
   }
-  type = DISCONNECT_ENDPOINTS;
+  updatingKey = DisconnectEndpoint.UpdatingKey;
+  actions = [
+    DISCONNECT_ENDPOINTS,
+    DISCONNECT_ENDPOINTS_SUCCESS,
+    DISCONNECT_ENDPOINTS_FAILED
+  ];
 }
 
-export class UnregisterEndpoint extends EndpointAction {
+export class UnregisterEndpoint extends SingleBaseEndpointAction {
   constructor(
-    public guid: string,
-    public endpointType: EndpointType,
+    guid: string,
+    // Note - should not be called endpointType
+    unregisterEndpointType: EndpointType,
   ) {
-    super();
+    super(
+      UNREGISTER_ENDPOINTS,
+      guid,
+      unregisterEndpointType
+    );
   }
-  type = UNREGISTER_ENDPOINTS;
+  actions = [
+    UNREGISTER_ENDPOINTS,
+    UNREGISTER_ENDPOINTS_SUCCESS,
+    UNREGISTER_ENDPOINTS_FAILED
+  ];
 }
 
-export class RegisterEndpoint extends EndpointAction {
+export class RegisterEndpoint extends SingleBaseEndpointAction {
   constructor(
-    public endpointType: EndpointType,
+    // Note - should not be called endpointType
+    registerEndpointType: EndpointType,
     public endpointSubType: string = null,
     public name: string,
     public endpoint: string,
@@ -135,21 +216,24 @@ export class RegisterEndpoint extends EndpointAction {
     public clientSecret = '',
     public ssoAllowed: boolean,
   ) {
-    super();
-  }
-  type = REGISTER_ENDPOINTS;
-
-  public guid(): string {
-    return '<New Endpoint>' + this.name;
+    super(
+      REGISTER_ENDPOINTS,
+      '<New Endpoint>' + name,
+      registerEndpointType
+    );
   }
+  updatingKey = 'registering'
+  actions = [
+    REGISTER_ENDPOINTS,
+    REGISTER_ENDPOINTS_SUCCESS,
+    REGISTER_ENDPOINTS_FAILED
+  ];
 }
 
-export class UpdateEndpoint extends EndpointAction {
-
-  type = UPDATE_ENDPOINT;
-
+export class UpdateEndpoint extends SingleBaseEndpointAction {
   constructor(
-    public endpointType: EndpointType,
+    // Note - should not be called endpointType
+    updateEndpointType: EndpointType,
     public id: string,
     public name: string,
     public skipSSL: boolean,
@@ -158,6 +242,16 @@ export class UpdateEndpoint extends EndpointAction {
     public clientSecret: string,
     public allowSSO: boolean,
   ) {
-    super();
+    super(
+      UPDATE_ENDPOINT,
+      id,
+      updateEndpointType
+    );
   }
+  updatingKey = 'updating'
+  actions = [
+    UPDATE_ENDPOINT,
+    UPDATE_ENDPOINT_SUCCESS,
+    UPDATE_ENDPOINT_FAILED
+  ];
 }
diff --git a/src/frontend/packages/store/src/actions/metrics-api.actions.ts b/src/frontend/packages/store/src/actions/metrics-api.actions.ts
index 2fe8232094..6b084587a6 100644
--- a/src/frontend/packages/store/src/actions/metrics-api.actions.ts
+++ b/src/frontend/packages/store/src/actions/metrics-api.actions.ts
@@ -1,12 +1,11 @@
 import { Action } from '@ngrx/store';
 
-import { environment } from '../../../core/src/environments/environment';
+import { proxyAPIVersion } from '../jetstream';
 
 export const METRIC_API_START = '[Metrics] API Start';
 export const METRIC_API_SUCCESS = '[Metrics] API Success';
 export const METRIC_API_FAILED = '[Metrics] API Failed';
 
-const { proxyAPIVersion } = environment;
 
 export const MetricAPIQueryTypes = {
   TARGETS: 'targets',
diff --git a/src/frontend/packages/store/src/actions/metrics.actions.ts b/src/frontend/packages/store/src/actions/metrics.actions.ts
index 43b068a14d..ac62831049 100644
--- a/src/frontend/packages/store/src/actions/metrics.actions.ts
+++ b/src/frontend/packages/store/src/actions/metrics.actions.ts
@@ -1,14 +1,12 @@
-import { metricEntityType } from '../../../core/src/base-entity-schemas';
-import { environment } from '../../../core/src/environments/environment';
-import { MetricQueryType } from '../../../core/src/shared/services/metrics-range-selector.types';
+import { metricEntityType } from '../helpers/stratos-entity-factory';
+import { proxyAPIVersion } from '../jetstream';
+import { MetricQueryType } from '../types/metric.types';
 import { EntityRequestAction } from '../types/request.types';
 
 export const METRICS_START = '[Metrics] Fetch Start';
 export const METRICS_START_SUCCESS = '[Metrics] Fetch Succeeded';
 export const METRICS_START_FAILED = '[Metrics] Fetch Failed';
 
-const { proxyAPIVersion } = environment;
-
 export interface IMetricQueryConfigParams {
   window?: string;
   [key: string]: string | number;
diff --git a/src/frontend/packages/store/src/actions/snackBar.actions.ts b/src/frontend/packages/store/src/actions/snackBar.actions.ts
deleted file mode 100644
index bee18d3e57..0000000000
--- a/src/frontend/packages/store/src/actions/snackBar.actions.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Action } from '@ngrx/store';
-
-export const SHOW_SNACK_BAR = '[SnackBar] Show';
-export const SHOW_RETURN_SNACK_BAR = '[SnackBar] Show returns';
-export const HIDE_SNACK_BAR = '[SnackBar] Hide';
-
-export class ShowSnackBar implements Action {
-  constructor(
-    public message: string,
-    public closeMessage: string = null
-  ) {
-  }
-  type = SHOW_SNACK_BAR;
-}
-
-export class ShowReturnSnackBar implements Action {
-  constructor(
-    public message: string,
-    public returnRouterUrl: string,
-    public returnLabel: string
-  ) {
-  }
-  type = SHOW_RETURN_SNACK_BAR;
-}
-
-export class HideSnackBar implements Action {
-  type = HIDE_SNACK_BAR;
-}
diff --git a/src/frontend/packages/store/src/actions/system.actions.ts b/src/frontend/packages/store/src/actions/system.actions.ts
index c916b62398..29c9f9410d 100644
--- a/src/frontend/packages/store/src/actions/system.actions.ts
+++ b/src/frontend/packages/store/src/actions/system.actions.ts
@@ -1,27 +1,35 @@
 import { Action } from '@ngrx/store';
 
+import { STRATOS_ENDPOINT_TYPE, stratosEntityFactory, systemInfoEntityType } from '../helpers/stratos-entity-factory';
+import { EntityRequestAction } from '../types/request.types';
 import { SystemInfo } from '../types/system.types';
-import { GetAllEndpoints } from './endpoint.actions';
+import { BaseEndpointAction, GetAllEndpoints } from './endpoint.actions';
 
 export const GET_SYSTEM_INFO = '[System] Get info';
 export const GET_SYSTEM_INFO_SUCCESS = '[System] Get info success';
 export const GET_SYSTEM_INFO_FAILED = '[System] Get info failed';
 
-export class GetSystemInfo implements Action {
-  constructor(public login = false, public associatedAction?: GetAllEndpoints) {
-    if (!associatedAction) {
+export class GetSystemInfo implements EntityRequestAction {
+  static guid = 'info';
+  guid = GetSystemInfo.guid;
+  constructor(public login = false, public associatedAction?: BaseEndpointAction) {
+    if (!this.associatedAction) {
       this.associatedAction = new GetAllEndpoints(login);
     }
   }
+  schemaKey = systemInfoEntityType;
+  entity = [stratosEntityFactory(systemInfoEntityType)]
+  entityType = systemInfoEntityType;
+  endpointType = STRATOS_ENDPOINT_TYPE;
   type = GET_SYSTEM_INFO;
+  actions = [
+    GET_SYSTEM_INFO,
+    GET_SYSTEM_INFO_SUCCESS,
+    GET_SYSTEM_INFO_FAILED
+  ]
 }
 
 export class GetSystemSuccess implements Action {
-  constructor(public payload: SystemInfo, public login = false, public associatedAction: GetAllEndpoints) { }
+  constructor(public payload: SystemInfo, public login = false, public associatedAction: BaseEndpointAction) { }
   type = GET_SYSTEM_INFO_SUCCESS;
 }
-
-export class GetSystemFailed implements Action {
-  type = GET_SYSTEM_INFO_FAILED;
-}
-
diff --git a/src/frontend/packages/store/src/actions/user-favourites-actions/base-user-favorites-action.ts b/src/frontend/packages/store/src/actions/user-favourites-actions/base-user-favorites-action.ts
deleted file mode 100644
index c7bfabd239..0000000000
--- a/src/frontend/packages/store/src/actions/user-favourites-actions/base-user-favorites-action.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Action } from '@ngrx/store';
-
-export class BaseUserFavoritesAction implements Action {
-  constructor(
-    actionType: string,
-  ) {
-    this.type = actionType;
-  }
-  public type: string;
-  public url = '/user-favorites';
-}
diff --git a/src/frontend/packages/store/src/actions/user-favourites-actions/get-user-favorites-action.ts b/src/frontend/packages/store/src/actions/user-favourites-actions/get-user-favorites-action.ts
deleted file mode 100644
index b0b3eed95b..0000000000
--- a/src/frontend/packages/store/src/actions/user-favourites-actions/get-user-favorites-action.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { BaseUserFavoritesAction } from './base-user-favorites-action';
-import { UserFavorite, IFavoriteMetadata } from '../../types/user-favorites.types';
-
-export class GetUserFavoritesAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'GET_USER_FAVORITES';
-  constructor() {
-    super(
-      GetUserFavoritesAction.ACTION_TYPE
-    );
-  }
-}
-
-export class GetUserFavoritesSuccessAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'GET_USER_FAVORITES_SUCCESS';
-  constructor(public favorites: UserFavorite<IFavoriteMetadata>[]) {
-    super(
-      GetUserFavoritesSuccessAction.ACTION_TYPE
-    );
-  }
-}
-
-export class GetUserFavoritesFailedAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'GET_USER_FAVORITES_FAILED';
-  constructor() {
-    super(
-      GetUserFavoritesFailedAction.ACTION_TYPE
-    );
-  }
-}
-
diff --git a/src/frontend/packages/store/src/actions/user-favourites-actions/remove-user-favorite-action.ts b/src/frontend/packages/store/src/actions/user-favourites-actions/remove-user-favorite-action.ts
deleted file mode 100644
index 89bcd7d47e..0000000000
--- a/src/frontend/packages/store/src/actions/user-favourites-actions/remove-user-favorite-action.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { BaseUserFavoritesAction } from './base-user-favorites-action';
-import { UserFavorite, IFavoriteMetadata } from '../../types/user-favorites.types';
-
-export class RemoveUserFavoriteAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'REMOVE_USER_FAVORITE';
-  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
-    super(
-      RemoveUserFavoriteAction.ACTION_TYPE
-    );
-  }
-}
-
-export class RemoveUserFavoriteSuccessAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'REMOVE_USER_FAVORITE_SUCCESS';
-  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
-    super(
-      RemoveUserFavoriteSuccessAction.ACTION_TYPE
-    );
-  }
-}
-
diff --git a/src/frontend/packages/store/src/actions/user-favourites-actions/save-user-favorite-action.ts b/src/frontend/packages/store/src/actions/user-favourites-actions/save-user-favorite-action.ts
deleted file mode 100644
index b38c8199de..0000000000
--- a/src/frontend/packages/store/src/actions/user-favourites-actions/save-user-favorite-action.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { IFavoriteMetadata } from './../../types/user-favorites.types';
-import { BaseUserFavoritesAction } from './base-user-favorites-action';
-import { UserFavorite } from '../../types/user-favorites.types';
-
-export class SaveUserFavoriteAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'SAVE_USER_FAVORITE';
-  constructor(
-    public favorite: UserFavorite<IFavoriteMetadata>
-  ) {
-    super(
-      SaveUserFavoriteAction.ACTION_TYPE
-    );
-  }
-}
-
-export class SaveUserFavoriteSuccessAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'SAVE_USER_FAVORITE_SUCCESS';
-  constructor(
-    public favorite: UserFavorite<IFavoriteMetadata>
-  ) {
-    super(
-      SaveUserFavoriteSuccessAction.ACTION_TYPE
-    );
-  }
-}
diff --git a/src/frontend/packages/store/src/actions/user-favourites-actions/toggle-user-favorite-action.ts b/src/frontend/packages/store/src/actions/user-favourites-actions/toggle-user-favorite-action.ts
deleted file mode 100644
index 03a6100d31..0000000000
--- a/src/frontend/packages/store/src/actions/user-favourites-actions/toggle-user-favorite-action.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { BaseUserFavoritesAction } from './base-user-favorites-action';
-import { UserFavorite, IFavoriteMetadata } from '../../types/user-favorites.types';
-
-export class ToggleUserFavoriteAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'TOGGLE_USER_FAVORITE';
-  constructor(
-    public favorite: UserFavorite<IFavoriteMetadata>
-  ) {
-    super(
-      ToggleUserFavoriteAction.ACTION_TYPE
-    );
-  }
-}
diff --git a/src/frontend/packages/store/src/actions/user-favourites-actions/update-user-favorite-metadata-action.ts b/src/frontend/packages/store/src/actions/user-favourites-actions/update-user-favorite-metadata-action.ts
deleted file mode 100644
index 3707f615f1..0000000000
--- a/src/frontend/packages/store/src/actions/user-favourites-actions/update-user-favorite-metadata-action.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { UserFavorite, IFavoriteMetadata } from '../../types/user-favorites.types';
-import { BaseUserFavoritesAction } from './base-user-favorites-action';
-
-export class UpdateUserFavoriteMetadataAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'UPDATE_FAVORITE_METADATA';
-  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
-    super(
-      UpdateUserFavoriteMetadataAction.ACTION_TYPE
-    );
-  }
-}
-
-export class UpdateUserFavoriteMetadataSuccessAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'UPDATE_FAVORITE_METADATA_SUCCESS';
-  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
-    super(
-      UpdateUserFavoriteMetadataSuccessAction.ACTION_TYPE
-    );
-  }
-}
-
diff --git a/src/frontend/packages/store/src/actions/user-favourites.actions.ts b/src/frontend/packages/store/src/actions/user-favourites.actions.ts
new file mode 100644
index 0000000000..c4fcfdf744
--- /dev/null
+++ b/src/frontend/packages/store/src/actions/user-favourites.actions.ts
@@ -0,0 +1,145 @@
+import { STRATOS_ENDPOINT_TYPE, stratosEntityFactory, userFavouritesEntityType } from '../helpers/stratos-entity-factory';
+import { PaginatedAction } from '../types/pagination.types';
+import { EntityRequestAction } from '../types/request.types';
+import { IFavoriteMetadata, UserFavorite } from '../types/user-favorites.types';
+
+abstract class BaseUserFavoritesAction implements EntityRequestAction {
+  constructor(
+    actionType: string,
+  ) {
+    this.type = actionType;
+  }
+  public type: string;
+  public url = '/user-favorites';
+
+  public entity = [stratosEntityFactory(userFavouritesEntityType)]
+  public entityType = userFavouritesEntityType;
+  public endpointType = STRATOS_ENDPOINT_TYPE;
+}
+
+
+abstract class BaseSingleUserFavouritesAction extends BaseUserFavoritesAction {
+  constructor(actionType: string, public guid: string) {
+    super(actionType);
+  }
+}
+
+abstract class BaseMultipleUserFavouritesAction extends BaseUserFavoritesAction implements PaginatedAction {
+  guid: string;
+  constructor(actionType: string, public paginationKey: string) {
+    super(actionType);
+  }
+}
+
+
+abstract class BaseSuccessFavouritesAction extends BaseMultipleUserFavouritesAction {
+  constructor(
+    type: string,
+    public favorites: UserFavorite<IFavoriteMetadata>[],
+    paginationKey: string,
+  ) {
+    super(type, paginationKey);
+  }
+}
+
+abstract class BaseSuccessFavouriteAction extends BaseSingleUserFavouritesAction {
+  constructor(
+    type: string,
+    public favorite: UserFavorite<IFavoriteMetadata>,
+  ) {
+    super(type, favorite.guid);
+  }
+}
+
+// --------- 
+
+export class GetUserFavoritesAction extends BaseMultipleUserFavouritesAction {
+  static PAGINATION_KEY = 'user_favourites';
+  static ACTION_TYPE = '[Favorite] Get Favorites';
+  constructor() {
+    super(
+      GetUserFavoritesAction.ACTION_TYPE,
+      GetUserFavoritesAction.PAGINATION_KEY
+    );
+  }
+}
+
+export class GetUserFavoritesSuccessAction extends BaseSuccessFavouritesAction {
+  static ACTION_TYPE = '[Favorite] Get Favorites Success';
+  constructor(favorites: UserFavorite<IFavoriteMetadata>[]) {
+    super(
+      GetUserFavoritesSuccessAction.ACTION_TYPE,
+      favorites,
+      GetUserFavoritesAction.PAGINATION_KEY,
+    );
+  }
+}
+
+export class GetUserFavoritesFailedAction extends BaseMultipleUserFavouritesAction {
+  static ACTION_TYPE = '[Favorite] Get Favorites Failed';
+  constructor() {
+    super(
+      GetUserFavoritesFailedAction.ACTION_TYPE,
+      GetUserFavoritesAction.PAGINATION_KEY
+    );
+  }
+}
+
+// --------- 
+
+export class RemoveUserFavoriteAction extends BaseSingleUserFavouritesAction {
+  static ACTION_TYPE = '[Favorite] Remove Favorite';
+  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
+    super(
+      RemoveUserFavoriteAction.ACTION_TYPE,
+      favorite.guid,
+    );
+  }
+}
+
+export class RemoveUserFavoriteSuccessAction extends BaseSuccessFavouriteAction {
+  static ACTION_TYPE = '[Favorite] Remove Favorite Success';
+  constructor(favorite: UserFavorite<IFavoriteMetadata>) {
+    super(RemoveUserFavoriteSuccessAction.ACTION_TYPE, favorite)
+  }
+}
+
+// --------- 
+
+export class SaveUserFavoriteAction extends BaseSingleUserFavouritesAction {
+  static ACTION_TYPE = '[Favorite] Save Favorite';
+  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
+    super(SaveUserFavoriteAction.ACTION_TYPE, favorite.guid);
+  }
+}
+
+export class SaveUserFavoriteSuccessAction extends BaseSuccessFavouriteAction {
+  static ACTION_TYPE = '[Favorite] Save Favorite Success';
+  constructor(favorite: UserFavorite<IFavoriteMetadata>) {
+    super(SaveUserFavoriteSuccessAction.ACTION_TYPE, favorite);
+  }
+}
+
+// --------- 
+
+export class ToggleUserFavoriteAction extends BaseSingleUserFavouritesAction {
+  static ACTION_TYPE = '[Favorite] Toggle Favorite';
+  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
+    super(ToggleUserFavoriteAction.ACTION_TYPE, favorite.guid);
+  }
+}
+
+// ---------
+export class UpdateUserFavoriteMetadataAction extends BaseSingleUserFavouritesAction {
+  static ACTION_TYPE = '[Favorite] Update Favorite Metadata';
+  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
+    super(UpdateUserFavoriteMetadataAction.ACTION_TYPE, favorite.guid);
+  }
+}
+
+export class UpdateUserFavoriteMetadataSuccessAction extends BaseSuccessFavouriteAction {
+  static ACTION_TYPE = '[Favorite] Update Favorite Metadata Success';
+  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
+    super(UpdateUserFavoriteMetadataSuccessAction.ACTION_TYPE, favorite);
+  }
+}
diff --git a/src/frontend/packages/store/src/actions/user-profile.actions.ts b/src/frontend/packages/store/src/actions/user-profile.actions.ts
index 00234f772e..c4e25f1eb6 100644
--- a/src/frontend/packages/store/src/actions/user-profile.actions.ts
+++ b/src/frontend/packages/store/src/actions/user-profile.actions.ts
@@ -1,6 +1,5 @@
-import { Action } from '@ngrx/store';
-
-import { userProfileEntitySchema } from '../../../core/src/base-entity-schemas';
+import { STRATOS_ENDPOINT_TYPE, stratosEntityFactory, userProfileEntityType } from '../helpers/stratos-entity-factory';
+import { rootUpdatingKey } from '../reducers/api-request-reducer/types';
 import { EntityRequestAction } from '../types/request.types';
 import { UserProfileInfo, UserProfilePasswordUpdate } from '../types/user-profile.types';
 
@@ -8,21 +7,31 @@ export const GET_USERPROFILE = '[UserProfile] Get';
 export const UPDATE_USERPROFILE = '[UserProfile] Update';
 export const UPDATE_USERPASSWORD = '[UserPassword] Update';
 
-export class FetchUserProfileAction implements EntityRequestAction {
+abstract class BaseProfileAction implements EntityRequestAction {
   static guid = 'userProfile';
-  type = GET_USERPROFILE;
-  constructor(public userGuid: string) { }
-  entityType = userProfileEntitySchema.entityType;
-  endpointType = userProfileEntitySchema.endpointType;
-  guid = FetchUserProfileAction.guid;
+  guid = BaseProfileAction.guid;
+  entityType = userProfileEntityType;
+  endpointType = STRATOS_ENDPOINT_TYPE;
+  entity = [stratosEntityFactory(userProfileEntityType)]
+  constructor(public type: string) { }
+}
+
+export class FetchUserProfileAction extends BaseProfileAction {
+  constructor(public userGuid: string) {
+    super(GET_USERPROFILE);
+  }
 }
 
-export class UpdateUserProfileAction implements Action {
-  type = UPDATE_USERPROFILE;
-  constructor(public profile: UserProfileInfo, public password: string) { }
+export class UpdateUserProfileAction extends BaseProfileAction {
+  constructor(public profile: UserProfileInfo, public password: string) {
+    super(UPDATE_USERPROFILE)
+  }
+  updatingKey = rootUpdatingKey
 }
 
-export class UpdateUserPasswordAction implements Action {
-  type = UPDATE_USERPASSWORD;
-  constructor(public id: string, public passwordChanges: UserProfilePasswordUpdate) { }
+export class UpdateUserPasswordAction extends BaseProfileAction {
+  constructor(public id: string, public passwordChanges: UserProfilePasswordUpdate) {
+    super(UPDATE_USERPASSWORD);
+  }
+  updatingKey = 'password'
 }
diff --git a/src/frontend/packages/core/src/helper.ts b/src/frontend/packages/store/src/browser-encoder.ts
similarity index 72%
rename from src/frontend/packages/core/src/helper.ts
rename to src/frontend/packages/store/src/browser-encoder.ts
index 88cbff36f5..ffdc0584ed 100644
--- a/src/frontend/packages/core/src/helper.ts
+++ b/src/frontend/packages/store/src/browser-encoder.ts
@@ -1,14 +1,5 @@
 import { HttpParameterCodec } from '@angular/common/http';
 
-export function getPath(object: { [key: string]: any }, path: string[]) {
-  try {
-    return path.reduce((o, i) => o[i], object);
-  } catch (err) {
-    return null;
-  }
-}
-
-
 export class BrowserStandardEncoder implements HttpParameterCodec {
   encodeKey(key: string): string {
     return encodeURIComponent(key);
diff --git a/src/frontend/packages/store/src/effects/auth.effects.ts b/src/frontend/packages/store/src/effects/auth.effects.ts
index 38c8883ba8..70f117622a 100644
--- a/src/frontend/packages/store/src/effects/auth.effects.ts
+++ b/src/frontend/packages/store/src/effects/auth.effects.ts
@@ -4,8 +4,6 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { catchError, map, mergeMap, switchMap, tap } from 'rxjs/operators';
 
-import { LoggerService } from '../../../core/src/core/logger.service';
-import { BrowserStandardEncoder } from '../../../core/src/helper';
 import {
   InvalidSession,
   LOGIN,
@@ -27,9 +25,10 @@ import {
 } from '../actions/auth.actions';
 import { HydrateDashboardStateAction } from '../actions/dashboard-actions';
 import { GET_ENDPOINTS_SUCCESS, GetAllEndpointsSuccess } from '../actions/endpoint.actions';
-import { GetSystemInfo } from '../actions/system.actions';
 import { DispatchOnlyAppState } from '../app-state';
+import { BrowserStandardEncoder } from '../browser-encoder';
 import { getDashboardStateSessionId } from '../helpers/store-helpers';
+import { stratosEntityCatalog } from '../stratos-entity-catalog';
 import { SessionData } from '../types/auth.types';
 
 const SETUP_HEADER = 'stratos-setup-required';
@@ -44,7 +43,6 @@ export class AuthEffect {
     private http: HttpClient,
     private actions$: Actions,
     private store: Store<DispatchOnlyAppState>,
-    private logger: LoggerService
   ) { }
 
   @Effect() loginRequest$ = this.actions$.pipe(
@@ -84,7 +82,10 @@ export class AuthEffect {
           const sessionData = response.body;
           sessionData.sessionExpiresOn = parseInt(response.headers.get('x-cap-session-expires-on'), 10) * 1000;
           this.rehydrateDashboardState(this.store, sessionData);
-          return [new GetSystemInfo(true), new VerifiedSession(sessionData, action.updateEndpoints)];
+          return [
+            stratosEntityCatalog.systemInfo.actions.getSystemInfo(true),
+            new VerifiedSession(sessionData, action.updateEndpoints)
+          ];
         }),
         catchError((err, caught) => {
           let setupMode = false;
@@ -164,7 +165,7 @@ export class AuthEffect {
           const dashboardData = JSON.parse(storage.getItem(sessionId));
           store.dispatch(new HydrateDashboardStateAction(dashboardData));
         } catch (e) {
-          this.logger.warn('Failed to parse user settings from session storage, consider clearing them manually', e);
+          console.warn('Failed to parse user settings from session storage, consider clearing them manually', e);
         }
       }
     }
diff --git a/src/frontend/packages/store/src/effects/dashboard.effects.ts b/src/frontend/packages/store/src/effects/dashboard.effects.ts
index 2d34737508..3e70adb94b 100644
--- a/src/frontend/packages/store/src/effects/dashboard.effects.ts
+++ b/src/frontend/packages/store/src/effects/dashboard.effects.ts
@@ -2,8 +2,8 @@ import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { map } from 'rxjs/operators';
 
-import { ThemeService } from '../../../core/src/core/theme.service';
 import { HYDRATE_DASHBOARD_STATE, HydrateDashboardStateAction } from '../actions/dashboard-actions';
+import { ThemeService } from '../theme.service';
 
 
 @Injectable()
diff --git a/src/frontend/packages/store/src/effects/endpoint-api-errors.effects.ts b/src/frontend/packages/store/src/effects/endpoint-api-errors.effects.ts
index 8aa64ed80f..118abe2282 100644
--- a/src/frontend/packages/store/src/effects/endpoint-api-errors.effects.ts
+++ b/src/frontend/packages/store/src/effects/endpoint-api-errors.effects.ts
@@ -6,7 +6,7 @@ import { map } from 'rxjs/operators';
 import { SendEventAction } from '../actions/internal-events.actions';
 import { RequestTypes } from '../actions/request.actions';
 import { InternalAppState } from '../app-state';
-import { endpointSchemaKey } from '../helpers/entity-factory';
+import { endpointEntityType } from '../helpers/stratos-entity-factory';
 import { InternalEventSeverity } from '../types/internal-events.types';
 import { WrapperRequestActionFailed } from '../types/request.types';
 
@@ -26,7 +26,7 @@ export class EndpointApiError {
         const { eventCode, message, error, url } = internalEndpointError;
         internalEndpointError.endpointIds.forEach(endpoint =>
           this.store.dispatch(
-            new SendEventAction(endpointSchemaKey, endpoint, {
+            new SendEventAction(endpointEntityType, endpoint, {
               eventCode,
               severity: InternalEventSeverity.ERROR,
               message,
diff --git a/src/frontend/packages/store/src/effects/endpoint.effects.ts b/src/frontend/packages/store/src/effects/endpoint.effects.ts
index 3ebaf0694a..6925c05e5c 100644
--- a/src/frontend/packages/store/src/effects/endpoint.effects.ts
+++ b/src/frontend/packages/store/src/effects/endpoint.effects.ts
@@ -4,39 +4,31 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { catchError, mergeMap } from 'rxjs/operators';
 
-import { STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
-import { EndpointType } from '../../../core/src/core/extension/extension-types';
-import { BrowserStandardEncoder } from '../../../core/src/helper';
 import {
   CONNECT_ENDPOINTS,
-  CONNECT_ENDPOINTS_FAILED,
-  CONNECT_ENDPOINTS_SUCCESS,
   ConnectEndpoint,
   DISCONNECT_ENDPOINTS,
-  DISCONNECT_ENDPOINTS_FAILED,
-  DISCONNECT_ENDPOINTS_SUCCESS,
   DisconnectEndpoint,
   EndpointActionComplete,
+  GET_ENDPOINT,
   GET_ENDPOINTS,
   GetAllEndpoints,
   GetAllEndpointsSuccess,
+  GetEndpoint,
   REGISTER_ENDPOINTS,
-  REGISTER_ENDPOINTS_FAILED,
-  REGISTER_ENDPOINTS_SUCCESS,
   RegisterEndpoint,
   UNREGISTER_ENDPOINTS,
-  UNREGISTER_ENDPOINTS_FAILED,
-  UNREGISTER_ENDPOINTS_SUCCESS,
   UnregisterEndpoint,
 } from '../actions/endpoint.actions';
 import { SendClearEventAction } from '../actions/internal-events.actions';
 import { ClearPaginationOfEntity } from '../actions/pagination.actions';
-import { GET_SYSTEM_INFO_SUCCESS, GetSystemInfo, GetSystemSuccess } from '../actions/system.actions';
-import { GetUserFavoritesAction } from '../actions/user-favourites-actions/get-user-favorites-action';
+import { GET_SYSTEM_INFO_SUCCESS, GetSystemSuccess } from '../actions/system.actions';
 import { DispatchOnlyAppState } from '../app-state';
+import { BrowserStandardEncoder } from '../browser-encoder';
 import { entityCatalog } from '../entity-catalog/entity-catalog';
-import { endpointSchemaKey } from '../helpers/entity-factory';
+import { EndpointType } from '../extension-types';
 import { ApiRequestTypes } from '../reducers/api-request-reducer/request-helpers';
+import { stratosEntityCatalog } from '../stratos-entity-catalog';
 import { NormalizedResponse } from '../types/api.types';
 import { EndpointModel } from '../types/endpoint.types';
 import {
@@ -45,53 +37,51 @@ import {
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
 } from '../types/request.types';
-import {
-  UPDATE_ENDPOINT,
-  UPDATE_ENDPOINT_FAILED,
-  UPDATE_ENDPOINT_SUCCESS,
-  UpdateEndpoint,
-} from './../actions/endpoint.actions';
+import { UPDATE_ENDPOINT, UpdateEndpoint } from './../actions/endpoint.actions';
 import { PaginatedAction } from './../types/pagination.types';
 
 
 @Injectable()
 export class EndpointsEffect {
 
-  static connectingKey = 'connecting';
-  static disconnectingKey = 'disconnecting';
-  static registeringKey = 'registering';
-  static updatingKey = 'updating';
-
   constructor(
     private http: HttpClient,
     private actions$: Actions,
     private store: Store<DispatchOnlyAppState>
   ) { }
 
+  @Effect() getEndpoint$ = this.actions$.pipe(
+    ofType<GetEndpoint>(GET_ENDPOINT),
+    mergeMap((action: GetEndpoint) => [
+      stratosEntityCatalog.systemInfo.actions.getSystemInfo(false, action)
+    ])
+  );
+
   @Effect() getAllEndpointsBySystemInfo$ = this.actions$.pipe(
     ofType<GetAllEndpoints>(GET_ENDPOINTS),
-    mergeMap((action: GetAllEndpoints) => [new GetSystemInfo(false, action)])
+    mergeMap((action: GetAllEndpoints) => [
+      stratosEntityCatalog.systemInfo.actions.getSystemInfo(false, action)
+    ])
   );
 
   @Effect() getAllEndpoints$ = this.actions$.pipe(
     ofType<GetSystemSuccess>(GET_SYSTEM_INFO_SUCCESS),
     mergeMap(action => {
-      const endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
       const { associatedAction } = action;
-      const actionType = 'fetch';
+      const entityKey = entityCatalog.getEntityKey(associatedAction);
       const endpoints = action.payload.endpoints;
       // Data is an array of endpoints
-      const mappedData = {
+      const mappedData: NormalizedResponse<EndpointModel> = {
         entities: {
-          [endpointEntityKey]: {}
+          [entityKey]: {}
         },
         result: []
-      } as NormalizedResponse<EndpointModel>;
+      };
 
       Object.keys(endpoints).forEach((type: string) => {
         const endpointsForType = endpoints[type];
         Object.values(endpointsForType).forEach(endpointInfo => {
-          mappedData.entities[endpointEntityKey][endpointInfo.guid] = {
+          mappedData.entities[entityKey][endpointInfo.guid] = {
             ...endpointInfo,
             connectionStatus: endpointInfo.user ? 'connected' : 'disconnected',
           };
@@ -102,8 +92,8 @@ export class EndpointsEffect {
       // Order is important. Need to ensure data is written (none cf action success) before we notify everything is loaded
       // (endpoint success)
       return [
-        new WrapperRequestActionSuccess(mappedData, associatedAction, actionType),
-        new GetAllEndpointsSuccess(mappedData, associatedAction.login),
+        new WrapperRequestActionSuccess(mappedData, associatedAction, 'fetch'),
+        new GetAllEndpointsSuccess(mappedData, associatedAction['login']),
       ];
     }));
 
@@ -119,8 +109,6 @@ export class EndpointsEffect {
         return [];
       }
 
-      const apiAction = this.getEndpointUpdateAction(action.guid, action.type, EndpointsEffect.connectingKey);
-
       let fromObject: any;
       let body = action.body as any;
 
@@ -152,12 +140,11 @@ export class EndpointsEffect {
       });
 
       return this.doEndpointAction(
-        apiAction,
+        action,
         '/pp/v1/auth/login/cnsi',
         params,
         null,
-        [CONNECT_ENDPOINTS_SUCCESS, CONNECT_ENDPOINTS_FAILED],
-        action.endpointType,
+        action.endpointsType,
         body,
         response => response && response.error && response.error.error ? response.error.error : 'Could not connect, please try again'
       );
@@ -166,8 +153,6 @@ export class EndpointsEffect {
   @Effect() disconnect$ = this.actions$.pipe(
     ofType<DisconnectEndpoint>(DISCONNECT_ENDPOINTS),
     mergeMap(action => {
-
-      const apiAction = this.getEndpointUpdateAction(action.guid, action.type, EndpointsEffect.disconnectingKey);
       const params: HttpParams = new HttpParams({
         fromObject: {
           cnsi_guid: action.guid
@@ -175,20 +160,17 @@ export class EndpointsEffect {
       });
 
       return this.doEndpointAction(
-        apiAction,
+        action,
         '/pp/v1/auth/logout/cnsi',
         params,
         null,
-        [DISCONNECT_ENDPOINTS_SUCCESS, DISCONNECT_ENDPOINTS_FAILED],
-        action.endpointType
+        action.endpointsType
       );
     }));
 
   @Effect() unregister$ = this.actions$.pipe(
     ofType<UnregisterEndpoint>(UNREGISTER_ENDPOINTS),
     mergeMap(action => {
-
-      const apiAction = this.getEndpointDeleteAction(action.guid, action.type);
       const params: HttpParams = new HttpParams({
         fromObject: {
           cnsi_guid: action.guid
@@ -196,12 +178,11 @@ export class EndpointsEffect {
       });
 
       return this.doEndpointAction(
-        apiAction,
+        action,
         '/pp/v1/unregister',
         params,
         'delete',
-        [UNREGISTER_ENDPOINTS_SUCCESS, UNREGISTER_ENDPOINTS_FAILED],
-        action.endpointType
+        action.endpointsType
       );
     }));
 
@@ -209,7 +190,6 @@ export class EndpointsEffect {
     ofType<RegisterEndpoint>(REGISTER_ENDPOINTS),
     mergeMap(action => {
 
-      const apiAction = this.getEndpointUpdateAction(action.guid(), action.type, EndpointsEffect.registeringKey);
       const paramsObj = {
         cnsi_name: action.name,
         api_endpoint: action.endpoint,
@@ -230,12 +210,11 @@ export class EndpointsEffect {
       });
 
       return this.doEndpointAction(
-        apiAction,
-        '/pp/v1/register/' + action.endpointType,
+        action,
+        '/pp/v1/register/' + action.endpointsType,
         new HttpParams({}),
         'create',
-        [REGISTER_ENDPOINTS_SUCCESS, REGISTER_ENDPOINTS_FAILED],
-        action.endpointType,
+        action.endpointsType,
         body,
         this.processRegisterError
       );
@@ -243,8 +222,7 @@ export class EndpointsEffect {
 
   @Effect() updateEndpoint$ = this.actions$.pipe(
     ofType<UpdateEndpoint>(UPDATE_ENDPOINT),
-    mergeMap(action => {
-      const apiAction = this.getEndpointUpdateAction(action.id, action.type, EndpointsEffect.updatingKey);
+    mergeMap((action: UpdateEndpoint) => {
       const paramsObj = {
         name: action.name,
         skipSSL: action.skipSSL,
@@ -261,12 +239,11 @@ export class EndpointsEffect {
       });
 
       return this.doEndpointAction(
-        apiAction,
+        action,
         '/pp/v1/endpoint/' + action.id,
         new HttpParams({}),
         'update',
-        [UPDATE_ENDPOINT_SUCCESS, UPDATE_ENDPOINT_FAILED],
-        action.endpointType,
+        action.endpointsType,
         body,
         this.processUpdateError
       );
@@ -291,35 +268,20 @@ export class EndpointsEffect {
     }
     return message;
   }
-  private getEndpointUpdateAction(guid: string, type: string, updatingKey: string) {
-    const entityType = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
-    return {
-      entityType,
-      guid,
-      type,
-      updatingKey,
-    } as EntityRequestAction;
-  }
-
-  private getEndpointDeleteAction(guid, type) {
-    const entityType = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
-    return {
-      entityType,
-      guid,
-      type,
-    } as EntityRequestAction;
-  }
 
+  /**
+   * @param endpointType The underlying endpoints type (_cf_Endpoint, not _stratos_Endpoint)
+   */
   private doEndpointAction(
     apiAction: EntityRequestAction | PaginatedAction,
     url: string,
     params: HttpParams,
     apiActionType: ApiRequestTypes = 'update',
-    actionStrings: [string, string] = [null, null],
-    endpointType: EndpointType = 'cf',
+    endpointType: EndpointType,
     body?: string,
     errorMessageHandler?: (e: any) => string,
   ) {
+
     const endpointEntityKey = entityCatalog.getEntityKey(apiAction);
     this.store.dispatch(new StartRequestAction(apiAction, apiActionType));
     return this.http.post(url, body || {}, {
@@ -328,17 +290,17 @@ export class EndpointsEffect {
       mergeMap((endpoint: EndpointModel) => {
         const actions = [];
         let response: NormalizedResponse<EndpointModel>;
-        if (actionStrings[0]) {
-          actions.push(new EndpointActionComplete(actionStrings[0], apiAction.guid, endpointType, endpoint));
+        if (apiAction.actions[1]) {
+          actions.push(new EndpointActionComplete(apiAction.actions[1], apiAction.guid, endpointType, endpoint));
         }
 
         if (apiActionType === 'delete') {
           actions.push(new ClearPaginationOfEntity(apiAction, apiAction.guid));
-          actions.push(new GetUserFavoritesAction());
+          actions.push(stratosEntityCatalog.userFavorite.actions.getAll());
         }
 
         if (apiActionType === 'create') {
-          actions.push(new GetSystemInfo());
+          actions.push(stratosEntityCatalog.systemInfo.actions.getSystemInfo());
           response = {
             entities: {
               [endpointEntityKey]: {
@@ -350,10 +312,10 @@ export class EndpointsEffect {
         }
 
         if (apiActionType === 'update') {
-          actions.push(new GetSystemInfo());
+          actions.push(stratosEntityCatalog.systemInfo.actions.getSystemInfo());
         }
 
-        if (apiAction.updatingKey === EndpointsEffect.disconnectingKey || apiActionType === 'create' || apiActionType === 'delete'
+        if (apiAction.updatingKey === DisconnectEndpoint.UpdatingKey || apiActionType === 'create' || apiActionType === 'delete'
           || apiActionType === 'update') {
           actions.push(this.clearEndpointInternalEvents(apiAction.guid, endpointEntityKey));
         }
@@ -364,8 +326,8 @@ export class EndpointsEffect {
       ),
       catchError(e => {
         const actions = [];
-        if (actionStrings[1]) {
-          actions.push({ type: actionStrings[1], guid: apiAction.guid });
+        if (apiAction.actions[2]) {
+          actions.push({ type: apiAction.actions[2], guid: apiAction.guid });
         }
         const errorMessage = errorMessageHandler ? errorMessageHandler(e) : 'Could not perform action';
         actions.push(new WrapperRequestActionFailed(errorMessage, apiAction, apiActionType));
diff --git a/src/frontend/packages/store/src/effects/permissions.effect.ts b/src/frontend/packages/store/src/effects/permissions.effect.ts
index bb890b00a7..b9569d4b2e 100644
--- a/src/frontend/packages/store/src/effects/permissions.effect.ts
+++ b/src/frontend/packages/store/src/effects/permissions.effect.ts
@@ -5,7 +5,6 @@ import { Action, Store } from '@ngrx/store';
 import { combineLatest, EMPTY, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
 
-import { LoggerService } from '../../../core/src/core/logger.service';
 import { CONNECT_ENDPOINTS_SUCCESS, EndpointActionComplete } from '../actions/endpoint.actions';
 import {
   GET_CURRENT_USER_RELATIONS,
@@ -27,7 +26,6 @@ export class PermissionsEffects {
     private httpClient: HttpClient,
     private actions$: Actions,
     private store: Store<AppState>,
-    private logService: LoggerService
   ) { }
 
   @Effect() getCurrentUsersPermissions$ = this.actions$.pipe(
@@ -35,7 +33,7 @@ export class PermissionsEffects {
     switchMap(action => {
       const allRequestsCompleted = entityCatalog.getAllBaseEndpointTypes().reduce((res, endpointType) => {
         if (endpointType.definition.userRolesFetch) {
-          res.push(endpointType.definition.userRolesFetch([], this.store, this.logService, this.httpClient));
+          res.push(endpointType.definition.userRolesFetch([], this.store, this.httpClient));
         }
         return res;
       }, []);
@@ -44,7 +42,7 @@ export class PermissionsEffects {
       );
     }),
     catchError(err => {
-      this.logService.warn('Failed to fetch current user permissions: ', err);
+      console.warn('Failed to fetch current user permissions: ', err);
       return of(failedAction);
     })
   );
@@ -61,12 +59,12 @@ export class PermissionsEffects {
         guid: action.guid,
         user: action.endpoint.user
       }
-      return endpointType.definition.userRolesFetch([endpoint], this.store, this.logService, this.httpClient).pipe(
+      return endpointType.definition.userRolesFetch([endpoint], this.store, this.httpClient).pipe(
         map(succeeded => succeeded ? successAction : failedAction)
       );
     }),
     catchError(err => {
-      this.logService.warn('Failed to fetch current user permissions after endpoint connected: ', err);
+      console.warn('Failed to fetch current user permissions after endpoint connected: ', err);
       return of(failedAction);
     })
   );
diff --git a/src/frontend/packages/store/src/effects/snackBar.effects.spec.ts b/src/frontend/packages/store/src/effects/snackBar.effects.spec.ts
deleted file mode 100644
index 69c2b8924c..0000000000
--- a/src/frontend/packages/store/src/effects/snackBar.effects.spec.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { inject, TestBed } from '@angular/core/testing';
-import { MatDialog } from '@angular/material/dialog';
-import { Store } from '@ngrx/store';
-
-import { CoreModule } from '../../../core/src/core/core.module';
-import { EndpointsPageComponent } from '../../../core/src/features/endpoints/endpoints-page/endpoints-page.component';
-import { SharedModule } from '../../../core/src/shared/shared.module';
-import { ShowSnackBar } from './../actions/snackBar.actions';
-import { AppStoreModule } from './../store.module';
-
-describe('SnackBarEffect', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [EndpointsPageComponent],
-      imports: [
-        CommonModule,
-        CoreModule,
-        SharedModule,
-        AppStoreModule
-      ]
-    })
-      .compileComponents();
-  });
-
-  it('Should open a dialog', () => {
-    inject([Store, MatDialog], (store: Store<unknown>, dialog: MatDialog) => {
-      store.dispatch(new ShowSnackBar('Test'));
-      expect(dialog.openDialogs[0]).toBeDefined();
-    });
-  });
-});
diff --git a/src/frontend/packages/store/src/effects/snackBar.effects.ts b/src/frontend/packages/store/src/effects/snackBar.effects.ts
deleted file mode 100644
index 5f6a2540e4..0000000000
--- a/src/frontend/packages/store/src/effects/snackBar.effects.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Injectable } from '@angular/core';
-import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
-import { Actions, Effect, ofType } from '@ngrx/effects';
-import { map } from 'rxjs/operators';
-
-import { SnackBarReturnComponent } from '../../../core/src/shared/components/snackbar-return/snackbar-return.component';
-import {
-  HIDE_SNACK_BAR,
-  HideSnackBar,
-  SHOW_RETURN_SNACK_BAR,
-  SHOW_SNACK_BAR,
-  ShowReturnSnackBar,
-  ShowSnackBar,
-} from '../actions/snackBar.actions';
-
-
-@Injectable()
-export class SnackBarEffects {
-  constructor(
-    private actions$: Actions,
-    public snackBar: MatSnackBar
-  ) { }
-
-  private snackBars: MatSnackBarRef<SimpleSnackBar>[] = [];
-
-  @Effect({ dispatch: false }) showSnackBar$ = this.actions$.pipe(
-    ofType<ShowSnackBar>(SHOW_SNACK_BAR),
-    map(action => this.snackBars.push(this.snackBar.open(action.message, action.closeMessage, {
-      duration: action.closeMessage ? null : 5000
-    }))));
-
-  @Effect({ dispatch: false }) showReturnSnackBar$ = this.actions$.pipe(
-    ofType<ShowReturnSnackBar>(SHOW_RETURN_SNACK_BAR),
-    map(action => this.snackBars.push(this.snackBar.openFromComponent(SnackBarReturnComponent, {
-      data: { message: action.message, returnUrl: action.returnRouterUrl, returnLabel: action.returnLabel }
-    }))));
-
-  @Effect({ dispatch: false }) hideSnackBar$ = this.actions$.pipe(
-    ofType<HideSnackBar>(HIDE_SNACK_BAR),
-    map(() => this.snackBars.forEach(snackBar => snackBar.dismiss()))
-  );
-}
diff --git a/src/frontend/packages/store/src/effects/system.effects.ts b/src/frontend/packages/store/src/effects/system.effects.ts
index 962280aebb..07eb09bdf5 100644
--- a/src/frontend/packages/store/src/effects/system.effects.ts
+++ b/src/frontend/packages/store/src/effects/system.effects.ts
@@ -4,12 +4,11 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { catchError, mergeMap } from 'rxjs/operators';
 
-import { EntityRequestAction } from '../types/request.types';
-import { GET_SYSTEM_INFO, GetSystemFailed, GetSystemInfo, GetSystemSuccess } from '../actions/system.actions';
-import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from '../types/request.types';
-import { SystemInfo, systemStoreNames } from '../types/system.types';
+import { GET_SYSTEM_INFO, GetSystemInfo, GetSystemSuccess } from '../actions/system.actions';
 import { InternalAppState } from '../app-state';
-import { STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
+import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from '../types/request.types';
+import { SystemInfo } from '../types/system.types';
+
 
 @Injectable()
 export class SystemEffects {
@@ -19,32 +18,25 @@ export class SystemEffects {
     private store: Store<InternalAppState>
   ) { }
 
-  static guid = 'info';
-
   @Effect() getInfo$ = this.actions$.pipe(
     ofType<GetSystemInfo>(GET_SYSTEM_INFO),
     mergeMap(action => {
-      const apiAction = {
-        entityType: systemStoreNames.type,
-        endpointType: STRATOS_ENDPOINT_TYPE,
-        guid: SystemEffects.guid,
-        type: action.type,
-      } as EntityRequestAction;
-      this.store.dispatch(new StartRequestAction(apiAction));
+      // Associated action with be either get endpoint or get all endpoints/
+      // Start action for those two are dispatched here, as well as error handling
+      // Success actions are handling in the effect associated with GetSystemSuccess
+      this.store.dispatch(new StartRequestAction(action));
       const { associatedAction } = action;
-      const actionType = 'fetch';
-      this.store.dispatch(new StartRequestAction(associatedAction, actionType));
+      this.store.dispatch(new StartRequestAction(associatedAction, 'fetch'));
       return this.httpClient.get('/pp/v1/info').pipe(
         mergeMap((info: SystemInfo) => {
           return [
             new GetSystemSuccess(info, action.login, associatedAction),
-            new WrapperRequestActionSuccess({ entities: {}, result: [] }, apiAction)
+            new WrapperRequestActionSuccess({ entities: {}, result: [] }, action)
           ];
         }), catchError((e) => {
           return [
-            new GetSystemFailed(),
-            new WrapperRequestActionFailed('Could not get system endpoints', associatedAction),
-            new WrapperRequestActionFailed('Could not fetch system info', apiAction)
+            { type: action.actions[2] },
+            new WrapperRequestActionFailed('Could not fetch system info', action)
           ];
         }));
     }));
diff --git a/src/frontend/packages/store/src/effects/uaa-setup.effects.ts b/src/frontend/packages/store/src/effects/uaa-setup.effects.ts
index 9e193e4380..ea7092d69b 100644
--- a/src/frontend/packages/store/src/effects/uaa-setup.effects.ts
+++ b/src/frontend/packages/store/src/effects/uaa-setup.effects.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { catchError, map, switchMap } from 'rxjs/operators';
 
-import { isHttpErrorResponse } from '../../../core/src/jetstream.helpers';
+import { isHttpErrorResponse } from '../jetstream';
 import {
   SETUP_GET_SCOPES,
   SETUP_SAVE_CONFIG,
diff --git a/src/frontend/packages/store/src/effects/user-favorites-effect.ts b/src/frontend/packages/store/src/effects/user-favorites-effect.ts
index deebce83a7..02240e52af 100644
--- a/src/frontend/packages/store/src/effects/user-favorites-effect.ts
+++ b/src/frontend/packages/store/src/effects/user-favorites-effect.ts
@@ -2,38 +2,29 @@ import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
-import { catchError, first, map, mergeMap, switchMap } from 'rxjs/operators';
+import { catchError, first, mergeMap, switchMap } from 'rxjs/operators';
 
-import { userFavoritesEntitySchema } from '../../../core/src/base-entity-schemas';
-import { entityCatalog } from '../entity-catalog/entity-catalog';
-import { UserFavoriteManager } from '../../../core/src/core/user-favorite-manager';
-import { environment } from '../../../core/src/environments/environment.prod';
 import { ClearPaginationOfEntity } from '../actions/pagination.actions';
 import {
   GetUserFavoritesAction,
   GetUserFavoritesFailedAction,
   GetUserFavoritesSuccessAction,
-} from '../actions/user-favourites-actions/get-user-favorites-action';
-import {
   RemoveUserFavoriteAction,
   RemoveUserFavoriteSuccessAction,
-} from '../actions/user-favourites-actions/remove-user-favorite-action';
-import {
   SaveUserFavoriteAction,
   SaveUserFavoriteSuccessAction,
-} from '../actions/user-favourites-actions/save-user-favorite-action';
-import { ToggleUserFavoriteAction } from '../actions/user-favourites-actions/toggle-user-favorite-action';
-import {
+  ToggleUserFavoriteAction,
   UpdateUserFavoriteMetadataAction,
   UpdateUserFavoriteMetadataSuccessAction,
-} from '../actions/user-favourites-actions/update-user-favorite-metadata-action';
+} from '../actions/user-favourites.actions';
 import { DispatchOnlyAppState } from '../app-state';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
+import { proxyAPIVersion } from '../jetstream';
 import { NormalizedResponse } from '../types/api.types';
-import { PaginatedAction } from '../types/pagination.types';
-import { WrapperRequestActionSuccess } from '../types/request.types';
+import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from '../types/request.types';
 import { IFavoriteMetadata, UserFavorite, userFavoritesPaginationKey } from '../types/user-favorites.types';
+import { UserFavoriteManager } from '../user-favorite-manager';
 
-const { proxyAPIVersion } = environment;
 const favoriteUrlPath = `/pp/${proxyAPIVersion}/favorites`;
 
 
@@ -51,11 +42,17 @@ export class UserFavoritesEffect {
   @Effect() saveFavorite = this.actions$.pipe(
     ofType<SaveUserFavoriteAction>(SaveUserFavoriteAction.ACTION_TYPE),
     mergeMap(action => {
+      const actionType = 'update';
+      this.store.dispatch(new StartRequestAction(action, actionType))
       return this.http.post<UserFavorite<IFavoriteMetadata>>(favoriteUrlPath, action.favorite).pipe(
-        mergeMap(newFavorite => {
-          return [
-            new SaveUserFavoriteSuccessAction(newFavorite)
-          ];
+        switchMap(newFavorite => {
+          this.store.dispatch(new WrapperRequestActionSuccess(null, action, actionType));
+          this.store.dispatch(new SaveUserFavoriteSuccessAction(newFavorite));
+          return [];
+        }),
+        catchError(() => {
+          this.store.dispatch(new WrapperRequestActionFailed('Failed to update user favorite', action, actionType));
+          return [];
         })
       );
     })
@@ -64,14 +61,11 @@ export class UserFavoritesEffect {
   @Effect({ dispatch: false }) getFavorite$ = this.actions$.pipe(
     ofType<GetUserFavoritesAction>(GetUserFavoritesAction.ACTION_TYPE),
     switchMap((action: GetUserFavoritesAction) => {
-      const apiAction = {
-        entityType: userFavoritesEntitySchema.entityType,
-        endpointType: userFavoritesEntitySchema.endpointType,
-        type: action.type
-      } as PaginatedAction;
-      const favEntityKey = entityCatalog.getEntityKey(apiAction);
+      const favEntityKey = entityCatalog.getEntityKey(action);
+      const actionType = 'fetch';
+      this.store.dispatch(new StartRequestAction(action, actionType))
       return this.http.get<UserFavorite<IFavoriteMetadata>[]>(favoriteUrlPath).pipe(
-        map(favorites => {
+        switchMap(favorites => {
           const mappedData = favorites.reduce<NormalizedResponse<UserFavorite<IFavoriteMetadata>>>((data, favorite) => {
             const { guid } = favorite;
             if (guid) {
@@ -80,12 +74,14 @@ export class UserFavoritesEffect {
             }
             return data;
           }, { entities: { [favEntityKey]: {} }, result: [] });
-          this.store.dispatch(new WrapperRequestActionSuccess(mappedData, apiAction));
+          this.store.dispatch(new WrapperRequestActionSuccess(mappedData, action, actionType, mappedData.result.length, 1));
           this.store.dispatch(new GetUserFavoritesSuccessAction(favorites));
+          return [];
         }),
-        catchError(e => {
-          this.store.dispatch(new GetUserFavoritesFailedAction());
-          throw e;
+        catchError(() => {
+          this.store.dispatch(new GetUserFavoritesFailedAction())
+          this.store.dispatch(new WrapperRequestActionFailed('Failed to fetch user favorites', action, actionType))
+          return [];
         })
       );
     })
@@ -96,11 +92,11 @@ export class UserFavoritesEffect {
     mergeMap(action =>
       this.userFavoriteManager.getIsFavoriteObservable(action.favorite).pipe(
         first(),
-        map(isFav => {
+        switchMap(isFav => {
           if (isFav) {
-            return new RemoveUserFavoriteAction(action.favorite);
+            return [new RemoveUserFavoriteAction(action.favorite)];
           } else {
-            return new SaveUserFavoriteAction(action.favorite);
+            return [new SaveUserFavoriteAction(action.favorite)];
           }
         })
       )
@@ -109,22 +105,42 @@ export class UserFavoritesEffect {
 
   @Effect({ dispatch: false }) removeFavorite$ = this.actions$.pipe(
     ofType<RemoveUserFavoriteAction>(RemoveUserFavoriteAction.ACTION_TYPE),
-    switchMap((action: RemoveUserFavoriteAction) => {
-      const { guid } = action.favorite;
-      this.store.dispatch(new RemoveUserFavoriteSuccessAction(action.favorite));
-      this.store.dispatch(new ClearPaginationOfEntity(userFavoritesEntitySchema, guid, userFavoritesPaginationKey));
-      return this.http.delete<UserFavorite<IFavoriteMetadata>>(`${favoriteUrlPath}/${guid}`);
+    mergeMap((action: RemoveUserFavoriteAction) => {
+      const actionType = 'update';
+      this.store.dispatch(new StartRequestAction(action, actionType))
+      return this.http.delete<UserFavorite<IFavoriteMetadata>>(`${favoriteUrlPath}/${action.guid}`).pipe(
+        switchMap(() => {
+          this.store.dispatch(new WrapperRequestActionSuccess(null, action));
+          this.store.dispatch(new RemoveUserFavoriteSuccessAction(action.favorite));
+          this.store.dispatch(new ClearPaginationOfEntity(action.entity[0], action.guid, userFavoritesPaginationKey));
+          return [];
+        }),
+        catchError(() => {
+          this.store.dispatch(new WrapperRequestActionFailed('Failed to remove user favorite', action, actionType));
+          return [];
+        })
+      );
     })
   );
 
   @Effect() updateMetadata$ = this.actions$.pipe(
     ofType<UpdateUserFavoriteMetadataAction>(UpdateUserFavoriteMetadataAction.ACTION_TYPE),
     mergeMap((action: UpdateUserFavoriteMetadataAction) => {
+      const actionType = 'update';
+      this.store.dispatch(new StartRequestAction(action, actionType))
       return this.http.post<UserFavorite<IFavoriteMetadata>>(
         `${favoriteUrlPath}/${action.favorite.guid}/metadata`,
         action.favorite.metadata
       ).pipe(
-        map(() => new UpdateUserFavoriteMetadataSuccessAction(action.favorite))
+        switchMap(() => {
+          this.store.dispatch(new WrapperRequestActionSuccess(null, action));
+          this.store.dispatch(new UpdateUserFavoriteMetadataSuccessAction(action.favorite));
+          return [];
+        }),
+        catchError(() => {
+          this.store.dispatch(new WrapperRequestActionFailed('Failed to update user favorite', action, actionType));
+          return [];
+        })
       );
     })
   );
diff --git a/src/frontend/packages/store/src/effects/user-profile.effects.ts b/src/frontend/packages/store/src/effects/user-profile.effects.ts
index 745d4e11cc..9c010fee57 100644
--- a/src/frontend/packages/store/src/effects/user-profile.effects.ts
+++ b/src/frontend/packages/store/src/effects/user-profile.effects.ts
@@ -4,8 +4,6 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { catchError, mergeMap, switchMap } from 'rxjs/operators';
 
-import { userProfileEntitySchema } from '../../../core/src/base-entity-schemas';
-import { environment } from '../../../core/src/environments/environment';
 import {
   FetchUserProfileAction,
   GET_USERPROFILE,
@@ -15,28 +13,15 @@ import {
   UpdateUserProfileAction,
 } from '../actions/user-profile.actions';
 import { entityCatalog } from '../entity-catalog/entity-catalog';
-import { rootUpdatingKey } from '../reducers/api-request-reducer/types';
+import { proxyAPIVersion } from '../jetstream';
 import { UserProfileInfo } from '../types/user-profile.types';
 import { DispatchOnlyAppState } from './../app-state';
-import {
-  EntityRequestAction,
-  StartRequestAction,
-  WrapperRequestActionFailed,
-  WrapperRequestActionSuccess,
-} from './../types/request.types';
-
-
-const { proxyAPIVersion } = environment;
+import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from './../types/request.types';
 
-export const userProfilePasswordUpdatingKey = 'password';
 
 @Injectable()
 export class UserProfileEffect {
 
-  stratosUserConfig = entityCatalog.getEntity(userProfileEntitySchema.endpointType, userProfileEntitySchema.entityType);
-  private stratosUserEntityType = userProfileEntitySchema.entityType;
-  private stratosUserEndpointType = userProfileEntitySchema.endpointType;
-
   constructor(
     private actions$: Actions,
     private store: Store<DispatchOnlyAppState>,
@@ -47,85 +32,66 @@ export class UserProfileEffect {
     ofType<FetchUserProfileAction>(GET_USERPROFILE),
     mergeMap(action => {
       this.store.dispatch(new StartRequestAction(action));
+      const entityKey = entityCatalog.getEntityKey(action);
       return this.httpClient.get(`/pp/${proxyAPIVersion}/users/${action.userGuid}`).pipe(
-        mergeMap((info: UserProfileInfo) => {
-          return [
-            new WrapperRequestActionSuccess({
-              entities: { [this.stratosUserConfig.entityKey]: { [action.guid]: info } },
-              result: [action.guid]
-            }, action)
-          ];
-        }), catchError((e) => {
-          return [
-            new WrapperRequestActionFailed('Could not get User Profile Info', action),
-          ];
-        }));
+        mergeMap((info: UserProfileInfo) => [
+          new WrapperRequestActionSuccess({
+            entities: { [entityKey]: { [action.guid]: info } },
+            result: [action.guid]
+          }, action)
+        ]),
+        catchError((e) => [
+          new WrapperRequestActionFailed('Could not get User Profile Info', action),
+        ])
+      );
     }));
 
   @Effect() updateUserProfileInfo$ = this.actions$.pipe(
     ofType<UpdateUserProfileAction>(UPDATE_USERPROFILE),
-    mergeMap(action => {
-      const apiAction = {
-        entityType: this.stratosUserEntityType,
-        endpointType: this.stratosUserEndpointType,
-        guid: FetchUserProfileAction.guid,
-        type: action.type,
-        updatingKey: rootUpdatingKey
-      } as EntityRequestAction;
-      const actionType = 'update';
-      this.store.dispatch(new StartRequestAction(apiAction, actionType));
-      const guid = action.profile.id;
+    mergeMap((action: UpdateUserProfileAction) => {
+      this.store.dispatch(new StartRequestAction(action, 'update'));
+      const userGuid = action.profile.id;
       const version = action.profile.meta.version;
       const headers = { 'If-Match': version.toString() };
       if (action.password) {
         headers['x-stratos-password'] = action.password;
       }
 
-      return this.httpClient.put(`/pp/${proxyAPIVersion}/users/${guid}`, action.profile, { headers }).pipe(
+      return this.httpClient.put(`/pp/${proxyAPIVersion}/users/${userGuid}`, action.profile, { headers }).pipe(
         mergeMap((info: UserProfileInfo) => {
           return [
             new WrapperRequestActionSuccess({
               entities: {},
               result: []
-            }, apiAction),
-          ];
-        }), catchError((e) => {
-          return [
-            new WrapperRequestActionFailed('Could not update User Profile Info', apiAction),
+            }, action),
           ];
-        }));
+        }),
+        catchError((e) => [
+          new WrapperRequestActionFailed('Could not update User Profile Info', action),
+        ]));
     }));
 
   @Effect() updateUserPassword$ = this.actions$.pipe(
     ofType<UpdateUserPasswordAction>(UPDATE_USERPASSWORD),
-    mergeMap(action => {
-      const apiAction = {
-        entityType: this.stratosUserEntityType,
-        endpointType: this.stratosUserEndpointType,
-        guid: FetchUserProfileAction.guid,
-        type: action.type,
-        updatingKey: userProfilePasswordUpdatingKey
-      } as EntityRequestAction;
-      // Use the creating action for password change
-      const actionType = 'update';
-      this.store.dispatch(new StartRequestAction(apiAction, actionType));
-      const guid = action.id;
+    mergeMap((action: UpdateUserPasswordAction) => {
+      this.store.dispatch(new StartRequestAction(action, 'update'));
+      const userGuid = action.id;
       const headers = {
         'x-stratos-password': action.passwordChanges.oldPassword,
         'x-stratos-password-new': action.passwordChanges.password
       };
-      return this.httpClient.put(`/pp/${proxyAPIVersion}/users/${guid}/password`, action.passwordChanges, { headers }).pipe(
+      return this.httpClient.put(`/pp/${proxyAPIVersion}/users/${userGuid}/password`, action.passwordChanges, { headers }).pipe(
         switchMap((info: UserProfileInfo) => {
           return [
             new WrapperRequestActionSuccess({
               entities: {},
               result: []
-            }, apiAction)
-          ];
-        }), catchError((e) => {
-          return [
-            new WrapperRequestActionFailed('Could not update User Password', apiAction),
+            }, action)
           ];
-        }));
+        }),
+        catchError((e) => [
+          new WrapperRequestActionFailed('Could not update User Password', action),
+        ])
+      );
     }));
 }
diff --git a/src/frontend/packages/store/src/endpoint-utils.ts b/src/frontend/packages/store/src/endpoint-utils.ts
new file mode 100644
index 0000000000..00f3677f32
--- /dev/null
+++ b/src/frontend/packages/store/src/endpoint-utils.ts
@@ -0,0 +1,6 @@
+import { EndpointModel } from './types/endpoint.types';
+
+export function getFullEndpointApiUrl(endpoint: EndpointModel) {
+  return endpoint && endpoint.api_endpoint ?
+    `${endpoint.api_endpoint.Scheme}://${endpoint.api_endpoint.Host}${endpoint.api_endpoint.Path}` : 'Unknown';
+}
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
index 2e88c4f518..0ad7cc9d67 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
@@ -122,6 +122,7 @@ export class EntityCatalogEntityStoreHelpers {
       if (!rAction.guid) {
         throw new Error(`\`${actionKey}\` action for entity \`${rAction.entityType}\` has no guid`);
       }
+
       const entityMonitor = es.getEntityMonitor(
         rAction.guid,
         {
@@ -147,9 +148,9 @@ export class EntityCatalogEntityStoreHelpers {
           schemaKey: '',
           startWithNull: false
         }
-      ): EntityMonitor<Y> =>
-        new EntityMonitor<Y>(EntityCatalogHelpers.GetEntityCatalogHelper().store, entityId, entityKey, getSchema(params.schemaKey), params.startWithNull)
-      ,
+      ): EntityMonitor<Y> => new EntityMonitor<Y>(
+        EntityCatalogHelpers.GetEntityCatalogHelper().store, entityId, entityKey, getSchema(params.schemaKey), params.startWithNull
+      ),
       getEntityService: (
         ...args: Parameters<ABC['get']>
       ): EntityService<Y> => {
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
index 3fa2b47b0a..61bbc7883e 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
@@ -1,9 +1,7 @@
 import { ActionReducer } from '@ngrx/store';
 
-import { endpointEntitySchema, STRATOS_ENDPOINT_TYPE } from '../../../../core/src/base-entity-schemas';
-import { KnownKeys, NonOptionalKeys } from '../../../../core/src/core/utils.service';
-import { getFullEndpointApiUrl } from '../../../../core/src/features/endpoints/endpoint-helpers';
 import { IRequestEntityTypeState } from '../../app-state';
+import { getFullEndpointApiUrl } from '../../endpoint-utils';
 import {
   EntitiesFetchHandler,
   EntitiesInfoHandler,
@@ -15,6 +13,7 @@ import {
 } from '../../entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe';
 import { EntityPipelineEntity, stratosEndpointGuidKey } from '../../entity-request-pipeline/pipeline.types';
 import { EntitySchema } from '../../helpers/entity-schema';
+import { endpointEntityType, STRATOS_ENDPOINT_TYPE, stratosEntityFactory } from '../../helpers/stratos-entity-factory';
 import { EndpointModel } from '../../types/endpoint.types';
 import { APISuccessOrFailedAction, EntityRequestAction } from '../../types/request.types';
 import { IEndpointFavMetadata } from '../../types/user-favorites.types';
@@ -37,6 +36,7 @@ import {
 import { ActionBuilderConfigMapper } from './action-builder-config.mapper';
 import { ActionDispatchers, EntityCatalogEntityStoreHelpers } from './entity-catalog-entity-store-helpers';
 import { EntityCatalogEntityStore } from './entity-catalog-entity.types';
+import { KnownKeys, NonOptionalKeys } from './type.helpers';
 
 export type KnownActionBuilders<ABC extends OrchestratedActionBuilders> = Pick<ABC, NonOptionalKeys<Pick<ABC, KnownKeys<ABC>>>>;
 
@@ -134,8 +134,8 @@ export class StratosBaseCatalogEntity<
       }
       return newSchema;
     }, {
-        default: entitySchemas.default
-      });
+      default: entitySchemas.default
+    });
   }
 
   private getEndpointType(definition: IStratosBaseEntityDefinition) {
@@ -316,7 +316,7 @@ export class StratosCatalogEntity<
 }
 
 export class StratosCatalogEndpointEntity extends StratosBaseCatalogEntity<IEndpointFavMetadata, EndpointModel> {
-  static readonly baseEndpointRender = {
+  static readonly baseEndpointRender: IStratosEntityBuilder<IEndpointFavMetadata, EndpointModel> = {
     getMetadata: endpoint => ({
       name: endpoint.name,
       guid: endpoint.guid,
@@ -332,19 +332,19 @@ export class StratosCatalogEndpointEntity extends StratosBaseCatalogEntity<IEndp
       ['User', (metadata) => metadata.user],
       ['Admin', (metadata) => metadata.admin]
     ]
-  } as IStratosEntityBuilder<IEndpointFavMetadata, EndpointModel>;
+  };
   // This is needed here for typing
   public definition: IStratosEndpointDefinition<EntityCatalogSchemas>;
   constructor(
     entity: StratosEndpointExtensionDefinition | IStratosEndpointDefinition,
     getLink?: (metadata: IEndpointFavMetadata) => string
   ) {
-    const fullEntity = {
+    const fullEntity: IStratosEndpointDefinition = {
       ...entity,
       schema: {
-        default: endpointEntitySchema
+        default: stratosEntityFactory(endpointEntityType)
       }
-    } as IStratosEndpointDefinition;
+    };
     super(fullEntity, {
       entityBuilder: {
         ...StratosCatalogEndpointEntity.baseEndpointRender,
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.types.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.types.ts
index 0280477e6f..ac6e5e3ae3 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.types.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.types.ts
@@ -1,15 +1,11 @@
-import {
-  FilteredByNotReturnType,
-  FilteredByReturnType,
-  KnownKeys,
-  NeverKeys,
-} from '../../../../core/src/core/utils.service';
 import { EntityService } from '../../entity-service';
 import { EntityMonitor } from '../../monitors/entity-monitor';
 import { PaginationMonitor } from '../../monitors/pagination-monitor';
 import { PaginationObservables } from '../../reducers/pagination-reducer/pagination-reducer.types';
 import { PaginatedAction } from '../../types/pagination.types';
 import { OrchestratedActionBuilders, OrchestratedActionCoreBuilders } from '../action-orchestrator/action-orchestrator';
+import { FilteredByNotReturnType, FilteredByReturnType, KnownKeys, NeverKeys } from './type.helpers';
+
 
 /**
  * Core entity and entities access (entity/entities monitors and services)
@@ -105,7 +101,7 @@ export type CustomEntityCatalogEntityStore<Y, ABC extends OrchestratedActionBuil
 
 /**
  * Combine all types of store
- * - CoreEntityCatalogEntityStore (entity and entities store access) 
+ * - CoreEntityCatalogEntityStore (entity and entities store access)
  * - EntityCatalogEntityStoreCollections (per entity custom entities lists)
  * - EntityCatalogEntityStoreSingles (per entity custom entity's)
  */
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/type.helpers.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/type.helpers.ts
new file mode 100644
index 0000000000..92ebfd5d1e
--- /dev/null
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/type.helpers.ts
@@ -0,0 +1,46 @@
+/**
+ * Remove keys such as typed indexes  (i.e. [key: string])
+ * For magic see
+ *  - https://github.com/Microsoft/TypeScript/issues/25987#issuecomment-441224690
+ *  - https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-414808995
+ */
+export type KnownKeys<T> = {
+  [K in keyof T]: string extends K ? never : number extends K ? never : K
+} extends { [_ in keyof T]: infer U } ? ({} extends U ? never : U) : never;
+
+export type NonOptionalKeys<T extends object> = Exclude<{
+  [K in keyof T]: T extends Record<K, T[K]>
+  ? K
+  : never
+}[keyof T], undefined>
+
+export type OptionalKeys<T extends object> = Exclude<{
+  [K in keyof T]: T extends Record<K, T[K]>
+  ? K
+  : never
+}[keyof T], undefined>
+
+export type NeverKeys<T extends object> = Exclude<{
+  [K in keyof T]: T[K] extends never
+  ? K
+  : never
+}[keyof T], undefined>
+
+/**
+ * Pick all properties who's function has the specified return type U
+ */
+export type FilteredByReturnType<T extends { [key: string]: (...args: any[]) => any }, U> = {
+  [P in keyof T]: ReturnType<T[P]> extends U ? T[P] : never
+};
+
+/**
+ * Pick all properties who's function do not have the specified return type U
+ */
+export type FilteredByNotReturnType<T extends { [key: string]: (...args: any[]) => any }, U> = {
+  [P in keyof T]: ReturnType<T[P]> extends U ? never : T[P]
+};
+
+// Note - Adding }[keyof T] to [P in keyof T] types should filter out properties of type `never`, however this fails with generics!
+export type FilteredByValueType<T extends { [key: string]: (...args: any[]) => any }, U> = {
+  [P in keyof T]: T[P] extends U ? never : T[P]
+};
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts
index 7f7a44f245..7b2a0f4c5a 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts
@@ -1,14 +1,13 @@
-import { endpointEntitySchema } from '../../../core/src/base-entity-schemas';
-import { BaseEndpointAuth } from '../../../core/src/features/endpoints/endpoint-auth';
 import {
   EndpointListDetailsComponent,
 } from '../../../core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers';
 import { EntitySchema } from '../helpers/entity-schema';
+import { endpointEntityType, stratosEntityFactory } from '../helpers/stratos-entity-factory';
 import { TestEntityCatalog } from './entity-catalog';
 import { StratosCatalogEndpointEntity, StratosCatalogEntity } from './entity-catalog-entity/entity-catalog-entity';
 import { EntityCatalogSchemas, IStratosEndpointDefinition } from './entity-catalog.types';
 
-describe('EntityCatalogService', () => {
+fdescribe('EntityCatalogService', () => {
   let entityCatalog: TestEntityCatalog;
   function getEndpointDefinition() {
     return {
@@ -18,7 +17,7 @@ describe('EntityCatalogService', () => {
       icon: 'cloud_foundry',
       iconFont: 'stratos-icons',
       logoUrl: '/core/assets/endpoint-icons/cloudfoundry.png',
-      authTypes: [BaseEndpointAuth.UsernamePassword, BaseEndpointAuth.SSO],
+      authTypes: [],
       listDetailsComponent: EndpointListDetailsComponent,
     } as IStratosEndpointDefinition;
   }
@@ -107,7 +106,7 @@ describe('EntityCatalogService', () => {
     expect(catalogEntity.definition).toEqual({
       ...endpoint,
       schema: {
-        default: endpointEntitySchema
+        default: stratosEntityFactory(endpointEntityType)
       }
     });
   });
@@ -124,9 +123,7 @@ describe('EntityCatalogService', () => {
       urlValidation: false,
       unConnectable: true,
       urlValidationRegexString: 'redjecks',
-      authTypes: [
-        BaseEndpointAuth.SSO
-      ]
+      authTypes: []
     };
     const definition = {
       ...endpoint,
@@ -141,7 +138,7 @@ describe('EntityCatalogService', () => {
       iconFont: 'stratos-icons',
       listDetailsComponent: EndpointListDetailsComponent,
       schema: {
-        default: endpointEntitySchema
+        default: stratosEntityFactory(endpointEntityType)
       },
       parentType: endpoint.type
     };
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
index c6371e3e17..5565256852 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
@@ -1,7 +1,7 @@
 import { Action } from '@ngrx/store';
 
-import { STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
 import { IRequestEntityTypeState } from '../app-state';
+import { STRATOS_ENDPOINT_TYPE } from '../helpers/stratos-entity-factory';
 import { ExtraApiReducers } from '../reducers/api-request-reducers.generator.helpers';
 import { ICurrentUserRolesState } from '../types/current-user-roles.types';
 import { OrchestratedActionBuilders } from './action-orchestrator/action-orchestrator';
@@ -218,10 +218,10 @@ class EntityCatalog {
               ...state.endpoints,
               [endpoint.type]: endpointState
             }
-          }
+          };
         }
       }
-    })
+    });
     return oneChanged ? {
       ...state
     } : state;
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
index 7f29f7a188..d8af7fe528 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
@@ -1,10 +1,6 @@
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
-import { EndpointHealthCheck } from '../../../core/endpoints-health-checks';
-import { EndpointAuthTypeConfig } from '../../../core/src/core/extension/extension-types';
-import { FavoritesConfigMapper } from '../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
-import { StratosStatus } from '../../../core/src/shared/shared.types';
 import { GeneralEntityAppState } from '../app-state';
 import {
   ApiErrorMessageHandler,
@@ -21,7 +17,11 @@ import {
 import {
   PaginationPageIteratorConfig,
 } from '../entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe';
+import { EndpointAuthTypeConfig } from '../extension-types';
+import { FavoritesConfigMapper } from '../favorite-config-mapper';
 import { EntitySchema } from '../helpers/entity-schema';
+import { EndpointModel } from '../types/endpoint.types';
+import { StratosStatus } from '../types/shared.types';
 import { UserFavorite } from '../types/user-favorites.types';
 
 export interface EntityCatalogEntityConfig {
@@ -97,6 +97,17 @@ export interface IStratosBaseEntityDefinition<T = EntitySchema | EntityCatalogSc
   readonly entitiesFetchHandler?: EntitiesFetchHandler;
 }
 
+export class EndpointHealthCheck {
+  /**
+   * @param check To show an error, the check should either call a WrapperRequestActionFailed
+   * or kick off a chain that eventually calls a WrapperRequestActionFailed
+   */
+  constructor(
+    public endpointType: string,
+    public check: (endpoint: EndpointModel) => void
+  ) { }
+}
+
 /**
  * Static information describing a stratos endpoint.
  *
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/endpoint-errors.handler.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/endpoint-errors.handler.ts
index 8b6fc07532..3f335ec3c5 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/endpoint-errors.handler.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/endpoint-errors.handler.ts
@@ -1,6 +1,6 @@
 import { SendEventAction } from '../../actions/internal-events.actions';
 import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity/entity-catalog-entity';
-import { endpointSchemaKey } from '../../helpers/entity-factory';
+import { endpointEntityType } from '../../helpers/stratos-entity-factory';
 import { ApiRequestTypes } from '../../reducers/api-request-reducer/request-helpers';
 import { InternalEventSeverity, InternalEventStateMetadata } from '../../types/internal-events.types';
 import { APISuccessOrFailedAction, EntityRequestAction } from '../../types/request.types';
@@ -28,7 +28,7 @@ export const endpointErrorsHandlerFactory = (actionDispatcher: ActionDispatcher)
       )
     );
     actionDispatcher(
-      new SendEventAction<InternalEventStateMetadata>(endpointSchemaKey, error.guid, {
+      new SendEventAction<InternalEventStateMetadata>(endpointEntityType, error.guid, {
         eventCode: error.errorCode,
         severity: InternalEventSeverity.ERROR,
         message: errorMessage,
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe.spec.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe.spec.ts
index 59e448d735..d82d9e77ed 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe.spec.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe.spec.ts
@@ -1,6 +1,6 @@
 import { of } from 'rxjs';
 
-import { JetStreamErrorResponse } from '../../../../core/src/jetstream.helpers';
+import { JetStreamErrorResponse } from '../../jetstream';
 import { JetstreamResponse } from '../entity-request-pipeline.types';
 import { handleJetstreamResponsePipeFactory, JetstreamError } from './handle-multi-endpoints.pipe';
 
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe.ts
index 8ae7a743b1..5be8e90170 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe.ts
@@ -1,8 +1,8 @@
-import { hasJetStreamError, JetStreamErrorResponse } from '../../../../core/src/jetstream.helpers';
+import { NonJetstreamRequestHandler } from '../../entity-catalog/entity-catalog.types';
+import { hasJetStreamError, JetStreamErrorResponse } from '../../jetstream';
 import { PagedJetstreamResponse } from '../entity-request-pipeline.types';
 import { PaginationPageIteratorConfig } from '../pagination-request-base-handlers/pagination-iterator.pipe';
 import { stratosEndpointGuidKey } from '../pipeline.types';
-import { NonJetstreamRequestHandler } from '../../entity-catalog/entity-catalog.types';
 
 /**
  * Generic container for information about an errored request to a specific endpoint
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/jetstream-error.handler.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/jetstream-error.handler.ts
index d68ddd27ab..5b504a93fa 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/jetstream-error.handler.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/jetstream-error.handler.ts
@@ -1,7 +1,7 @@
 import { SendEventAction } from '../../actions/internal-events.actions';
 import { RecursiveDeleteFailed } from '../../effects/recursive-entity-delete.effect';
 import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity/entity-catalog-entity';
-import { endpointSchemaKey } from '../../helpers/entity-factory';
+import { endpointEntityType } from '../../helpers/stratos-entity-factory';
 import { ApiRequestTypes, getFailApiRequestActions } from '../../reducers/api-request-reducer/request-helpers';
 import { GLOBAL_EVENT, InternalEventSeverity, InternalEventStateMetadata } from '../../types/internal-events.types';
 import { EntityRequestAction } from '../../types/request.types';
@@ -26,7 +26,7 @@ export function jetstreamErrorHandler(
   if (endpointString) {
     endpointIds.forEach(endpoint =>
       actionDispatcher(
-        new SendEventAction<InternalEventStateMetadata>(endpointSchemaKey, endpoint, {
+        new SendEventAction<InternalEventStateMetadata>(endpointEntityType, endpoint, {
           eventCode: error.status ? error.status + '' : '500',
           severity: InternalEventSeverity.ERROR,
           message: 'Jetstream API request error',
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.ts
index 2fbc4f3eda..661461c77f 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.ts
@@ -2,11 +2,11 @@ import { Action, Store } from '@ngrx/store';
 import { of } from 'rxjs';
 import { catchError, map, tap } from 'rxjs/operators';
 
-import { isHttpErrorResponse } from '../../../core/src/jetstream.helpers';
 import { AppState, InternalAppState } from '../app-state';
 import { RecursiveDelete } from '../effects/recursive-entity-delete.effect';
 import { entityCatalog } from '../entity-catalog/entity-catalog';
 import { StratosBaseCatalogEntity } from '../entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { isHttpErrorResponse } from '../jetstream';
 import { ApiRequestTypes, getRequestTypeFromMethod } from '../reducers/api-request-reducer/request-helpers';
 import { PaginatedAction } from '../types/pagination.types';
 import { EntityRequestAction } from '../types/request.types';
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
index 46e1d685cd..d32a05be26 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
@@ -2,13 +2,12 @@ import { HttpClient, HttpRequest } from '@angular/common/http';
 import { Action, Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
-import { LoggerService } from '../../../core/src/core/logger.service';
-import { JetStreamErrorResponse } from '../../../core/src/jetstream.helpers';
 import { AppState, GeneralEntityAppState, InternalAppState } from '../app-state';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
 } from '../entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { JetStreamErrorResponse } from '../jetstream';
 import { ApiRequestTypes } from '../reducers/api-request-reducer/request-helpers';
 import { EntityInfo, NormalizedResponse } from '../types/api.types';
 import { EndpointUser } from '../types/endpoint.types';
@@ -146,7 +145,6 @@ export interface EntityUserRolesEndpoint {
 export type EntityUserRolesFetch = (
   endpoints: string[] | EntityUserRolesEndpoint[],
   store: Store<AppState>,
-  logService: LoggerService,
   httpClient: HttpClient
 ) => Observable<boolean>;
 
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/pipline-http-client.service.ts b/src/frontend/packages/store/src/entity-request-pipeline/pipline-http-client.service.ts
index 863ac58cef..7690f07da1 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/pipline-http-client.service.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/pipline-http-client.service.ts
@@ -4,14 +4,12 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map, mergeMap } from 'rxjs/operators';
 
-import { environment } from '../../../core/src/environments/environment';
 import { InternalAppState } from '../app-state';
 import { StratosCatalogEndpointEntity } from '../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { IStratosEndpointDefinition } from '../entity-catalog/entity-catalog.types';
+import { cfAPIVersion, proxyAPIVersion } from '../jetstream';
 import { connectedEndpointsOfTypesSelector, endpointOfTypeSelector } from '../selectors/endpoint.selectors';
 
-const { proxyAPIVersion, cfAPIVersion } = environment;
-
 @Injectable()
 export class PipelineHttpClient {
 
diff --git a/src/frontend/packages/store/src/entity-service.spec.ts b/src/frontend/packages/store/src/entity-service.spec.ts
index e0e752ada8..ad52aab1fb 100644
--- a/src/frontend/packages/store/src/entity-service.spec.ts
+++ b/src/frontend/packages/store/src/entity-service.spec.ts
@@ -4,9 +4,6 @@ import { inject, TestBed } from '@angular/core/testing';
 import { Action, Store } from '@ngrx/store';
 import { filter, first, map, pairwise, tap } from 'rxjs/operators';
 
-import { STRATOS_ENDPOINT_TYPE } from '../../core/src/base-entity-schemas';
-import { ENTITY_SERVICE } from '../../core/src/shared/entity.tokens';
-import { generateTestEntityServiceProvider } from '../../core/test-framework/entity-service.helper';
 import { createEntityStore, TestStoreEntity } from '../testing/src/store-test-helper';
 import { APIResponse } from './actions/request.actions';
 import { GeneralAppState } from './app-state';
@@ -18,6 +15,7 @@ import { PipelineResult } from './entity-request-pipeline/entity-request-pipelin
 import { EntityService } from './entity-service';
 import { EntityServiceFactory } from './entity-service-factory.service';
 import { EntitySchema } from './helpers/entity-schema';
+import { STRATOS_ENDPOINT_TYPE } from './helpers/stratos-entity-factory';
 import { EntityMonitor } from './monitors/entity-monitor';
 import { EntityMonitorFactory } from './monitors/entity-monitor.factory.service';
 import { completeApiRequest, startApiRequest } from './reducers/api-request-reducer/request-helpers';
@@ -143,11 +141,6 @@ describe('EntityServiceService', () => {
       providers: [
         EntityServiceFactory,
         EntityMonitorFactory,
-        generateTestEntityServiceProvider(
-          action.guid,
-          entitySchema,
-          action
-        ),
         {
           provide: HttpXhrBackend,
           useClass: HttpTestingController
@@ -170,20 +163,6 @@ describe('EntityServiceService', () => {
     });
   });
 
-  it('should be created', inject([ENTITY_SERVICE], (service: EntityService) => {
-    expect(service).toBeTruthy();
-  }));
-
-  it('should poll', (done) => {
-    inject([ENTITY_SERVICE, HttpXhrBackend], (service: EntityService, mockBackend: HttpTestingController) => {
-      const sub = service.poll(1, '_root_').subscribe(a => {
-        sub.unsubscribe();
-        expect('polled once').toEqual('polled once');
-        done();
-      });
-    })();
-  });
-
   it('should get application', (done) => {
     inject([Store], (store: Store<GeneralAppState>) => {
       const guid = 'GUID123456789x';
diff --git a/src/frontend/packages/core/src/core/extension/extension-types.ts b/src/frontend/packages/store/src/extension-types.ts
similarity index 100%
rename from src/frontend/packages/core/src/core/extension/extension-types.ts
rename to src/frontend/packages/store/src/extension-types.ts
diff --git a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorite-config-mapper.ts b/src/frontend/packages/store/src/favorite-config-mapper.ts
similarity index 85%
rename from src/frontend/packages/core/src/shared/components/favorites-meta-card/favorite-config-mapper.ts
rename to src/frontend/packages/store/src/favorite-config-mapper.ts
index 94e4d2bbd6..8fa3cd6890 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorite-config-mapper.ts
+++ b/src/frontend/packages/store/src/favorite-config-mapper.ts
@@ -1,21 +1,14 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
-import {
-  StratosBaseCatalogEntity,
-} from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
-import { EntityCatalogHelpers } from '../../../../../store/src/entity-catalog/entity-catalog.helper';
-import { IEntityMetadata, IStratosEntityDefinition } from '../../../../../store/src/entity-catalog/entity-catalog.types';
-import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
-import { EntityRequestAction } from '../../../../../store/src/types/request.types';
-import {
-  IFavoriteMetadata,
-  IFavoriteTypeInfo,
-  UserFavorite,
-  UserFavoriteEndpoint,
-} from '../../../../../store/src/types/user-favorites.types';
-import { MetaCardMenuItem } from '../list/list-cards/meta-card/meta-card-base/meta-card.component';
+import { entityCatalog } from './entity-catalog/entity-catalog';
+import { StratosBaseCatalogEntity } from './entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { EntityCatalogHelpers } from './entity-catalog/entity-catalog.helper';
+import { IEntityMetadata, IStratosEntityDefinition } from './entity-catalog/entity-catalog.types';
+import { EndpointModel } from './types/endpoint.types';
+import { MenuItem } from './types/menu-item.types';
+import { EntityRequestAction } from './types/request.types';
+import { IFavoriteMetadata, IFavoriteTypeInfo, UserFavorite, UserFavoriteEndpoint } from './types/user-favorites.types';
 
 
 export interface IFavoriteTypes {
@@ -33,7 +26,7 @@ export interface IFavoritesMetaCardConfig {
   lines?: TFavoritesMetaCardLine[];
   routerLink?: string;
   name: string;
-  menuItems?: MetaCardMenuItem[];
+  menuItems?: MenuItem[];
 }
 
 export interface IFavoriteConfig<T, Q extends IFavoriteMetadata> {
@@ -167,13 +160,13 @@ export class FavoritesConfigMapper {
 
   public getFavoriteEndpointFromEntity(
     endpoint: EndpointModel
-  ) {
+  ): UserFavoriteEndpoint {
     return this.getFavoriteFromEntity(
       EntityCatalogHelpers.endpointType,
       endpoint.cnsi_type,
       endpoint.guid,
       endpoint
-    ) as UserFavoriteEndpoint;
+    );
   }
 
 }
diff --git a/src/frontend/packages/store/src/helpers/entity-factory.ts b/src/frontend/packages/store/src/helpers/entity-factory.ts
deleted file mode 100644
index c10311c3de..0000000000
--- a/src/frontend/packages/store/src/helpers/entity-factory.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { EntitySchema } from './entity-schema';
-
-export const userFavouritesSchemaKey = 'userFavorites';
-export const endpointSchemaKey = 'endpoint';
-export const userProfileSchemaKey = 'userProfile';
-export const systemInfoSchemaKey = 'system';
-
-const entityCache: {
-  [key: string]: EntitySchema
-} = {};
-
-// Note - The cache entry is added as a secondary step. This helps keep the child entity definition's clear and easier to spot circular
-// dependencies which would otherwise be hidden (if we assigned directly to entityCache and references via entityCache in other entities)
-const UserFavouritesSchema = new EntitySchema(userFavouritesSchemaKey, null, {}, { idAttribute: 'id' });
-entityCache[userFavouritesSchemaKey] = UserFavouritesSchema;
-
-const SystemInfoSchema = new EntitySchema(systemInfoSchemaKey, null, {}, { idAttribute: 'id' });
-entityCache[systemInfoSchemaKey] = SystemInfoSchema;
-
-const EndpointSchema = new EntitySchema(endpointSchemaKey, null, {}, { idAttribute: 'guid' });
-entityCache[endpointSchemaKey] = EndpointSchema;
-
-const UserProfileInfoSchema = new EntitySchema(userProfileSchemaKey, null, {}, { idAttribute: 'id' });
-entityCache[userProfileSchemaKey] = UserProfileInfoSchema;
-
-export function entityFactory(key: string): EntitySchema {
-  const entity = entityCache[key];
-  if (!entity) {
-    throw new Error(`Unknown entity schema type: ${key}`);
-  }
-  return entity;
-}
diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list.helpers.ts b/src/frontend/packages/store/src/helpers/local-list.helpers.ts
similarity index 86%
rename from src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list.helpers.ts
rename to src/frontend/packages/store/src/helpers/local-list.helpers.ts
index c84c1c7402..2810937aac 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list.helpers.ts
+++ b/src/frontend/packages/store/src/helpers/local-list.helpers.ts
@@ -1,5 +1,5 @@
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
-import { PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
+import { PaginationEntityState } from '../types/pagination.types';
 
 export class LocalPaginationHelpers {
 
diff --git a/src/frontend/packages/store/src/helpers/store-helpers.ts b/src/frontend/packages/store/src/helpers/store-helpers.ts
index 15f69e72db..cac7ba4e0a 100644
--- a/src/frontend/packages/store/src/helpers/store-helpers.ts
+++ b/src/frontend/packages/store/src/helpers/store-helpers.ts
@@ -2,11 +2,11 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { IFavoritesInfo } from '../../../core/src/core/user-favorite-manager';
 import { AppState } from '../app-state';
 import { MultiActionListEntity } from '../monitors/pagination-monitor';
 import { errorFetchingFavoritesSelector, fetchingFavoritesSelector } from '../selectors/favorite-groups.selectors';
 import { APIResource } from '../types/api.types';
+import { IFavoritesInfo } from '../types/user-favorites.types';
 
 
 export function getDashboardStateSessionId(username?: string) {
diff --git a/src/frontend/packages/store/src/helpers/stratos-entity-factory.ts b/src/frontend/packages/store/src/helpers/stratos-entity-factory.ts
new file mode 100644
index 0000000000..1182c576a3
--- /dev/null
+++ b/src/frontend/packages/store/src/helpers/stratos-entity-factory.ts
@@ -0,0 +1,40 @@
+import { EntitySchema } from './entity-schema';
+
+export const userFavouritesEntityType = 'userFavorites';
+export const endpointEntityType = 'endpoint';
+export const userProfileEntityType = 'userProfile';
+export const systemInfoEntityType = 'systemInfo';
+
+export const metricEntityType = 'metrics';
+
+export const STRATOS_ENDPOINT_TYPE = 'stratos';
+
+const entityCache: {
+  [key: string]: EntitySchema
+} = {};
+
+class StratosEntitySchema extends EntitySchema {
+  constructor(entityType: string, idAttribute: string) {
+    super(entityType, STRATOS_ENDPOINT_TYPE, {}, { idAttribute });
+  }
+}
+
+const UserFavouritesSchema = new StratosEntitySchema(userFavouritesEntityType, 'guid');
+entityCache[userFavouritesEntityType] = UserFavouritesSchema;
+
+const SystemInfoSchema = new StratosEntitySchema(systemInfoEntityType, 'guid');
+entityCache[systemInfoEntityType] = SystemInfoSchema;
+
+const EndpointSchema = new StratosEntitySchema(endpointEntityType, 'guid');
+entityCache[endpointEntityType] = EndpointSchema;
+
+const UserProfileInfoSchema = new StratosEntitySchema(userProfileEntityType, 'id');
+entityCache[userProfileEntityType] = UserProfileInfoSchema;
+
+export function stratosEntityFactory(key: string): EntitySchema {
+  const entity = entityCache[key];
+  if (!entity) {
+    throw new Error(`Unknown entity schema type: ${key}`);
+  }
+  return entity;
+}
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/jetstream.ts b/src/frontend/packages/store/src/jetstream.ts
new file mode 100644
index 0000000000..12477fabba
--- /dev/null
+++ b/src/frontend/packages/store/src/jetstream.ts
@@ -0,0 +1,78 @@
+import { HttpErrorResponse } from '@angular/common/http';
+
+// API Version to use when making back-end API requests to Jetstraam
+export const proxyAPIVersion = 'v1';
+
+// CF API Version
+export const cfAPIVersion = 'v2';
+
+/**
+ * Actual error response from stratos
+ */
+export interface JetStreamErrorResponse<T = any> {
+  error: {
+    status: string;
+    statusCode: number;
+  };
+  /**
+   * Actual response from proxied endpoint
+   */
+  errorResponse: T;
+}
+
+export function isHttpErrorResponse(obj: any): HttpErrorResponse {
+  const props = Object.keys(obj);
+  return (
+    props.indexOf('error') >= 0 &&
+    props.indexOf('headers') >= 0 &&
+    props.indexOf('ok') >= 0 &&
+    props.indexOf('status') >= 0 &&
+    props.indexOf('statusText') >= 0 &&
+    props.indexOf('url') >= 0
+  ) ? obj as HttpErrorResponse : null;
+}
+
+export function jetStreamErrorResponseToSafeString(response: JetStreamErrorResponse): string {
+  return response.error && response.error.status && response.error.statusCode ?
+    `${response.error.status}. Status Code ${response.error.statusCode}` :
+    null;
+}
+
+/**
+ * Attempt to create a sensible string explaining the error object returned from a failed http request
+ * @param err The raw error from a http request
+ */
+export function httpErrorResponseToSafeString(err: any): string {
+  const httpResponse: HttpErrorResponse = isHttpErrorResponse(err);
+  if (httpResponse) {
+    if (httpResponse.error) {
+      if (typeof (httpResponse.error) === 'string') {
+        return httpResponse.error + ` (${httpResponse.status})`;
+      }
+      return httpResponse.error.error + ` (${httpResponse.status})`;
+    }
+    return JSON.stringify(httpResponse.error) + ` (${httpResponse.status})`;
+  }
+  return err.message;
+}
+
+// TODO It would be nice if the BE could return a unique para for us to check for. #3827
+// There is always a chance that this will return a false positive (more so with extensions).
+export function hasJetStreamError(pages: Partial<JetStreamErrorResponse>[]): JetStreamErrorResponse {
+  if (!pages || !pages.length) {
+    return null;
+  }
+  return pages.find(page => {
+    return isJetstreamError(page);
+  }) as JetStreamErrorResponse;
+}
+
+function isJetstreamError(err: any): JetStreamErrorResponse {
+  return !!(
+    err &&
+    err.error &&
+    err.error.status &&
+    err.error.statusCode &&
+    'errorResponse' in err
+  ) ? err as JetStreamErrorResponse : null;
+}
diff --git a/src/frontend/packages/store/src/monitors/pagination-monitor.ts b/src/frontend/packages/store/src/monitors/pagination-monitor.ts
index a55f2910dd..c19b9db3da 100644
--- a/src/frontend/packages/store/src/monitors/pagination-monitor.ts
+++ b/src/frontend/packages/store/src/monitors/pagination-monitor.ts
@@ -14,14 +14,12 @@ import {
   withLatestFrom,
 } from 'rxjs/operators';
 
-import {
-  LocalPaginationHelpers,
-} from '../../../core/src/shared/components/list/data-sources-controllers/local-list.helpers';
 import { AppState, GeneralEntityAppState, GeneralRequestDataState } from '../app-state';
 import { entityCatalog } from '../entity-catalog/entity-catalog';
 import { StratosBaseCatalogEntity } from '../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { EntityCatalogEntityConfig } from '../entity-catalog/entity-catalog.types';
 import { EntitySchema } from '../helpers/entity-schema';
+import { LocalPaginationHelpers } from '../helpers/local-list.helpers';
 import { ActionState, ListActionState } from '../reducers/api-request-reducer/types';
 import { getCurrentPageRequestInfo } from '../reducers/pagination-reducer/pagination-reducer.types';
 import { getAPIRequestDataState, selectEntities } from '../selectors/api.selectors';
diff --git a/src/frontend/packages/store/src/public-api.ts b/src/frontend/packages/store/src/public-api.ts
index ac373eccf4..1b1787baef 100644
--- a/src/frontend/packages/store/src/public-api.ts
+++ b/src/frontend/packages/store/src/public-api.ts
@@ -4,3 +4,6 @@
 
  // Helpers
  export * from './helpers/store-helpers';
+
+ // App State
+ export { AppState } from './app-state';
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/reducers.module.ts b/src/frontend/packages/store/src/reducers.module.ts
index 23054fd7fb..d5268b68bf 100644
--- a/src/frontend/packages/store/src/reducers.module.ts
+++ b/src/frontend/packages/store/src/reducers.module.ts
@@ -1,10 +1,7 @@
 import { NgModule } from '@angular/core';
 import { ActionReducer, ActionReducerMap, StoreModule } from '@ngrx/store';
-import { StoreDevtoolsModule } from '@ngrx/store-devtools';
-
 import { localStorageSync } from 'ngrx-store-localstorage';
 
-import { environment } from '../../core/src/environments/environment';
 import { getDashboardStateSessionId } from './helpers/store-helpers';
 import { actionHistoryReducer } from './reducers/action-history-reducer';
 import { requestReducer } from './reducers/api-request-reducers.generator';
@@ -71,29 +68,21 @@ export function localStorageSyncReducer(reducer: ActionReducer<any>): ActionRedu
 
   })(reducer);
 }
-const metaReducers = [localStorageSyncReducer];
 
-const storeModule = StoreModule.forRoot(
-  appReducers,
-  {
-    metaReducers,
-    runtimeChecks: {
-      strictStateImmutability: true,
-      strictActionImmutability: false
-    }
-  }
-);
-const imports = environment.production ? [
-  storeModule
-] : [
-    storeModule,
-    StoreDevtoolsModule.instrument({
-      maxAge: 100,
-      logOnly: !environment.production
-    })
-  ];
+const metaReducers = [localStorageSyncReducer];
 
 @NgModule({
-  imports
+  imports: [
+    StoreModule.forRoot(
+      appReducers,
+      {
+        metaReducers,
+        runtimeChecks: {
+          strictStateImmutability: true,
+          strictActionImmutability: false
+        }
+      }
+    )
+  ]
 })
 export class AppReducersModule { }
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/request-helpers.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/request-helpers.ts
index ae52213fd9..900140b12a 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducer/request-helpers.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducer/request-helpers.ts
@@ -1,6 +1,5 @@
 import { Store } from '@ngrx/store';
 
-import { pathGet } from '../../../../core/src/core/utils.service';
 import { APIResponse } from '../../actions/request.actions';
 import { BaseRequestState, GeneralAppState } from '../../app-state';
 import { BaseEntityRequestAction } from '../../entity-catalog/action-orchestrator/action-orchestrator';
@@ -82,7 +81,7 @@ export function createRequestStateFromResponse(
 export type ApiRequestTypes = 'fetch' | 'update' | 'create' | 'delete';
 
 export function getRequestTypeFromMethod(action: EntityRequestAction): ApiRequestTypes {
-  let method = pathGet('options.method', action);
+  let method = action.options ? action.options.method : undefined;
   if (typeof method === 'string') {
     method = method.toString().toLowerCase();
     if (method === 'post') {
diff --git a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.ts b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.ts
index 2a83934d21..ead7fd092e 100644
--- a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.ts
@@ -8,11 +8,10 @@ import {
   UNREGISTER_ENDPOINTS_SUCCESS,
 } from '../../actions/endpoint.actions';
 import { AddRecentlyVisitedEntityAction, SetRecentlyVisitedEntityAction } from '../../actions/recently-visited.actions';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
+import { endpointEntityType, STRATOS_ENDPOINT_TYPE } from '../../helpers/stratos-entity-factory';
 import { IRecentlyVisitedState } from '../../types/recently-visited.types';
 import { addNewHit, cleanRecentsList, getDefaultRecentState } from './recently-visited.reducer.helpers';
-import { entityCatalog } from '../../entity-catalog/entity-catalog';
-import { STRATOS_ENDPOINT_TYPE } from '../../../../core/src/base-entity-schemas';
-import { endpointSchemaKey } from '../../helpers/entity-factory';
 
 export function recentlyVisitedReducer(
   state: IRecentlyVisitedState = getDefaultRecentState(),
@@ -36,7 +35,7 @@ export function recentlyVisitedReducer(
       return cleanRecentsList(state, [removeEndpointAction.guid]);
     case GET_ENDPOINTS_SUCCESS:
       const getAllAction = action as GetAllEndpointsSuccess;
-      const endpointKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
+      const endpointKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointEntityType);
       const connectedIds = Object.values(getAllAction.payload.entities[endpointKey]).reduce((ids, endpoint) => {
         if (endpoint.user) {
           ids.push(endpoint.guid);
diff --git a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/user-favorites-groups.reducer.spec.ts b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/user-favorites-groups.reducer.spec.ts
index 0532f4a44d..3afec96484 100644
--- a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/user-favorites-groups.reducer.spec.ts
+++ b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/user-favorites-groups.reducer.spec.ts
@@ -1,13 +1,13 @@
-import { deriveEndpointFavoriteFromFavorite } from '../../../../core/src/core/user-favorite-helpers';
 import {
   GetUserFavoritesAction,
   GetUserFavoritesFailedAction,
   GetUserFavoritesSuccessAction,
-} from '../../actions/user-favourites-actions/get-user-favorites-action';
-import { RemoveUserFavoriteSuccessAction } from '../../actions/user-favourites-actions/remove-user-favorite-action';
-import { SaveUserFavoriteSuccessAction } from '../../actions/user-favourites-actions/save-user-favorite-action';
+  RemoveUserFavoriteSuccessAction,
+  SaveUserFavoriteSuccessAction,
+} from '../../actions/user-favourites.actions';
 import { getDefaultFavoriteGroupsState, IUserFavoritesGroupsState } from '../../types/favorite-groups.types';
 import { IEndpointFavMetadata, UserFavorite } from '../../types/user-favorites.types';
+import { deriveEndpointFavoriteFromFavorite } from '../../user-favorite-helpers';
 import { userFavoriteGroupsReducer } from './user-favorites-groups.reducer';
 
 const endpointFavorite = () => new UserFavorite<IEndpointFavMetadata>(
diff --git a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/user-favorites-groups.reducer.ts b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/user-favorites-groups.reducer.ts
index 342c061f47..463b41c655 100644
--- a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/user-favorites-groups.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/user-favorites-groups.reducer.ts
@@ -1,13 +1,12 @@
 import { Action } from '@ngrx/store';
 
-import { deriveEndpointFavoriteFromFavorite, isEndpointTypeFavorite } from '../../../../core/src/core/user-favorite-helpers';
 import {
   GetUserFavoritesAction,
   GetUserFavoritesFailedAction,
   GetUserFavoritesSuccessAction,
-} from '../../actions/user-favourites-actions/get-user-favorites-action';
-import { RemoveUserFavoriteSuccessAction } from '../../actions/user-favourites-actions/remove-user-favorite-action';
-import { SaveUserFavoriteSuccessAction } from '../../actions/user-favourites-actions/save-user-favorite-action';
+  RemoveUserFavoriteSuccessAction,
+  SaveUserFavoriteSuccessAction,
+} from '../../actions/user-favourites.actions';
 import {
   getDefaultFavoriteGroup,
   getDefaultFavoriteGroupsState,
@@ -16,6 +15,7 @@ import {
   IUserFavoritesGroupsState,
 } from '../../types/favorite-groups.types';
 import { IFavoriteMetadata, UserFavorite } from '../../types/user-favorites.types';
+import { deriveEndpointFavoriteFromFavorite, isEndpointTypeFavorite } from '../../user-favorite-helpers';
 
 export function userFavoriteGroupsReducer(
   state: IUserFavoritesGroupsState = getDefaultFavoriteGroupsState(),
diff --git a/src/frontend/packages/store/src/reducers/endpoints.reducer.ts b/src/frontend/packages/store/src/reducers/endpoints.reducer.ts
index 1a5796c694..662f1c0ebb 100644
--- a/src/frontend/packages/store/src/reducers/endpoints.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/endpoints.reducer.ts
@@ -1,11 +1,14 @@
 import { GET_ENDPOINTS, GET_ENDPOINTS_FAILED, GET_ENDPOINTS_SUCCESS } from '../actions/endpoint.actions';
 import { EndpointState } from '../types/endpoint.types';
 
-export function endpointsReducer(state: EndpointState = {
-  loading: false,
-  error: false,
-  message: ''
-},                               action): EndpointState {
+export function endpointsReducer(
+  state: EndpointState = {
+    loading: false,
+    error: false,
+    message: ''
+  },
+  action
+): EndpointState {
   switch (action.type) {
     case GET_ENDPOINTS:
       return { ...state, loading: true, message: '', error: false };
diff --git a/src/frontend/packages/store/src/reducers/favorite.reducer.ts b/src/frontend/packages/store/src/reducers/favorite.reducer.ts
index 31165eb6bd..04a98983be 100644
--- a/src/frontend/packages/store/src/reducers/favorite.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/favorite.reducer.ts
@@ -1,8 +1,8 @@
-import { RemoveUserFavoriteSuccessAction } from '../actions/user-favourites-actions/remove-user-favorite-action';
-import { SaveUserFavoriteSuccessAction } from '../actions/user-favourites-actions/save-user-favorite-action';
 import {
+  RemoveUserFavoriteSuccessAction,
+  SaveUserFavoriteSuccessAction,
   UpdateUserFavoriteMetadataSuccessAction,
-} from '../actions/user-favourites-actions/update-user-favorite-metadata-action';
+} from '../actions/user-favourites.actions';
 import { IRequestEntityTypeState } from '../app-state';
 import { IFavoriteMetadata, UserFavorite } from '../types/user-favorites.types';
 
@@ -27,7 +27,7 @@ export function deleteUserFavoriteMetadataReducer(
 ): IRequestEntityTypeState<UserFavorite<IFavoriteMetadata>> {
   if (action.type === RemoveUserFavoriteSuccessAction.ACTION_TYPE) {
     const {
-      [action.favorite.guid]: deletedFavorite,
+      [action.guid]: deletedFavorite,
       ...newState
     } = state;
     return newState;
diff --git a/src/frontend/packages/store/src/reducers/internal-events.reducer.ts b/src/frontend/packages/store/src/reducers/internal-events.reducer.ts
index c6b2a9ec59..277e067439 100644
--- a/src/frontend/packages/store/src/reducers/internal-events.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/internal-events.reducer.ts
@@ -1,27 +1,27 @@
-import { UPDATE_ENDPOINT_SUCCESS } from './../actions/endpoint.actions';
 import { Action } from '@ngrx/store';
 
+import {
+  CONNECT_ENDPOINTS_SUCCESS,
+  DISCONNECT_ENDPOINTS_SUCCESS,
+  DisconnectEndpoint,
+  UNREGISTER_ENDPOINTS_SUCCESS,
+} from '../actions/endpoint.actions';
 import { SendClearEndpointEventsAction, SendClearEventAction, SendEventAction } from '../actions/internal-events.actions';
+import { endpointEntityType } from '../helpers/stratos-entity-factory';
 import {
+  CLEAR_ENDPOINT_ERROR_EVENTS,
   CLEAR_EVENTS,
   GLOBAL_EVENT,
   InternalEventsState,
   InternalEventState,
   SEND_EVENT,
-  CLEAR_ENDPOINT_ERROR_EVENTS,
 } from '../types/internal-events.types';
-import { endpointSchemaKey } from './../helpers/entity-factory';
-import {
-  DISCONNECT_ENDPOINTS_SUCCESS,
-  DisconnectEndpoint,
-  UNREGISTER_ENDPOINTS_SUCCESS,
-  CONNECT_ENDPOINTS_SUCCESS
-} from '../actions/endpoint.actions';
+import { UPDATE_ENDPOINT_SUCCESS } from './../actions/endpoint.actions';
 
 const defaultState: InternalEventsState = {
   types: {
     [GLOBAL_EVENT]: {},
-    [endpointSchemaKey]: {}
+    [endpointEntityType]: {}
   }
 };
 
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-clear-pagination-type.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-clear-pagination-type.ts
index 61cc841a8a..aaf5dafbaf 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-clear-pagination-type.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-clear-pagination-type.ts
@@ -1,4 +1,4 @@
-import { EndpointAction } from '../../actions/endpoint.actions';
+import { EndpointActionComplete } from '../../actions/endpoint.actions';
 import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { PaginationState } from '../../types/pagination.types';
 import { getDefaultPaginationEntityState } from './pagination-reducer-reset-pagination';
@@ -23,7 +23,7 @@ export function paginationClearAllTypes(state: PaginationState, entityKeys: stri
   }, state);
 }
 
-export function clearEndpointEntities(state: PaginationState, action: EndpointAction) {
+export function clearEndpointEntities(state: PaginationState, action: EndpointActionComplete) {
   const entityKeys = entityCatalog.getAllEntitiesForEndpointType(action.endpointType).map(entity => entity.entityKey);
   if (entityKeys.length > 0) {
     return paginationClearAllTypes(
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-create-pagination.spec.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-create-pagination.spec.ts
index d9c0465284..047f677ad6 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-create-pagination.spec.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-create-pagination.spec.ts
@@ -1,5 +1,5 @@
-import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { CreatePagination } from '../../actions/pagination.actions';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { PaginationState } from '../../types/pagination.types';
 import { createNewPaginationSection } from './pagination-reducer-create-pagination';
 import { getDefaultPaginationEntityState } from './pagination-reducer-reset-pagination';
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-max-reached.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-max-reached.ts
index 3d8080a705..906dc3fbe7 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-max-reached.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-max-reached.ts
@@ -1,8 +1,6 @@
-import {
-  LocalPaginationHelpers,
-} from '../../../../core/src/shared/components/list/data-sources-controllers/local-list.helpers';
 import { IgnorePaginationMaxedState, UpdatePaginationMaxedState } from '../../actions/pagination.actions';
 import { entityCatalog } from '../../entity-catalog/entity-catalog';
+import { LocalPaginationHelpers } from '../../helpers/local-list.helpers';
 import { PaginationEntityTypeState, PaginationState } from '../../types/pagination.types';
 import { getDefaultPaginationEntityState } from './pagination-reducer-reset-pagination';
 
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
index 56a5e0bef4..427a184b21 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
@@ -12,7 +12,6 @@ import {
   tap,
 } from 'rxjs/operators';
 
-import { sortStringify } from '../../../../core/src/core/utils.service';
 import { SetInitialParams } from '../../actions/pagination.actions';
 import { AppState, GeneralEntityAppState } from '../../app-state';
 import { entityCatalog } from '../../entity-catalog/entity-catalog';
@@ -152,6 +151,14 @@ function paginationParamsString(params: PaginationParam): string {
   return sortStringify(clone);
 }
 
+
+function sortStringify(obj: { [key: string]: string | string[] | number }): string {
+  const keys = Object.keys(obj).sort();
+  return keys.reduce((res, key) => {
+    return res += `${key}-${obj[key]},`;
+  }, '');
+}
+
 function shouldFetchNonLocalList(pagination: PaginationEntityState): boolean {
   return !hasError(pagination) && !hasValidOrGettingPage(pagination);
 }
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.spec.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.spec.ts
index d3c48a2ad2..cd0fe5bc3b 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.spec.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.spec.ts
@@ -1,10 +1,10 @@
 import { HttpRequest } from '@angular/common/http';
 
-import { ENDPOINT_TYPE, endpointEntitySchema, STRATOS_ENDPOINT_TYPE } from '../../../../core/src/base-entity-schemas';
 import { RequestTypes } from '../../actions/request.actions';
 import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { EntityCatalogHelpers } from '../../entity-catalog/entity-catalog.helper';
 import { EntitySchema } from '../../helpers/entity-schema';
+import { endpointEntityType, STRATOS_ENDPOINT_TYPE, stratosEntityFactory } from '../../helpers/stratos-entity-factory';
 import { PaginatedAction } from '../../types/pagination.types';
 import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from '../../types/request.types';
 import { createPaginationReducer } from './pagination.reducer';
@@ -20,8 +20,8 @@ function getReducer() {
 class MockPagAction implements PaginatedAction {
   actions = ['ONE', 'TWO', 'THREE'];
   options = new HttpRequest('GET', 'fake123');
-  entity = endpointEntitySchema;
-  entityType = ENDPOINT_TYPE;
+  entity = stratosEntityFactory(endpointEntityType);
+  entityType = endpointEntityType;
   endpointType = STRATOS_ENDPOINT_TYPE;
   paginationKey = 'PaginationKey';
   type = RequestTypes.START;
diff --git a/src/frontend/packages/store/src/selectors/current-user-role.selectors.ts b/src/frontend/packages/store/src/selectors/current-user-role.selectors.ts
index 166767e168..b26832638a 100644
--- a/src/frontend/packages/store/src/selectors/current-user-role.selectors.ts
+++ b/src/frontend/packages/store/src/selectors/current-user-role.selectors.ts
@@ -1,11 +1,10 @@
 import { compose } from '@ngrx/store';
 
-import { PermissionValues } from '../../../core/src/core/permissions/current-user-permissions.config';
-import { StratosScopeStrings } from '../../../core/src/core/permissions/stratos-user-permissions.checker';
 import { CurrentUserRolesAppState } from '../app-state';
 import { ICurrentUserRolesState, IStratosRolesState } from '../types/current-user-roles.types';
 import { UserScopeStrings } from '../types/endpoint.types';
 
+export type PermissionValues = string;
 
 export const selectCurrentUserRolesState = (state: CurrentUserRolesAppState) => state.currentUserRoles;
 
@@ -38,7 +37,7 @@ export const getCurrentUserStratosRole = (role: PermissionValues) => compose(
 
 // Top level stratos endpoint scopes
 // ============================
-export const getCurrentUserStratosHasScope = (scope: StratosScopeStrings) => compose(
+export const getCurrentUserStratosHasScope = (scope: UserScopeStrings) => compose(
   selectCurrentUserGlobalHasScopes(scope),
   selectCurrentUserStratosScopesState,
   getCurrentUserStratosRolesState
diff --git a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
index 2846302148..9f64ad9b11 100644
--- a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
+++ b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
@@ -1,9 +1,8 @@
 import { compose } from '@ngrx/store';
 
-import { STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
 import { InternalAppState, IRequestEntityTypeState } from '../app-state';
 import { EntityCatalogHelpers } from '../entity-catalog/entity-catalog.helper';
-import { endpointSchemaKey } from '../helpers/entity-factory';
+import { endpointEntityType, STRATOS_ENDPOINT_TYPE } from '../helpers/stratos-entity-factory';
 import { EndpointModel, EndpointState } from '../types/endpoint.types';
 import { selectEntities, selectEntity, selectRequestInfo } from './api.selectors';
 
@@ -12,7 +11,7 @@ export const endpointStatusSelector = (state: InternalAppState): EndpointState =
 
 // All endpoint request data
 // Note - Replacing `buildEntityKey` with `entityCatalog.getEntityKey` will cause circular dependency
-const endpointEntityKey = EntityCatalogHelpers.buildEntityKey(endpointSchemaKey, STRATOS_ENDPOINT_TYPE);
+const endpointEntityKey = EntityCatalogHelpers.buildEntityKey(endpointEntityType, STRATOS_ENDPOINT_TYPE);
 export const endpointEntitiesSelector = selectEntities<EndpointModel>(endpointEntityKey);
 
 export const endpointOfType = (type: string) =>
diff --git a/src/frontend/packages/store/src/selectors/favorite-groups.selectors.ts b/src/frontend/packages/store/src/selectors/favorite-groups.selectors.ts
index a1b3158b2e..12139d6f78 100644
--- a/src/frontend/packages/store/src/selectors/favorite-groups.selectors.ts
+++ b/src/frontend/packages/store/src/selectors/favorite-groups.selectors.ts
@@ -1,13 +1,13 @@
 import { compose } from '@ngrx/store';
 
-import { STRATOS_ENDPOINT_TYPE, userFavoritesEntitySchema } from '../../../core/src/base-entity-schemas';
-import { deriveEndpointFavoriteFromFavorite } from '../../../core/src/core/user-favorite-helpers';
 import { InternalAppState, IRequestEntityTypeState } from '../app-state';
 import { entityCatalog } from '../entity-catalog/entity-catalog';
+import { STRATOS_ENDPOINT_TYPE, userFavouritesEntityType } from '../helpers/stratos-entity-factory';
 import { IUserFavoriteGroup, IUserFavoritesGroups, IUserFavoritesGroupsState } from '../types/favorite-groups.types';
 import { IFavoriteMetadata, UserFavorite } from '../types/user-favorites.types';
+import { deriveEndpointFavoriteFromFavorite } from '../user-favorite-helpers';
 
-const favoritesEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, userFavoritesEntitySchema.entityType);
+const favoritesEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, userFavouritesEntityType);
 
 export const favoriteEntitiesSelector = (state: InternalAppState):
   IRequestEntityTypeState<UserFavorite<IFavoriteMetadata>> => state.requestData[favoritesEntityKey];
diff --git a/src/frontend/packages/store/src/store.module.ts b/src/frontend/packages/store/src/store.module.ts
index d66eb95791..794355dc3a 100644
--- a/src/frontend/packages/store/src/store.module.ts
+++ b/src/frontend/packages/store/src/store.module.ts
@@ -14,7 +14,6 @@ import { PermissionsEffects } from './effects/permissions.effect';
 import { RecursiveDeleteEffect } from './effects/recursive-entity-delete.effect';
 import { RouterEffect } from './effects/router.effects';
 import { SetClientFilterEffect } from './effects/set-client-filter.effect';
-import { SnackBarEffects } from './effects/snackBar.effects';
 import { SystemEffects } from './effects/system.effects';
 import { UAASetupEffect } from './effects/uaa-setup.effects';
 import { UserFavoritesEffect } from './effects/user-favorites-effect';
@@ -41,7 +40,6 @@ import { AppReducersModule } from './reducers.module';
       ActionHistoryEffect,
       RouterEffect,
       SystemEffects,
-      SnackBarEffects,
       SetClientFilterEffect,
       MetricsEffect,
       UserProfileEffect,
diff --git a/src/frontend/packages/store/src/stratos-action-builders.ts b/src/frontend/packages/store/src/stratos-action-builders.ts
new file mode 100644
index 0000000000..c64a95cd01
--- /dev/null
+++ b/src/frontend/packages/store/src/stratos-action-builders.ts
@@ -0,0 +1,198 @@
+import {
+  AuthParams,
+  BaseEndpointAction,
+  ConnectEndpoint,
+  DisconnectEndpoint,
+  GetAllEndpoints,
+  GetEndpoint,
+  RegisterEndpoint,
+  UnregisterEndpoint,
+  UpdateEndpoint,
+} from './actions/endpoint.actions';
+import { GetSystemInfo } from './actions/system.actions';
+import {
+  GetUserFavoritesAction,
+  RemoveUserFavoriteAction,
+  SaveUserFavoriteAction,
+  ToggleUserFavoriteAction,
+  UpdateUserFavoriteMetadataAction,
+} from './actions/user-favourites.actions';
+import { FetchUserProfileAction, UpdateUserPasswordAction, UpdateUserProfileAction } from './actions/user-profile.actions';
+import { OrchestratedActionBuilders } from './entity-catalog/action-orchestrator/action-orchestrator';
+import { EndpointType } from './extension-types';
+import { IFavoriteMetadata, UserFavorite } from './types/user-favorites.types';
+import { UserProfileInfo, UserProfilePasswordUpdate } from './types/user-profile.types';
+
+export interface EndpointActionBuilder extends OrchestratedActionBuilders {
+  get: (
+    guid: string,
+  ) => GetEndpoint,
+  getAll: (
+    login?: boolean,
+  ) => GetAllEndpoints,
+  getMultiple: (
+    endpointGuid?: string,
+    paginationKey?: string,
+    args?: { login: boolean }
+  ) => GetAllEndpoints,
+  connect: (
+    guid: string,
+    endpointType: EndpointType,
+    authType: string,
+    authValues: AuthParams,
+    systemShared: boolean,
+    body: string,
+  ) => ConnectEndpoint,
+  disconnect: (
+    guid: string,
+    endpointType: EndpointType,
+  ) => DisconnectEndpoint,
+  unregister: (
+    guid: string,
+    endpointType: EndpointType,
+  ) => UnregisterEndpoint,
+  register: (
+    endpointType: EndpointType,
+    endpointSubType: string,
+    name: string,
+    endpoint: string,
+    skipSslValidation: boolean,
+    clientID?: string,
+    clientSecret?: string,
+    ssoAllowed?: boolean,
+  ) => RegisterEndpoint,
+  update: (
+    guid: string,
+    endpointGuid: string,
+    args: {
+      endpointType: EndpointType,
+      id: string,
+      name: string,
+      skipSSL: boolean,
+      setClientInfo: boolean,
+      clientID: string,
+      clientSecret: string,
+      allowSSO: boolean,
+    }
+  ) => UpdateEndpoint,
+}
+
+export const endpointActionBuilder: EndpointActionBuilder = {
+  get: (guid: string) => new GetEndpoint(guid),
+  getAll: (login: boolean) => new GetAllEndpoints(login),
+  getMultiple: (
+    endpointGuid?: string,
+    paginationKey?: string,
+    args?: { login: boolean }
+  ) => new GetAllEndpoints(args ? args.login : false),
+  connect: (
+    guid: string,
+    endpointType: EndpointType,
+    authType: string,
+    authValues: AuthParams,
+    systemShared: boolean,
+    body: string,
+  ) => new ConnectEndpoint(guid, endpointType, authType, authValues, systemShared, body),
+  disconnect: (guid: string, endpointType: EndpointType) => new DisconnectEndpoint(guid, endpointType),
+  unregister: (guid: string, endpointType: EndpointType) => new UnregisterEndpoint(guid, endpointType),
+  register: (
+    endpointType: EndpointType,
+    endpointSubType: string,
+    name: string,
+    endpoint: string,
+    skipSslValidation: boolean,
+    clientID?: string,
+    clientSecret?: string,
+    ssoAllowed?: boolean,
+  ) => new RegisterEndpoint(
+    endpointType,
+    endpointSubType,
+    name,
+    endpoint,
+    skipSslValidation,
+    clientID,
+    clientSecret,
+    ssoAllowed,
+  ),
+  update: (
+    guid: string,
+    endpointGuid: string,
+    args: {
+      endpointType: EndpointType,
+      // id: string,
+      name: string,
+      skipSSL: boolean,
+      setClientInfo: boolean,
+      clientID: string,
+      clientSecret: string,
+      allowSSO: boolean,
+    }
+  ) => new UpdateEndpoint(
+    args.endpointType,
+    guid,
+    args.name,
+    args.skipSSL,
+    args.setClientInfo,
+    args.clientID,
+    args.clientSecret,
+    args.allowSSO
+  ),
+}
+
+export interface SystemInfoActionBuilder extends OrchestratedActionBuilders {
+  getSystemInfo: (
+    login?: boolean,
+    associatedAction?: BaseEndpointAction
+  ) => GetSystemInfo
+}
+export const systemInfoActionBuilder: SystemInfoActionBuilder = {
+  getSystemInfo: (
+    login?: false,
+    associatedAction?: BaseEndpointAction
+  ) => new GetSystemInfo(login, associatedAction)
+}
+
+export interface UserFavoriteActionBuilder extends OrchestratedActionBuilders {
+  getMultiple: () => GetUserFavoritesAction,
+  getAll: () => GetUserFavoritesAction,
+  delete: (
+    favorite: UserFavorite<IFavoriteMetadata>
+  ) => RemoveUserFavoriteAction,
+  save: (
+    favorite: UserFavorite<IFavoriteMetadata>
+  ) => SaveUserFavoriteAction,
+  toggle: (
+    favorite: UserFavorite<IFavoriteMetadata>
+  ) => ToggleUserFavoriteAction
+  updateFavorite: (
+    favorite: UserFavorite<IFavoriteMetadata>
+  ) => UpdateUserFavoriteMetadataAction
+}
+
+export const userFavoriteActionBuilder: UserFavoriteActionBuilder = {
+  getMultiple: () => new GetUserFavoritesAction(),
+  getAll: () => new GetUserFavoritesAction(),
+  delete: (favorite: UserFavorite<IFavoriteMetadata>) => new RemoveUserFavoriteAction(favorite),
+  save: (favorite: UserFavorite<IFavoriteMetadata>) => new SaveUserFavoriteAction(favorite),
+  toggle: (favorite: UserFavorite<IFavoriteMetadata>) => new ToggleUserFavoriteAction(favorite),
+  updateFavorite: (favorite: UserFavorite<IFavoriteMetadata>) => new UpdateUserFavoriteMetadataAction(favorite)
+}
+
+export interface UserProfileActionBuilder extends OrchestratedActionBuilders {
+  get: (
+    userGuid: string
+  ) => FetchUserProfileAction
+  updateProfile: (
+    profile: UserProfileInfo,
+    password: string
+  ) => UpdateUserProfileAction
+  updatePassword: (
+    guid: string,
+    passwordChanges: UserProfilePasswordUpdate
+  ) => UpdateUserPasswordAction
+}
+export const userProfileActionBuilder: UserProfileActionBuilder = {
+  get: (userGuid: string) => new FetchUserProfileAction(userGuid),
+  updateProfile: (profile: UserProfileInfo, password: string) => new UpdateUserProfileAction(profile, password),
+  updatePassword: (guid: string, passwordChanges: UserProfilePasswordUpdate) => new UpdateUserPasswordAction(guid, passwordChanges)
+}
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/stratos-entity-catalog.ts b/src/frontend/packages/store/src/stratos-entity-catalog.ts
new file mode 100644
index 0000000000..9237a16978
--- /dev/null
+++ b/src/frontend/packages/store/src/stratos-entity-catalog.ts
@@ -0,0 +1,45 @@
+import {
+  StratosCatalogEndpointEntity,
+  StratosCatalogEntity,
+} from './entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import {
+  EndpointActionBuilder,
+  SystemInfoActionBuilder,
+  UserFavoriteActionBuilder,
+  UserProfileActionBuilder,
+} from './stratos-action-builders';
+import { EndpointModel } from './types/endpoint.types';
+import { SystemInfo } from './types/system.types';
+import { UserFavorite } from './types/user-favorites.types';
+import { UserProfileInfo } from './types/user-profile.types';
+
+export class StratosEntityCatalog {
+  endpoint: StratosCatalogEntity<
+    undefined,
+    EndpointModel,
+    EndpointActionBuilder
+  >
+
+  systemInfo: StratosCatalogEntity<
+    undefined,
+    SystemInfo,
+    SystemInfoActionBuilder
+  >
+
+  userFavorite: StratosCatalogEntity<
+    undefined,
+    UserFavorite,
+    UserFavoriteActionBuilder
+  >
+
+  userProfile: StratosCatalogEntity<
+    undefined,
+    UserProfileInfo,
+    UserProfileActionBuilder
+  >
+
+  metricsEndpoint: StratosCatalogEndpointEntity;
+}
+
+export const stratosEntityCatalog = new StratosEntityCatalog();
+
diff --git a/src/frontend/packages/store/src/stratos-entity-generator.ts b/src/frontend/packages/store/src/stratos-entity-generator.ts
new file mode 100644
index 0000000000..0062f4fc4a
--- /dev/null
+++ b/src/frontend/packages/store/src/stratos-entity-generator.ts
@@ -0,0 +1,161 @@
+import { BaseEndpointAuth } from '../../core/src/core/endpoint-auth';
+import {
+  MetricsEndpointDetailsComponent,
+} from '../../core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component';
+import {
+  StratosBaseCatalogEntity,
+  StratosCatalogEndpointEntity,
+  StratosCatalogEntity,
+} from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import {
+  endpointEntityType,
+  STRATOS_ENDPOINT_TYPE,
+  stratosEntityFactory,
+  systemInfoEntityType,
+  userFavouritesEntityType,
+  userProfileEntityType,
+} from '../../store/src/helpers/stratos-entity-factory';
+import {
+  addOrUpdateUserFavoriteMetadataReducer,
+  deleteUserFavoriteMetadataReducer,
+} from '../../store/src/reducers/favorite.reducer';
+import { systemEndpointsReducer } from '../../store/src/reducers/system-endpoints.reducer';
+import { EndpointModel } from '../../store/src/types/endpoint.types';
+import { IStratosEntityDefinition } from './entity-catalog/entity-catalog.types';
+import {
+  EndpointActionBuilder,
+  endpointActionBuilder,
+  SystemInfoActionBuilder,
+  systemInfoActionBuilder,
+  UserFavoriteActionBuilder,
+  userFavoriteActionBuilder,
+  UserProfileActionBuilder,
+  userProfileActionBuilder,
+} from './stratos-action-builders';
+import { stratosEntityCatalog } from './stratos-entity-catalog';
+import { SystemInfo } from './types/system.types';
+import { UserFavorite } from './types/user-favorites.types';
+import { UserProfileInfo } from './types/user-profile.types';
+
+export function generateStratosEntities(): StratosBaseCatalogEntity[] {
+  /**
+   * This is used as a fake endpoint type to allow the store to be initiated correctly
+   */
+  const stratosType = {
+    logoUrl: '',
+    authTypes: [],
+    type: STRATOS_ENDPOINT_TYPE,
+    schema: null
+  }
+  return [
+    generateEndpoint(stratosType),
+    generateSystemInfo(stratosType),
+    generateUserFavorite(stratosType),
+    generateUserProfile(stratosType),
+    generateMetricsEndpoint()
+  ]
+}
+
+/**
+ * DefaultEndpointEntityType is used to represent a general endpoint
+ * This should not be used to actually attempt to render an endpoint and is instead used as a way to fill the
+ */
+function generateEndpoint(stratosType) {
+  const definition: IStratosEntityDefinition = {
+    schema: stratosEntityFactory(endpointEntityType),
+    type: endpointEntityType,
+    endpoint: stratosType,
+  }
+  stratosEntityCatalog.endpoint = new StratosCatalogEntity<
+    undefined,
+    EndpointModel,
+    EndpointActionBuilder
+  >(
+    definition,
+    {
+      dataReducers: [
+        systemEndpointsReducer
+      ],
+      actionBuilders: endpointActionBuilder
+    }
+  )
+  return stratosEntityCatalog.endpoint;
+}
+
+function generateSystemInfo(stratosType) {
+  const definition: IStratosEntityDefinition = {
+    schema: stratosEntityFactory(systemInfoEntityType),
+    type: systemInfoEntityType,
+    endpoint: stratosType,
+  }
+  stratosEntityCatalog.systemInfo = new StratosCatalogEntity<
+    undefined,
+    SystemInfo,
+    SystemInfoActionBuilder
+  >(
+    definition,
+    {
+      actionBuilders: systemInfoActionBuilder
+    }
+  )
+  return stratosEntityCatalog.systemInfo;
+}
+
+function generateUserFavorite(stratosType) {
+  const definition: IStratosEntityDefinition = {
+    schema: stratosEntityFactory(userFavouritesEntityType),
+    type: userFavouritesEntityType,
+    endpoint: stratosType,
+  }
+  stratosEntityCatalog.userFavorite = new StratosCatalogEntity<
+    undefined,
+    UserFavorite,
+    UserFavoriteActionBuilder
+  >(
+    definition,
+    {
+      dataReducers: [
+        addOrUpdateUserFavoriteMetadataReducer,
+        deleteUserFavoriteMetadataReducer,
+      ],
+      actionBuilders: userFavoriteActionBuilder
+    }
+  )
+  return stratosEntityCatalog.userFavorite;
+}
+
+function generateUserProfile(stratosType) {
+  const definition: IStratosEntityDefinition = {
+    schema: stratosEntityFactory(userProfileEntityType),
+    type: userProfileEntityType,
+    endpoint: stratosType,
+  }
+  stratosEntityCatalog.userProfile = new StratosCatalogEntity<
+    undefined,
+    UserProfileInfo,
+    UserProfileActionBuilder
+  >(
+    definition,
+    {
+      actionBuilders: userProfileActionBuilder
+    }
+  )
+  return stratosEntityCatalog.userProfile;
+}
+
+function generateMetricsEndpoint() {
+  // TODO: metrics location to be sorted - STRAT-152
+  stratosEntityCatalog.metricsEndpoint = new StratosCatalogEndpointEntity({
+    type: 'metrics',
+    label: 'Metrics',
+    labelPlural: 'Metrics',
+    tokenSharing: true,
+    logoUrl: '/core/assets/endpoint-icons/metrics.svg',
+    authTypes: [BaseEndpointAuth.UsernamePassword, BaseEndpointAuth.None],
+    renderPriority: 1,
+    listDetailsComponent: MetricsEndpointDetailsComponent,
+  },
+    metadata => `/endpoints/metrics/${metadata.guid}`
+  )
+  return stratosEntityCatalog.metricsEndpoint;
+}
diff --git a/src/frontend/packages/core/src/core/style.service.ts b/src/frontend/packages/store/src/style.service.ts
similarity index 100%
rename from src/frontend/packages/core/src/core/style.service.ts
rename to src/frontend/packages/store/src/style.service.ts
diff --git a/src/frontend/packages/core/src/core/theme.service.ts b/src/frontend/packages/store/src/theme.service.ts
similarity index 92%
rename from src/frontend/packages/core/src/core/theme.service.ts
rename to src/frontend/packages/store/src/theme.service.ts
index 2d8efab76a..0e140476b6 100644
--- a/src/frontend/packages/core/src/core/theme.service.ts
+++ b/src/frontend/packages/store/src/theme.service.ts
@@ -2,18 +2,13 @@ import { OverlayContainer } from '@angular/cdk/overlay';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { first, map, filter } from 'rxjs/operators';
+import { filter, first, map } from 'rxjs/operators';
 
-import { SetThemeAction } from '../../../store/src/actions/dashboard-actions';
-import { DashboardOnlyAppState } from '../../../store/src/app-state';
-import { selectDashboardState } from '../../../store/src/selectors/dashboard.selectors';
+import { SetThemeAction } from './actions/dashboard-actions';
+import { DashboardOnlyAppState } from './app-state';
+import { selectDashboardState } from './selectors/dashboard.selectors';
 import { StyleService } from './style.service';
-
-export interface StratosTheme {
-  key: string;
-  label: string;
-  styleName: string;
-}
+import { StratosTheme } from './types/theme.types';
 
 const lightTheme: StratosTheme = {
   key: 'default',
diff --git a/src/frontend/packages/store/src/types/auth.types.ts b/src/frontend/packages/store/src/types/auth.types.ts
index 5cf7e40f42..cef354d888 100644
--- a/src/frontend/packages/store/src/types/auth.types.ts
+++ b/src/frontend/packages/store/src/types/auth.types.ts
@@ -1,5 +1,3 @@
-import { StratosScopeStrings } from '../../../core/src/core/permissions/stratos-user-permissions.checker';
-
 export interface SessionDataEndpoint {
   guid: string;
   name: string;
@@ -11,7 +9,7 @@ export interface SessionUser {
   admin: boolean;
   guid: string;
   name: string;
-  scopes: StratosScopeStrings[];
+  scopes: string[];
 }
 export interface PluginConfig {
   userInvitationsEnabled: 'true' | 'false';
diff --git a/src/frontend/packages/store/src/types/base-metric.types.ts b/src/frontend/packages/store/src/types/base-metric.types.ts
index a281dbb974..0ad9c00358 100644
--- a/src/frontend/packages/store/src/types/base-metric.types.ts
+++ b/src/frontend/packages/store/src/types/base-metric.types.ts
@@ -1,5 +1,4 @@
 import { MetricQueryConfig } from '../actions/metrics.actions';
-import { MetricQueryType } from '../../../core/src/shared/services/metrics-range-selector.types';
 
 export enum MetricResultTypes {
   MATRIX = 'matrix',
diff --git a/src/frontend/packages/store/src/types/endpoint.types.ts b/src/frontend/packages/store/src/types/endpoint.types.ts
index 317c1aab7e..0cf7a86a6a 100644
--- a/src/frontend/packages/store/src/types/endpoint.types.ts
+++ b/src/frontend/packages/store/src/types/endpoint.types.ts
@@ -1,8 +1,5 @@
-import { EndpointType } from '../../../core/src/core/extension/extension-types';
-import { StratosScopeStrings } from '../../../core/src/core/permissions/stratos-user-permissions.checker';
 import { MetricsAPITargets, MetricsStratosInfo } from '../actions/metrics-api.actions';
-import { endpointSchemaKey } from '../helpers/entity-factory';
-import { RequestSectionKeys, TRequestTypeKeys } from '../reducers/api-request-reducer/types';
+import { EndpointType } from '../extension-types';
 
 export const endpointListKey = 'endpoint-list';
 export interface INewlyConnectedEndpointInfo {
@@ -13,14 +10,6 @@ export interface INewlyConnectedEndpointInfo {
   user: EndpointUser;
 }
 
-export const endpointStoreNames: {
-  section: TRequestTypeKeys,
-  type: string
-} = {
-  section: RequestSectionKeys.Other,
-  type: endpointSchemaKey
-};
-
 export interface IApiEndpointInfo {
   ForceQuery: boolean;
   Fragment: string;
@@ -63,7 +52,7 @@ export interface EndpointModel {
 
 export const SystemSharedUserGuid = '00000000-1111-2222-3333-444444444444';
 
-export type UserScopeStrings = string | StratosScopeStrings;
+export type UserScopeStrings = string;
 
 // Metadata for the user connected to an endpoint
 export interface EndpointUser {
diff --git a/src/frontend/packages/store/src/types/menu-item.types.ts b/src/frontend/packages/store/src/types/menu-item.types.ts
new file mode 100644
index 0000000000..bb55c8f11a
--- /dev/null
+++ b/src/frontend/packages/store/src/types/menu-item.types.ts
@@ -0,0 +1,11 @@
+import { Observable } from 'rxjs';
+
+
+export interface MenuItem {
+  icon?: string;
+  label: string;
+  action: () => void;
+  can?: Observable<boolean>;
+  disabled?: Observable<boolean>;
+  separator?: boolean;
+}
diff --git a/src/frontend/packages/store/src/types/metric.types.ts b/src/frontend/packages/store/src/types/metric.types.ts
index 3041f3f369..5bf57f1802 100644
--- a/src/frontend/packages/store/src/types/metric.types.ts
+++ b/src/frontend/packages/store/src/types/metric.types.ts
@@ -22,3 +22,8 @@ export interface IMetricCell {
   job: string;
   origin: string;
 }
+
+export enum MetricQueryType {
+  QUERY = 'query',
+  RANGE_QUERY = 'query_range'
+}
diff --git a/src/frontend/packages/core/src/shared/shared.types.ts b/src/frontend/packages/store/src/types/shared.types.ts
similarity index 79%
rename from src/frontend/packages/core/src/shared/shared.types.ts
rename to src/frontend/packages/store/src/types/shared.types.ts
index a3da5a1e89..a0d38a623e 100644
--- a/src/frontend/packages/core/src/shared/shared.types.ts
+++ b/src/frontend/packages/store/src/types/shared.types.ts
@@ -1,5 +1,5 @@
-import { AppState } from '../../../store/src/app-state';
-import { EntitySchema } from '../../../store/src/helpers/entity-schema';
+import { AppState } from '../app-state';
+import { EntitySchema } from '../helpers/entity-schema';
 
 
 export class ComponentEntityMonitorConfig {
diff --git a/src/frontend/packages/store/src/types/system.types.ts b/src/frontend/packages/store/src/types/system.types.ts
index 2e66f11a2f..a369b88217 100644
--- a/src/frontend/packages/store/src/types/system.types.ts
+++ b/src/frontend/packages/store/src/types/system.types.ts
@@ -1,6 +1,5 @@
-import { RequestSectionKeys, TRequestTypeKeys } from '../reducers/api-request-reducer/types';
-import { EndpointUser, EndpointModel } from './endpoint.types';
-import { entityFactory, systemInfoSchemaKey } from '../helpers/entity-factory';
+import { EndpointModel, EndpointUser } from './endpoint.types';
+
 export interface SystemInfo {
   version: {
     proxy_version: string,
@@ -13,11 +12,3 @@ export interface SystemInfo {
     }
   };
 }
-
-export const systemStoreNames: {
-  section: TRequestTypeKeys,
-  type: string
-} = {
-  section: RequestSectionKeys.Other,
-  type: entityFactory(systemInfoSchemaKey).entityType
-};
diff --git a/src/frontend/packages/store/src/types/theme.types.ts b/src/frontend/packages/store/src/types/theme.types.ts
new file mode 100644
index 0000000000..a31d01e5c3
--- /dev/null
+++ b/src/frontend/packages/store/src/types/theme.types.ts
@@ -0,0 +1,5 @@
+export interface StratosTheme {
+  key: string;
+  label: string;
+  styleName: string;
+}
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/types/user-favorite-manager.types.ts b/src/frontend/packages/store/src/types/user-favorite-manager.types.ts
new file mode 100644
index 0000000000..3b170661a2
--- /dev/null
+++ b/src/frontend/packages/store/src/types/user-favorite-manager.types.ts
@@ -0,0 +1,27 @@
+import { TFavoriteMapperFunction } from '../favorite-config-mapper';
+import { IEndpointFavMetadata, IFavoriteMetadata, UserFavorite } from './user-favorites.types';
+
+export interface IFavoriteEntity {
+  type: string;
+  prettyName: string;
+  cardMapper: TFavoriteMapperFunction<IFavoriteMetadata>;
+  favorite: UserFavorite<IFavoriteMetadata>;
+}
+
+export interface IGroupedFavorites {
+  endpoint: IHydrationResults<IEndpointFavMetadata>;
+  entities: IHydrationResults[];
+}
+
+export interface IAllFavorites {
+  fetching: boolean;
+  error: boolean;
+  entityGroups: IGroupedFavorites[];
+}
+
+export interface IHydrationResults<T extends IFavoriteMetadata = IFavoriteMetadata> {
+  type: string;
+  cardMapper: TFavoriteMapperFunction<any>;
+  prettyName: string;
+  favorite: UserFavorite<T>;
+}
diff --git a/src/frontend/packages/store/src/types/user-favorites.types.ts b/src/frontend/packages/store/src/types/user-favorites.types.ts
index 6dbd7c28fc..b92b043b41 100644
--- a/src/frontend/packages/store/src/types/user-favorites.types.ts
+++ b/src/frontend/packages/store/src/types/user-favorites.types.ts
@@ -1,8 +1,13 @@
 import { IEntityMetadata } from '../entity-catalog/entity-catalog.types';
-import { LoggerService } from '../../../core/src/core/logger.service';
 
 export const userFavoritesPaginationKey = 'userFavorites';
 
+
+export interface IFavoritesInfo {
+  fetching: boolean;
+  error: boolean;
+}
+
 /**
  * A user favorite blueprint. Can be used to fetch the full entity from a particular endpoint.
  */
@@ -76,10 +81,10 @@ export class UserFavorite<T extends IEntityMetadata = IEntityMetadata> implement
       .join(favoriteGuidSeparator);
   }
 
-  static getEntityGuidFromFavoriteGuid(favoriteGuid: string, logger: LoggerService): string {
+  static getEntityGuidFromFavoriteGuid(favoriteGuid: string): string {
     const parts = favoriteGuid.split(favoriteGuidSeparator);
     if (parts.length < 3) {
-      logger.error('Failed to determine entity guid from favorite guid: ', parts);
+      console.error('Failed to determine entity guid from favorite guid: ', parts);
       return null;
     } else if (parts.length === 3) {
       return favoriteGuid.split(favoriteGuidSeparator)[0];
diff --git a/src/frontend/packages/core/src/core/user-favorite-helpers.ts b/src/frontend/packages/store/src/user-favorite-helpers.ts
similarity index 75%
rename from src/frontend/packages/core/src/core/user-favorite-helpers.ts
rename to src/frontend/packages/store/src/user-favorite-helpers.ts
index 7a73600412..84f81be582 100644
--- a/src/frontend/packages/core/src/core/user-favorite-helpers.ts
+++ b/src/frontend/packages/store/src/user-favorite-helpers.ts
@@ -1,7 +1,7 @@
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
-import { IEntityMetadata } from '../../../store/src/entity-catalog/entity-catalog.types';
-import { IFavoriteMetadata, UserFavorite } from '../../../store/src/types/user-favorites.types';
-import { FavoritesConfigMapper } from '../shared/components/favorites-meta-card/favorite-config-mapper';
+import { entityCatalog } from './entity-catalog/entity-catalog';
+import { IEntityMetadata } from './entity-catalog/entity-catalog.types';
+import { FavoritesConfigMapper } from './favorite-config-mapper';
+import { IFavoriteMetadata, UserFavorite } from './types/user-favorites.types';
 
 export function isEndpointTypeFavorite(favorite: UserFavorite<IFavoriteMetadata>) {
   return !favorite.entityId;
diff --git a/src/frontend/packages/core/src/core/user-favorite-manager.ts b/src/frontend/packages/store/src/user-favorite-manager.ts
similarity index 71%
rename from src/frontend/packages/core/src/core/user-favorite-manager.ts
rename to src/frontend/packages/store/src/user-favorite-manager.ts
index 45e4fded8a..a1e0d211e6 100644
--- a/src/frontend/packages/core/src/core/user-favorite-manager.ts
+++ b/src/frontend/packages/store/src/user-favorite-manager.ts
@@ -3,62 +3,28 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of } from 'rxjs';
 import { filter, map, switchMap, tap } from 'rxjs/operators';
 
-import { ToggleUserFavoriteAction } from '../../../store/src/actions/user-favourites-actions/toggle-user-favorite-action';
-import { GeneralEntityAppState, IRequestEntityTypeState } from '../../../store/src/app-state';
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
-import { endpointEntitiesSelector } from '../../../store/src/selectors/endpoint.selectors';
+import { GeneralEntityAppState, IRequestEntityTypeState } from './app-state';
+import { entityCatalog } from './entity-catalog/entity-catalog';
+import { FavoritesConfigMapper } from './favorite-config-mapper';
+import { endpointEntitiesSelector } from './selectors/endpoint.selectors';
 import {
   errorFetchingFavoritesSelector,
   favoriteEntitiesSelector,
   favoriteGroupsSelector,
   fetchingFavoritesSelector,
-} from '../../../store/src/selectors/favorite-groups.selectors';
-import { isFavorite } from '../../../store/src/selectors/favorite.selectors';
-import { IUserFavoritesGroups } from '../../../store/src/types/favorite-groups.types';
-import { IEndpointFavMetadata, IFavoriteMetadata, UserFavorite } from '../../../store/src/types/user-favorites.types';
-import {
-  FavoritesConfigMapper,
-  TFavoriteMapperFunction,
-} from '../shared/components/favorites-meta-card/favorite-config-mapper';
-import { LoggerService } from './logger.service';
-
-export interface IFavoriteEntity {
-  type: string;
-  prettyName: string;
-  cardMapper: TFavoriteMapperFunction<IFavoriteMetadata>;
-  favorite: UserFavorite<IFavoriteMetadata>;
-}
-
-export interface IGroupedFavorites {
-  endpoint: IHydrationResults<IEndpointFavMetadata>;
-  entities: IHydrationResults[];
-}
-
+} from './selectors/favorite-groups.selectors';
+import { isFavorite } from './selectors/favorite.selectors';
+import { stratosEntityCatalog } from './stratos-entity-catalog';
+import { IUserFavoritesGroups } from './types/favorite-groups.types';
+import { IGroupedFavorites, IHydrationResults } from './types/user-favorite-manager.types';
+import { IEndpointFavMetadata, IFavoriteMetadata, UserFavorite } from './types/user-favorites.types';
 
-export interface IAllFavorites {
-  fetching: boolean;
-  error: boolean;
-  entityGroups: IGroupedFavorites[];
-}
-
-export interface IFavoritesInfo {
-  fetching: boolean;
-  error: boolean;
-}
-
-export interface IHydrationResults<T extends IFavoriteMetadata = IFavoriteMetadata> {
-  type: string;
-  cardMapper: TFavoriteMapperFunction<any>;
-  prettyName: string;
-  favorite: UserFavorite<T>;
-}
 @Injectable({
   providedIn: 'root'
 })
 export class UserFavoriteManager {
   constructor(
     private store: Store<GeneralEntityAppState>,
-    private logger: LoggerService,
     private favoritesConfigMapper: FavoritesConfigMapper
   ) { }
 
@@ -124,7 +90,7 @@ export class UserFavoriteManager {
     if (!endpointFav) {
       return this.store.select(endpointEntitiesSelector).pipe(
         map(endpoints => {
-          const endpointGuid = UserFavorite.getEntityGuidFromFavoriteGuid(endpointFavoriteGuid, this.logger);
+          const endpointGuid = UserFavorite.getEntityGuidFromFavoriteGuid(endpointFavoriteGuid);
           const endpointEntity = endpoints[endpointGuid];
           return this.favoritesConfigMapper.getFavoriteEndpointFromEntity(endpointEntity);
         }),
@@ -162,6 +128,6 @@ export class UserFavoriteManager {
   }
 
   public toggleFavorite(favorite: UserFavorite<IFavoriteMetadata>) {
-    this.store.dispatch(new ToggleUserFavoriteAction(favorite));
+    stratosEntityCatalog.userFavorite.api.toggle(favorite);
   }
 }
diff --git a/src/frontend/packages/store/testing/ng-package.json b/src/frontend/packages/store/testing/ng-package.json
index 87392138a4..bfa6b062cf 100644
--- a/src/frontend/packages/store/testing/ng-package.json
+++ b/src/frontend/packages/store/testing/ng-package.json
@@ -1,7 +1,7 @@
 {
-  "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
+  "$schema": "../../../../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../../../dist/store/testing",
   "lib": {
-    "entryFile": "public_api.ts"
+    "entryFile": "public-api.ts"
   }
 }
\ No newline at end of file
diff --git a/src/frontend/packages/store/testing/src/store-test-helper.ts b/src/frontend/packages/store/testing/src/store-test-helper.ts
index 3dac3230b7..98731e61fe 100644
--- a/src/frontend/packages/store/testing/src/store-test-helper.ts
+++ b/src/frontend/packages/store/testing/src/store-test-helper.ts
@@ -2,10 +2,10 @@ import { ModuleWithProviders } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { Store, StoreModule } from '@ngrx/store';
 
-import { endpointEntitySchema } from '../../../core/src/base-entity-schemas';
 import { AppState } from '../../src/app-state';
 import { entityCatalog } from '../../src/entity-catalog/entity-catalog';
 import { EntityCatalogEntityConfig } from '../../src/entity-catalog/entity-catalog.types';
+import { endpointEntityType, stratosEntityFactory } from '../../src/helpers/stratos-entity-factory';
 import { appReducers } from '../../src/reducers.module';
 import { getDefaultRequestState, rootUpdatingKey } from '../../src/reducers/api-request-reducer/types';
 import { getDefaultPaginationEntityState } from '../../src/reducers/pagination-reducer/pagination-reducer-reset-pagination';
@@ -396,7 +396,7 @@ export function createEntityStore(entityMap: Map<EntityCatalogEntityConfig, Arra
 }
 
 export function populateStoreWithTestEndpoint(): EndpointModel {
-  const stratosEndpointEntityConfig: EntityCatalogEntityConfig = endpointEntitySchema;
+  const stratosEndpointEntityConfig: EntityCatalogEntityConfig = stratosEntityFactory(endpointEntityType);
   const stratosEndpointEntityKey = entityCatalog.getEntityKey(stratosEndpointEntityConfig);
   const mappedData = {
     entities: {
diff --git a/src/frontend/packages/theme/_helper.scss b/src/frontend/packages/theme/_helper.scss
new file mode 100644
index 0000000000..ba0c49c6c9
--- /dev/null
+++ b/src/frontend/packages/theme/_helper.scss
@@ -0,0 +1,112 @@
+// Stratos Theme Helper
+
+@use "sass:color";
+@import '~@angular/material/theming';
+@import './mat-themes';
+@import './mat-colors';
+
+// Defaults
+$side-nav-light-text: #fff;
+$side-nav-light-bg: #333;
+$side-nav-light-hover: #555;
+$side-nav-light-active: #484848;
+
+// Themes palettes and colors
+
+// Light Theme defaults
+$oss-theme-primary: mat-palette($mat-blue);
+$oss-theme-accent: mat-palette($mat-blue);
+$oss-theme-warn: mat-palette($mat-red);
+$oss-theme: mat-light-theme($oss-theme-primary, $oss-theme-accent, $oss-theme-warn);
+
+// Dark Theme defaults
+$oss-dark-primary: mat-palette($mat-blue);
+$oss-dark-accent: mat-palette($mat-amber, A400, A100, A700);
+$oss-dark-warn: mat-palette($mat-red);
+$oss-dark-theme: mat-dark-theme($oss-dark-primary, $oss-dark-accent, $oss-dark-warn);
+
+@function stratos-default-theme() {
+  @return (
+    default: stratos-default-light-theme(),
+    dark: stratos-default-dark-theme()
+  );
+}
+
+@function stratos-default-dark-theme() {
+  @return stratos-theme-helper($oss-dark-theme);
+}
+
+@function stratos-default-light-theme() {
+  @return stratos-theme-helper($oss-theme);
+}
+
+// Creates the app theme and applies it to the application
+// $theme = Angular Material Theme
+// $nav-theme - Colors for the Side Nav (optional)
+// $status-theme - Colors for status (optional)
+@function stratos-theme-helper($theme: $oss-theme, $nav-theme: null, $status-theme: null) {
+  $background-colors: map-get($theme, background);
+  $foreground-colors: map-get($theme, foreground);
+  $is-dark: map-get($theme, is-dark);
+  $app-background-color: white;
+  $app-background-text-color: rgba(mat-color($foreground-colors, base), .65);
+  $primary: map-get($theme, primary);
+  $accent: map-get($theme, accent);
+  $warn: map-get($theme, warn);
+  $subdued: mat-contrast($primary, 50);
+
+  @if $is-dark == true {
+    $app-background-color: lighten(mat-color($background-colors, background), 10%);
+    $subdued: lighten($subdued, 90);
+  } @else {
+    $app-background-color: darken(mat-color($background-colors, background), 2%);
+    $subdued: lighten($subdued, 50);
+  }
+
+  // Just returns a light theme
+  @return (
+    theme: $theme,
+    app-theme: (
+      app-background-color: $app-background-color,
+      app-background-text-color: rgba(mat-color($foreground-colors, base), .65),
+      side-nav: app-generate-nav-theme($theme, $nav-theme),
+      status: app-generate-status-theme($theme, $status-theme),
+      subdued-color: $subdued,
+      ansi-colors: $ansi-color-palette,
+      header-background-color: mat-color($primary),
+      header-foreground-color: mat-contrast($primary, 500),
+      // Does the header background color span across the top, or is the sidenav background color used for the top-left portion
+      header-background-span: false,
+      // Background colors to use for things like the about page header (underflow)
+      underflow-background-color: mat-color($primary),
+      underflow-foreground-color: mat-contrast($primary, 500)
+    )
+  );
+}
+
+@function app-generate-nav-theme($theme, $nav-theme: null) {
+  @if ($nav-theme) {
+    @return $nav-theme;
+  } @else {
+    // Use default palette for side navigation
+    @return (
+      background: $side-nav-light-bg,
+      text: darken($side-nav-light-text, 10%),
+      active: $side-nav-light-active,
+      active-text: $side-nav-light-text,
+      hover: $side-nav-light-hover, 
+      hover-text: $side-nav-light-text
+    );
+  }
+}
+
+@function app-generate-status-theme($theme, $status-theme: null) {
+  @if ($status-theme) {
+    @return $status-theme;
+  } @else {
+    $warn: map-get($theme, warn);
+    $primary: map-get($theme, primary);
+    $white: #fff; // Use default palette for status
+    @return (success: map-get($mat-green, 500), warning: map-get($mat-orange, 500), danger: mat-color($warn), tentative: map-get($mat-grey, 500), busy: mat-color($primary), text: $white, );
+  }
+}
diff --git a/src/frontend/packages/theme/_index.scss b/src/frontend/packages/theme/_index.scss
new file mode 100644
index 0000000000..691b38f74c
--- /dev/null
+++ b/src/frontend/packages/theme/_index.scss
@@ -0,0 +1,6 @@
+@import './helper';
+
+// This just returns the default open-source theme
+@function stratos-theme() {
+  @return stratos-default-theme();
+}
diff --git a/src/frontend/packages/theme/assets/core/login-bg.jpg b/src/frontend/packages/theme/assets/core/login-bg.jpg
new file mode 100644
index 0000000000..345d4dfe6d
Binary files /dev/null and b/src/frontend/packages/theme/assets/core/login-bg.jpg differ
diff --git a/src/frontend/packages/theme/assets/core/logo.png b/src/frontend/packages/theme/assets/core/logo.png
new file mode 100755
index 0000000000..ebfb800741
Binary files /dev/null and b/src/frontend/packages/theme/assets/core/logo.png differ
diff --git a/src/frontend/packages/theme/assets/core/nav-logo-icon.png b/src/frontend/packages/theme/assets/core/nav-logo-icon.png
new file mode 100644
index 0000000000..4b728a0fbb
Binary files /dev/null and b/src/frontend/packages/theme/assets/core/nav-logo-icon.png differ
diff --git a/src/frontend/packages/theme/assets/core/nav-logo.png b/src/frontend/packages/theme/assets/core/nav-logo.png
new file mode 100644
index 0000000000..a57b969417
Binary files /dev/null and b/src/frontend/packages/theme/assets/core/nav-logo.png differ
diff --git a/src/frontend/packages/theme/assets/favicon.ico b/src/frontend/packages/theme/assets/favicon.ico
new file mode 100644
index 0000000000..21f49bc43b
Binary files /dev/null and b/src/frontend/packages/theme/assets/favicon.ico differ
diff --git a/src/frontend/packages/core/misc/custom/loading.css b/src/frontend/packages/theme/loader/loading.css
similarity index 100%
rename from src/frontend/packages/core/misc/custom/loading.css
rename to src/frontend/packages/theme/loader/loading.css
diff --git a/src/frontend/packages/core/misc/custom/loading.html b/src/frontend/packages/theme/loader/loading.html
similarity index 100%
rename from src/frontend/packages/core/misc/custom/loading.html
rename to src/frontend/packages/theme/loader/loading.html
diff --git a/src/frontend/packages/theme/mat-colors.scss b/src/frontend/packages/theme/mat-colors.scss
new file mode 100644
index 0000000000..db3f8aeeba
--- /dev/null
+++ b/src/frontend/packages/theme/mat-colors.scss
@@ -0,0 +1,28 @@
+$white: #fff;
+$black: #000;
+
+$black-87-opacity: rgba($black, .87);
+$white-87-opacity: rgba($white, .87);
+$black-12-opacity: rgba($black, .12);
+$white-12-opacity: rgba($white, .12);
+$black-6-opacity: rgba($black, .06);
+$white-6-opacity: rgba($white, .06);
+$mat-red: ( 50: #ffebee, 100: #ffcdd2, 200: #ef9a9a, 300: #e57373, 400: #ef5350, 500: #f44336, 600: #e53935, 700: #d32f2f, 800: #c62828, 900: #b71c1c, A100: #ff8a80, A200: #ff5252, A400: #ff1744, A700: #d50000, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
+$mat-pink: ( 50: #fce4ec, 100: #f8bbd0, 200: #f48fb1, 300: #f06292, 400: #ec407a, 500: #e91e63, 600: #d81b60, 700: #c2185b, 800: #ad1457, 900: #880e4f, A100: #ff80ab, A200: #ff4081, A400: #f50057, A700: #c51162, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: $white-87-opacity, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
+$mat-purple: ( 50: #f3e5f5, 100: #e1bee7, 200: #ce93d8, 300: #ba68c8, 400: #ab47bc, 500: #9c27b0, 600: #8e24aa, 700: #7b1fa2, 800: #6a1b9a, 900: #4a148c, A100: #ea80fc, A200: #e040fb, A400: #d500f9, A700: #a0f, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: white, 400: white, 500: $white-87-opacity, 600: $white-87-opacity, 700: $white-87-opacity, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
+$mat-deep-purple: ( 50: #ede7f6, 100: #d1c4e9, 200: #b39ddb, 300: #9575cd, 400: #7e57c2, 500: #673ab7, 600: #5e35b1, 700: #512da8, 800: #4527a0, 900: #311b92, A100: #b388ff, A200: #7c4dff, A400: #651fff, A700: #6200ea, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: white, 400: white, 500: $white-87-opacity, 600: $white-87-opacity, 700: $white-87-opacity, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: $white-87-opacity, A700: $white-87-opacity, ));
+$mat-indigo: ( 50: #e8eaf6, 100: #c5cae9, 200: #9fa8da, 300: #7986cb, 400: #5c6bc0, 500: #3f51b5, 600: #3949ab, 700: #303f9f, 800: #283593, 900: #1a237e, A100: #8c9eff, A200: #536dfe, A400: #3d5afe, A700: #304ffe, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: white, 400: white, 500: $white-87-opacity, 600: $white-87-opacity, 700: $white-87-opacity, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: $white-87-opacity, ));
+$mat-blue: ( 50: #e3f2fd, 100: #bbdefb, 200: #90caf9, 300: #64b5f6, 400: #42a5f5, 500: #2196f3, 600: #1e88e5, 700: #1976d2, 800: #1565c0, 900: #0d47a1, A100: #82b1ff, A200: #448aff, A400: #2979ff, A700: #2962ff, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
+$mat-light-blue: ( 50: #e1f5fe, 100: #b3e5fc, 200: #81d4fa, 300: #4fc3f7, 400: #29b6f6, 500: #03a9f4, 600: #039be5, 700: #0288d1, 800: #0277bd, 900: #01579b, A100: #80d8ff, A200: #40c4ff, A400: #00b0ff, A700: #0091ea, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: white, 900: $white-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: white, ));
+$mat-cyan: ( 50: #e0f7fa, 100: #b2ebf2, 200: #80deea, 300: #4dd0e1, 400: #26c6da, 500: #00bcd4, 600: #00acc1, 700: #0097a7, 800: #00838f, 900: #006064, A100: #84ffff, A200: #18ffff, A400: #00e5ff, A700: #00b8d4, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: white, 900: $white-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: $black-87-opacity, ));
+$mat-teal: ( 50: #e0f2f1, 100: #b2dfdb, 200: #80cbc4, 300: #4db6ac, 400: #26a69a, 500: #009688, 600: #00897b, 700: #00796b, 800: #00695c, 900: #004d40, A100: #a7ffeb, A200: #64ffda, A400: #1de9b6, A700: #00bfa5, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: $black-87-opacity, ));
+$mat-green: ( 50: #e8f5e9, 100: #c8e6c9, 200: #a5d6a7, 300: #81c784, 400: #66bb6a, 500: #4caf50, 600: #43a047, 700: #388e3c, 800: #2e7d32, 900: #1b5e20, A100: #b9f6ca, A200: #69f0ae, A400: #00e676, A700: #00c853, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: $black-87-opacity, ));
+$mat-light-green: ( 50: #f1f8e9, 100: #dcedc8, 200: #c5e1a5, 300: #aed581, 400: #9ccc65, 500: #8bc34a, 600: #7cb342, 700: #689f38, 800: #558b2f, 900: #33691e, A100: #ccff90, A200: #b2ff59, A400: #76ff03, A700: #64dd17, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: $black-87-opacity, 600: $black-87-opacity, 700: white, 800: white, 900: white, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: $black-87-opacity, ));
+$mat-lime: ( 50: #f9fbe7, 100: #f0f4c3, 200: #e6ee9c, 300: #dce775, 400: #d4e157, 500: #cddc39, 600: #c0ca33, 700: #afb42b, 800: #9e9d24, 900: #827717, A100: #f4ff81, A200: #eeff41, A400: #c6ff00, A700: #aeea00, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: $black-87-opacity, 600: $black-87-opacity, 700: $black-87-opacity, 800: $black-87-opacity, 900: white, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: $black-87-opacity, ));
+$mat-yellow: ( 50: #fffde7, 100: #fff9c4, 200: #fff59d, 300: #fff176, 400: #ffee58, 500: #ffeb3b, 600: #fdd835, 700: #fbc02d, 800: #f9a825, 900: #f57f17, A100: #ffff8d, A200: #ff0, A400: #ffea00, A700: #ffd600, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: $black-87-opacity, 600: $black-87-opacity, 700: $black-87-opacity, 800: $black-87-opacity, 900: $black-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: $black-87-opacity, ));
+$mat-amber: ( 50: #fff8e1, 100: #ffecb3, 200: #ffe082, 300: #ffd54f, 400: #ffca28, 500: #ffc107, 600: #ffb300, 700: #ffa000, 800: #ff8f00, 900: #ff6f00, A100: #ffe57f, A200: #ffd740, A400: #ffc400, A700: #ffab00, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: $black-87-opacity, 600: $black-87-opacity, 700: $black-87-opacity, 800: $black-87-opacity, 900: $black-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: $black-87-opacity, ));
+$mat-orange: ( 50: #fff3e0, 100: #ffe0b2, 200: #ffcc80, 300: #ffb74d, 400: #ffa726, 500: #ff9800, 600: #fb8c00, 700: #f57c00, 800: #ef6c00, 900: #e65100, A100: #ffd180, A200: #ffab40, A400: #ff9100, A700: #ff6d00, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: $black-87-opacity, 600: $black-87-opacity, 700: $black-87-opacity, 800: white, 900: white, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: black, ));
+$mat-deep-orange: ( 50: #fbe9e7, 100: #ffccbc, 200: #ffab91, 300: #ff8a65, 400: #ff7043, 500: #ff5722, 600: #f4511e, 700: #e64a19, 800: #d84315, 900: #bf360c, A100: #ff9e80, A200: #ff6e40, A400: #ff3d00, A700: #dd2c00, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: white, 900: white, A100: $black-87-opacity, A200: $black-87-opacity, A400: white, A700: white, ));
+$mat-brown: ( 50: #efebe9, 100: #d7ccc8, 200: #bcaaa4, 300: #a1887f, 400: #8d6e63, 500: #795548, 600: #6d4c41, 700: #5d4037, 800: #4e342e, 900: #3e2723, A100: #d7ccc8, A200: #bcaaa4, A400: #8d6e63, A700: #5d4037, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: white, 400: white, 500: $white-87-opacity, 600: $white-87-opacity, 700: $white-87-opacity, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: white, A700: $white-87-opacity, ));
+$mat-grey: ( 50: #fafafa, 100: #f5f5f5, 200: #eee, 300: #e0e0e0, 400: #bdbdbd, 500: #9e9e9e, 600: #757575, 700: #616161, 800: #424242, 900: #212121, A100: #fff, A200: #eee, A400: #bdbdbd, A700: #616161, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: $black-87-opacity, 600: $white-87-opacity, 700: $white-87-opacity, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: $white-87-opacity, ));
+$mat-blue-grey: ( 50: #eceff1, 100: #cfd8dc, 200: #b0bec5, 300: #90a4ae, 400: #78909c, 500: #607d8b, 600: #546e7a, 700: #455a64, 800: #37474f, 900: #263238, A100: #cfd8dc, A200: #b0bec5, A400: #78909c, A700: #455a64, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: white, 500: white, 600: $white-87-opacity, 700: $white-87-opacity, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: white, A700: $white-87-opacity, ));
diff --git a/src/frontend/packages/core/sass/mat-themes.scss b/src/frontend/packages/theme/mat-themes.scss
similarity index 100%
rename from src/frontend/packages/core/sass/mat-themes.scss
rename to src/frontend/packages/theme/mat-themes.scss
diff --git a/src/frontend/packages/theme/package.json b/src/frontend/packages/theme/package.json
new file mode 100644
index 0000000000..c8e9cce11c
--- /dev/null
+++ b/src/frontend/packages/theme/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "@stratosui/theme",
+  "version": "0.0.1",
+  "stratos": {
+    "assets": {
+      "assets/core": "core/assets",
+      "assets/favicon.ico": "favicon.ico"
+    },
+    "theme":{
+      "loadingCss": "loader/loading.css",
+      "loadingHtml": "loader/loading.html"
+    }
+  },
+  "peerDependencies": {
+  },
+  "scripts": {
+    "build": "rm -rf ../../../../dist/theme && mkdir -p ../../../../dist/theme && cp -R * ../../../../dist/theme"
+  }
+}
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index a49e701b9a..0e5bb28dde 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -341,12 +341,13 @@ github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyC
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9RU=
 github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
-github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
+github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
 github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
 github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
@@ -782,18 +783,19 @@ gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw=
 helm.sh/helm/v3 v3.0.0/go.mod h1:sI7B9yfvMgxtTPMWdk1jSKJ2aa59UyP9qhPydqW6mgo=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/src/jetstream/plugins/userfavorites/favorites.go b/src/jetstream/plugins/userfavorites/favorites.go
index 7d87db1146..878a95d25a 100644
--- a/src/jetstream/plugins/userfavorites/favorites.go
+++ b/src/jetstream/plugins/userfavorites/favorites.go
@@ -139,7 +139,9 @@ func (uf *UserFavorites) create(c echo.Context) error {
 		return interfaces.NewHTTPShadowError(
 			http.StatusBadRequest,
 			"Failed to save favorite to db",
-			"Failed to save favorite to db")
+			"Failed to save favorite to db %+v",
+			err,
+		)
 	}
 
 	jsonString, err := json.Marshal(updatedFavorite)
@@ -147,7 +149,9 @@ func (uf *UserFavorites) create(c echo.Context) error {
 		return interfaces.NewHTTPShadowError(
 			http.StatusBadRequest,
 			"Failed to Marshal favorite from db",
-			"Failed to Marshal favorite from db")
+			"Failed to Marshal favorite from db %+v",
+			err,
+		)
 	}
 
 	c.Response().Header().Set("Content-Type", "application/json")
diff --git a/src/test-e2e/application/application-deploy-docker-e2e.spec.ts b/src/test-e2e/application/application-deploy-docker-e2e.spec.ts
index 8215178373..84de49c66c 100644
--- a/src/test-e2e/application/application-deploy-docker-e2e.spec.ts
+++ b/src/test-e2e/application/application-deploy-docker-e2e.spec.ts
@@ -1,7 +1,7 @@
 import { browser } from 'protractor';
 
 import { e2e } from '../e2e';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { CREATE_APP_DEPLOY_TEST_TYPE, createApplicationDeployTests } from './application-deploy-helper';
 import { ApplicationE2eHelper } from './application-e2e-helpers';
diff --git a/src/test-e2e/application/application-deploy-e2e.spec.ts b/src/test-e2e/application/application-deploy-e2e.spec.ts
index 994fa95c1b..5e07c421b9 100644
--- a/src/test-e2e/application/application-deploy-e2e.spec.ts
+++ b/src/test-e2e/application/application-deploy-e2e.spec.ts
@@ -1,7 +1,7 @@
 import { browser, promise } from 'protractor';
 
 import { e2e } from '../e2e';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { ConfirmDialogComponent } from '../po/confirm-dialog';
 import { createApplicationDeployTests } from './application-deploy-helper';
diff --git a/src/test-e2e/application/application-e2e-helpers.ts b/src/test-e2e/application/application-e2e-helpers.ts
index 52646ae9b3..b0800c2432 100644
--- a/src/test-e2e/application/application-e2e-helpers.ts
+++ b/src/test-e2e/application/application-e2e-helpers.ts
@@ -4,7 +4,7 @@ import { IApp, IRoute, ISpace } from '../../frontend/packages/cloud-foundry/src/
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { e2e, E2ESetup } from '../e2e';
 import { E2EConfigCloudFoundry } from '../e2e.types';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { CFRequestHelpers } from '../helpers/cf-request-helpers';
 import { E2EHelpers } from '../helpers/e2e-helpers';
 
diff --git a/src/test-e2e/application/application-routes-e2e.spec.ts b/src/test-e2e/application/application-routes-e2e.spec.ts
index 6a0ee1ec60..c90657464e 100644
--- a/src/test-e2e/application/application-routes-e2e.spec.ts
+++ b/src/test-e2e/application/application-routes-e2e.spec.ts
@@ -3,7 +3,7 @@ import { browser, promise, protractor } from 'protractor';
 import { IApp } from '../../frontend/packages/cloud-foundry/src/cf-api.types';
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { e2e } from '../e2e';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { ConfirmDialogComponent } from '../po/confirm-dialog';
 import { ApplicationE2eHelper } from './application-e2e-helpers';
diff --git a/src/test-e2e/application/application-view-e2e.spec.ts b/src/test-e2e/application/application-view-e2e.spec.ts
index e21593514e..48244d2916 100644
--- a/src/test-e2e/application/application-view-e2e.spec.ts
+++ b/src/test-e2e/application/application-view-e2e.spec.ts
@@ -4,7 +4,7 @@ import { IApp } from '../../frontend/packages/cloud-foundry/src/cf-api.types';
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { ApplicationsPage } from '../applications/applications.po';
 import { e2e } from '../e2e';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../helpers/e2e-helpers';
 import { ApplicationE2eHelper } from './application-e2e-helpers';
 import { ApplicationPageEventsTab } from './po/application-page-events.po';
@@ -135,8 +135,7 @@ describe('Application View -', () => {
       });
 
       it('Deployment Info', () => {
-        appSummary.cardDeployInfo.waitForTitle('Deployment Info');
-        expect(appSummary.cardDeployInfo.getContent()).toBe('None');
+        expect(appSummary.cardDeployInfo.isPresent()).toBeFalsy();
       });
     });
 
diff --git a/src/test-e2e/applications/application-wall-e2e.spec.ts b/src/test-e2e/applications/application-wall-e2e.spec.ts
index fc8f6d3da0..85fa104fa6 100644
--- a/src/test-e2e/applications/application-wall-e2e.spec.ts
+++ b/src/test-e2e/applications/application-wall-e2e.spec.ts
@@ -5,7 +5,7 @@ import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { ApplicationE2eHelper } from '../application/application-e2e-helpers';
 import { e2e } from '../e2e';
 import { E2EConfigCloudFoundry } from '../e2e.types';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../helpers/extend-test-helpers';
 import { FormComponent } from '../po/form.po';
diff --git a/src/test-e2e/cloud-foundry/cf-level/manage-org-e2e.spec.ts b/src/test-e2e/cloud-foundry/cf-level/manage-org-e2e.spec.ts
index e6a92dda50..07893a76bb 100644
--- a/src/test-e2e/cloud-foundry/cf-level/manage-org-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/cf-level/manage-org-e2e.spec.ts
@@ -1,7 +1,7 @@
 import { by, element, promise, protractor } from 'protractor';
 
 import { e2e } from '../../e2e';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
 import { CfOrgLevelPage } from '../org-level/cf-org-level-page.po';
 import { CfTopLevelPage } from './cf-top-level-page.po';
diff --git a/src/test-e2e/cloud-foundry/cf-level/manage-quota-e2e.spec.ts b/src/test-e2e/cloud-foundry/cf-level/manage-quota-e2e.spec.ts
index e70910bfc2..159cfcb4fd 100644
--- a/src/test-e2e/cloud-foundry/cf-level/manage-quota-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/cf-level/manage-quota-e2e.spec.ts
@@ -1,7 +1,7 @@
 import { by, element, promise, protractor } from 'protractor';
 
 import { e2e } from '../../e2e';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../../helpers/extend-test-helpers';
 import { TableComponent } from '../../po/table.po';
diff --git a/src/test-e2e/cloud-foundry/cloud-foundry-list-cf-e2e.spec.ts b/src/test-e2e/cloud-foundry/cloud-foundry-list-cf-e2e.spec.ts
index ace82674ac..83b73b37ca 100644
--- a/src/test-e2e/cloud-foundry/cloud-foundry-list-cf-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/cloud-foundry-list-cf-e2e.spec.ts
@@ -1,4 +1,5 @@
-import { e2e } from '../e2e';
+import { CF_ENDPOINT_TYPE } from '../../frontend/packages/cloud-foundry/src/cf-types';
+import { E2E, e2e } from '../e2e';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { ListComponent } from '../po/list.po';
 import { SideNavigation, SideNavMenuItem } from '../po/side-nav.po';
@@ -15,9 +16,24 @@ describe('CF Endpoints Dashboard - ', () => {
         .clearAllEndpoints();
     });
 
-    it('No CF side nav when no CF connected', () => {
-      expect(nav.isMenuItemPresent(SideNavMenuItem.CloudFoundry)).toBeFalsy();
-    });
+    if (!E2E.customization.alwaysShowNavForEndpointTypes || E2E.customization.alwaysShowNavForEndpointTypes(CF_ENDPOINT_TYPE)) {
+      beforeEach(() => {
+        nav.goto(SideNavMenuItem.CloudFoundry);
+        cloudFoundry.loadingIndicator.waitUntilNotShown();
+      });
+
+      it('should be the Endpoints page', () => {
+        expect(cloudFoundry.isActivePage()).toBeTruthy();
+      });
+
+      it('should show the `no registered endpoints` message', () => {
+        expect(cloudFoundry.hasNoCloudFoundryMessage).toBeTruthy();
+      });
+    } else {
+      it('No CF side nav when no CF connected', () => {
+        expect(nav.isMenuItemPresent(SideNavMenuItem.CloudFoundry)).toBeFalsy();
+      });
+    }
   });
 
   describe('Single endpoint - ', () => {
diff --git a/src/test-e2e/cloud-foundry/invite-users-e2e.helper.ts b/src/test-e2e/cloud-foundry/invite-users-e2e.helper.ts
index 2591e7d680..f8b3ac8198 100644
--- a/src/test-e2e/cloud-foundry/invite-users-e2e.helper.ts
+++ b/src/test-e2e/cloud-foundry/invite-users-e2e.helper.ts
@@ -2,7 +2,7 @@ import { browser, promise } from 'protractor';
 
 import { e2e } from '../e2e';
 import { E2EConfigCloudFoundry } from '../e2e.types';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../helpers/extend-test-helpers';
 import { CFUsersListComponent } from '../po/cf-users-list.po';
diff --git a/src/test-e2e/cloud-foundry/manage-users-by-username-stepper-e2e.spec.ts b/src/test-e2e/cloud-foundry/manage-users-by-username-stepper-e2e.spec.ts
index f72a3d3422..637160d806 100644
--- a/src/test-e2e/cloud-foundry/manage-users-by-username-stepper-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/manage-users-by-username-stepper-e2e.spec.ts
@@ -3,7 +3,7 @@ import { browser, by, element, promise } from 'protractor';
 import { CfUser } from '../../frontend/packages/cloud-foundry/src/store/types/cf-user.types';
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { e2e } from '../e2e';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../helpers/e2e-helpers';
 import { UaaHelpers } from '../helpers/uaa-helpers';
 import { CFUsersListComponent } from '../po/cf-users-list.po';
diff --git a/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts b/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts
index 75d391ab0c..bef96542b2 100644
--- a/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts
@@ -1,7 +1,7 @@
 import { browser, by, element, protractor } from 'protractor';
 
 import { e2e } from '../e2e';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { E2EHelpers } from '../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../helpers/extend-test-helpers';
 import { CFUsersListComponent } from '../po/cf-users-list.po';
diff --git a/src/test-e2e/cloud-foundry/org-level/cf-org-delete-e2e.spec.ts b/src/test-e2e/cloud-foundry/org-level/cf-org-delete-e2e.spec.ts
index a5dca278a6..7ce53760c4 100644
--- a/src/test-e2e/cloud-foundry/org-level/cf-org-delete-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/org-level/cf-org-delete-e2e.spec.ts
@@ -1,10 +1,11 @@
 import { by, element, protractor } from 'protractor';
+
 import { e2e } from '../../e2e';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
-import { CfTopLevelPage } from '../cf-level/cf-top-level-page.po';
 import { CFPage } from '../../po/cf-page.po';
 import { SideNavMenuItem } from '../../po/side-nav.po';
+import { CfTopLevelPage } from '../cf-level/cf-top-level-page.po';
 
 describe('Delete Organization', () => {
   let e2eSetup;
diff --git a/src/test-e2e/cloud-foundry/org-level/manage-space-quota-e2e.spec.ts b/src/test-e2e/cloud-foundry/org-level/manage-space-quota-e2e.spec.ts
index 52bc96cc41..fe7f699afb 100644
--- a/src/test-e2e/cloud-foundry/org-level/manage-space-quota-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/org-level/manage-space-quota-e2e.spec.ts
@@ -1,7 +1,7 @@
 import { by, element, promise, protractor } from 'protractor';
 
 import { e2e } from '../../e2e';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../../helpers/extend-test-helpers';
 import { CfOrgLevelPage } from '../org-level/cf-org-level-page.po';
diff --git a/src/test-e2e/cloud-foundry/org-level/mange-space-e2e.spec.ts b/src/test-e2e/cloud-foundry/org-level/mange-space-e2e.spec.ts
index 89fa38c40c..912202fbcd 100644
--- a/src/test-e2e/cloud-foundry/org-level/mange-space-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/org-level/mange-space-e2e.spec.ts
@@ -1,12 +1,12 @@
 import { by, element, promise, protractor } from 'protractor';
 
 import { e2e } from '../../e2e';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
+import { TableComponent } from '../../po/table.po';
 import { CfSpaceLevelPage } from '../space-level/cf-space-level-page.po';
 import { CfOrgLevelPage } from './cf-org-level-page.po';
 import { SpaceFormPage } from './space-form-page.po';
-import { TableComponent } from '../../po/table.po';
 
 describe('Manage Space', () => {
   let e2eSetup;
diff --git a/src/test-e2e/cloud-foundry/org-level/org-invite-user-e2e.spec.ts b/src/test-e2e/cloud-foundry/org-level/org-invite-user-e2e.spec.ts
index 429622a891..1248a60dae 100644
--- a/src/test-e2e/cloud-foundry/org-level/org-invite-user-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/org-level/org-invite-user-e2e.spec.ts
@@ -1,5 +1,5 @@
 import { E2EConfigCloudFoundry } from '../../e2e.types';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { CFPage } from '../../po/cf-page.po';
 import { SideNavMenuItem } from '../../po/side-nav.po';
 import { setupInviteUserTests } from '../invite-users-e2e.helper';
diff --git a/src/test-e2e/cloud-foundry/org-level/org-spaces-e2e.spec.ts b/src/test-e2e/cloud-foundry/org-level/org-spaces-e2e.spec.ts
index 1ddf2be05e..799c75d439 100644
--- a/src/test-e2e/cloud-foundry/org-level/org-spaces-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/org-level/org-spaces-e2e.spec.ts
@@ -4,7 +4,7 @@ import { IOrganization } from '../../../frontend/packages/cloud-foundry/src/cf-a
 import { APIResource } from '../../../frontend/packages/store/src/types/api.types';
 import { e2e } from '../../e2e';
 import { E2EConfigCloudFoundry } from '../../e2e.types';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
 import { ListComponent } from '../../po/list.po';
 import { CfOrgLevelPage } from './cf-org-level-page.po';
diff --git a/src/test-e2e/cloud-foundry/space-level/cf-space-delete-e2e.spec.ts b/src/test-e2e/cloud-foundry/space-level/cf-space-delete-e2e.spec.ts
index 73f017292f..c6dc55efbc 100644
--- a/src/test-e2e/cloud-foundry/space-level/cf-space-delete-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/space-level/cf-space-delete-e2e.spec.ts
@@ -1,14 +1,15 @@
-import { CfOrgLevelPage } from './../org-level/cf-org-level-page.po';
 import { by, element, protractor } from 'protractor';
+
 import { e2e } from '../../e2e';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
-import { CfTopLevelPage } from '../cf-level/cf-top-level-page.po';
 import { CFPage } from '../../po/cf-page.po';
-import { SideNavMenuItem } from '../../po/side-nav.po';
+import { ConfirmDialogComponent } from '../../po/confirm-dialog';
 import { ListComponent } from '../../po/list.po';
 import { MetaCardTitleType } from '../../po/meta-card.po';
-import { ConfirmDialogComponent } from '../../po/confirm-dialog';
+import { SideNavMenuItem } from '../../po/side-nav.po';
+import { CfTopLevelPage } from '../cf-level/cf-top-level-page.po';
+import { CfOrgLevelPage } from './../org-level/cf-org-level-page.po';
 
 describe('Delete Space', () => {
   let e2eSetup;
diff --git a/src/test-e2e/cloud-foundry/space-level/cf-space-level-e2e.spec.ts b/src/test-e2e/cloud-foundry/space-level/cf-space-level-e2e.spec.ts
index f7b6095de0..5cd14c362e 100644
--- a/src/test-e2e/cloud-foundry/space-level/cf-space-level-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/space-level/cf-space-level-e2e.spec.ts
@@ -2,7 +2,7 @@ import { by, element, protractor } from 'protractor';
 
 import { e2e } from '../../e2e';
 import { E2EConfigCloudFoundry } from '../../e2e.types';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../../helpers/extend-test-helpers';
 import { CFPage } from '../../po/cf-page.po';
diff --git a/src/test-e2e/cloud-foundry/space-level/space-invite-user-e2e.spec.ts b/src/test-e2e/cloud-foundry/space-level/space-invite-user-e2e.spec.ts
index 158dc0d4c5..240dbc453d 100644
--- a/src/test-e2e/cloud-foundry/space-level/space-invite-user-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/space-level/space-invite-user-e2e.spec.ts
@@ -1,7 +1,7 @@
 import { promise } from 'protractor';
 
 import { E2EConfigCloudFoundry } from '../../e2e.types';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { setupInviteUserTests } from '../invite-users-e2e.helper';
 import { CfSpaceLevelPage } from './cf-space-level-page.po';
 
diff --git a/src/test-e2e/cloud-foundry/space-level/space-routes-e2e.spec.ts b/src/test-e2e/cloud-foundry/space-level/space-routes-e2e.spec.ts
index 386a8bf593..68a726e99a 100644
--- a/src/test-e2e/cloud-foundry/space-level/space-routes-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/space-level/space-routes-e2e.spec.ts
@@ -4,7 +4,7 @@ import { ISpace } from '../../../frontend/packages/cloud-foundry/src/cf-api.type
 import { APIResource } from '../../../frontend/packages/store/src/types/api.types';
 import { e2e } from '../../e2e';
 import { E2EConfigCloudFoundry } from '../../e2e.types';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
 import { ListComponent } from '../../po/list.po';
 import { CfSpaceLevelPage } from './cf-space-level-page.po';
diff --git a/src/test-e2e/cloud-foundry/users-list-e2e.helper.ts b/src/test-e2e/cloud-foundry/users-list-e2e.helper.ts
index cb4cf82680..656b0eadb5 100644
--- a/src/test-e2e/cloud-foundry/users-list-e2e.helper.ts
+++ b/src/test-e2e/cloud-foundry/users-list-e2e.helper.ts
@@ -3,7 +3,7 @@ import { protractor } from 'protractor/built/ptor';
 
 import { e2e, E2ESetup } from '../e2e';
 import { E2EConfigCloudFoundry } from '../e2e.types';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../helpers/extend-test-helpers';
 import { CFUsersListComponent, UserRoleChip } from '../po/cf-users-list.po';
diff --git a/src/test-e2e/cloud-foundry/users-removal-e2e.helper.ts b/src/test-e2e/cloud-foundry/users-removal-e2e.helper.ts
index a449dddd5f..92208e98ff 100644
--- a/src/test-e2e/cloud-foundry/users-removal-e2e.helper.ts
+++ b/src/test-e2e/cloud-foundry/users-removal-e2e.helper.ts
@@ -4,7 +4,7 @@ import { protractor } from 'protractor/built/ptor';
 import { CfUser } from '../../frontend/packages/cloud-foundry/src/store/types/cf-user.types';
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { e2e } from '../e2e';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../helpers/e2e-helpers';
 import { UaaHelpers } from '../helpers/uaa-helpers';
 import { CFUsersListComponent } from '../po/cf-users-list.po';
diff --git a/src/test-e2e/e2e.ts b/src/test-e2e/e2e.ts
index 49318abf03..a4215aaa53 100644
--- a/src/test-e2e/e2e.ts
+++ b/src/test-e2e/e2e.ts
@@ -1,5 +1,6 @@
 import { browser, promise, protractor } from 'protractor';
 
+import { CustomizationsMetadata } from '../frontend/packages/core/src/core/customizations.types';
 import { ConsoleUserType, E2EHelpers } from './helpers/e2e-helpers';
 import { RequestHelpers } from './helpers/request-helpers';
 import { ResetsHelpers } from './helpers/reset-helpers';
@@ -15,6 +16,13 @@ export class E2E {
   // Turn on debug logging for test helpers
   public static DEBUG_LOGGING = !!process.env.STRATOS_E2E_DEBUG || false;
 
+  /**
+   * Temporary location for customization, we should in future look to fetch this a better way from client side code
+  */
+  public static customization: CustomizationsMetadata = {
+    alwaysShowNavForEndpointTypes: (epType) => true
+  }
+
   // General helpers
   public helper = new E2EHelpers();
 
diff --git a/src/test-e2e/endpoints/endpoints-e2e.spec.ts b/src/test-e2e/endpoints/endpoints-e2e.spec.ts
index db63f8fa7c..c954a5869a 100644
--- a/src/test-e2e/endpoints/endpoints-e2e.spec.ts
+++ b/src/test-e2e/endpoints/endpoints-e2e.spec.ts
@@ -1,14 +1,21 @@
 import { browser } from 'protractor';
 
-import { e2e } from '../e2e';
+import { CF_ENDPOINT_TYPE } from '../../frontend/packages/cloud-foundry/src/cf-types';
+import { ApplicationsPage } from '../applications/applications.po';
+import { CfTopLevelPage } from '../cloud-foundry/cf-level/cf-top-level-page.po';
+import { E2E, e2e } from '../e2e';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { MenuComponent } from '../po/menu.po';
 import { SideNavMenuItem } from '../po/side-nav.po';
 import { SnackBarPo } from '../po/snackbar.po';
+import { ServicesPage } from '../services/services.po';
 import { EndpointsPage } from './endpoints.po';
 
 describe('Endpoints', () => {
   const endpointsPage = new EndpointsPage();
+  const applications = new ApplicationsPage();
+  const services = new ServicesPage();
+  const cloudFoundry = new CfTopLevelPage();
 
   describe('Workflow on log in (admin/non-admin + no endpoints/some endpoints) -', () => {
     describe('As Admin -', () => {
@@ -61,10 +68,26 @@ describe('Endpoints', () => {
           expect(endpointsPage.isActivePage()).toBeTruthy();
         });
 
-        it('No CF side nav when no CF connected', () => {
-          expect(endpointsPage.sideNav.isMenuItemPresent(SideNavMenuItem.CloudFoundry)).toBeFalsy();
-        });
+        if (!E2E.customization.alwaysShowNavForEndpointTypes || E2E.customization.alwaysShowNavForEndpointTypes(CF_ENDPOINT_TYPE)) {
+          it('Should show application wall with \'no clusters\' message', () => {
+            endpointsPage.sideNav.goto(SideNavMenuItem.Applications);
+            expect(applications.hasNoCloudFoundryMessage()).toBeTruthy();
+          });
+
+          it('Should show services view with \'no clusters\' message', () => {
+            endpointsPage.sideNav.goto(SideNavMenuItem.Services);
+            expect(services.hasNoCloudFoundryMessage()).toBeTruthy();
+          });
 
+          it('Should show Cloud Foundry view with \'no clusters\' message', () => {
+            endpointsPage.sideNav.goto(SideNavMenuItem.CloudFoundry);
+            expect(cloudFoundry.hasNoCloudFoundryMessage()).toBeTruthy();
+          });
+        } else {
+          it('No CF side nav when no CF connected', () => {
+            expect(endpointsPage.sideNav.isMenuItemPresent(SideNavMenuItem.CloudFoundry)).toBeFalsy();
+          });
+        }
       });
     });
 
diff --git a/src/test-e2e/helpers/cf-helpers.ts b/src/test-e2e/helpers/cf-e2e-helpers.ts
similarity index 100%
rename from src/test-e2e/helpers/cf-helpers.ts
rename to src/test-e2e/helpers/cf-e2e-helpers.ts
diff --git a/src/test-e2e/marketplace/create-marketplace-service-instance.po.ts b/src/test-e2e/marketplace/create-marketplace-service-instance.po.ts
index 993fed4acf..7be967f6d1 100644
--- a/src/test-e2e/marketplace/create-marketplace-service-instance.po.ts
+++ b/src/test-e2e/marketplace/create-marketplace-service-instance.po.ts
@@ -6,9 +6,17 @@ export class CreateMarketplaceServiceInstance extends Page {
 
   public stepper: CreateServiceInstanceStepper;
 
-  constructor(url = '/services/new/service?base-previous-redirect=%2Fservices%2Fnew') {
+  constructor(url = '/services/new/service') {
     super(url);
     this.stepper = new CreateServiceInstanceStepper();
   }
 
+  isActivePage() {
+    return super.isActivePage(true);
+  }
+
+  waitForPage() {
+    return super.waitForPage(undefined, true);
+  }
+
 }
diff --git a/src/test-e2e/marketplace/create-service-instance-e2e.spec.ts b/src/test-e2e/marketplace/create-service-instance-e2e.spec.ts
index 8c1d7d7ec3..b326fe3f48 100644
--- a/src/test-e2e/marketplace/create-service-instance-e2e.spec.ts
+++ b/src/test-e2e/marketplace/create-service-instance-e2e.spec.ts
@@ -29,10 +29,7 @@ describe('Create Service Instance', () => {
     createServiceInstance.waitForPage();
     createMarketplaceServiceInstance = createServiceInstance.selectMarketplace();
     servicesHelperE2E = new ServicesHelperE2E(e2eSetup, createMarketplaceServiceInstance);
-  });
-
-  it('- should reach create service instance page', () => {
-    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+    createMarketplaceServiceInstance.waitForPage();
   });
 
   describe('Long running tests - ', () => {
@@ -40,6 +37,8 @@ describe('Create Service Instance', () => {
     extendE2ETestTime(timeout);
 
     it('- should be able to create a service instance', () => {
+      expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+
       serviceInstanceName = servicesHelperE2E.createServiceInstanceName();
 
       servicesHelperE2E.createService(e2e.secrets.getDefaultCFEndpoint().services.publicService.name, serviceInstanceName);
@@ -51,16 +50,17 @@ describe('Create Service Instance', () => {
   });
 
   it('- should return user to Service summary when cancelled on CFOrgSpace selection', () => {
+    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
 
     // Select CF/Org/Space
     servicesHelperE2E.setCfOrgSpace();
     createMarketplaceServiceInstance.stepper.cancel();
 
     servicesWall.waitForPage();
-
   });
 
   it('- should return user to Service summary when cancelled on Service selection', () => {
+    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
 
     // Select CF/Org/Space
     servicesHelperE2E.setCfOrgSpace();
@@ -77,6 +77,7 @@ describe('Create Service Instance', () => {
   });
 
   it('- should return user to Service summary when cancelled on App binding selection', () => {
+    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
 
     // Select CF/Org/Space
     servicesHelperE2E.setCfOrgSpace();
@@ -97,6 +98,8 @@ describe('Create Service Instance', () => {
   });
 
   it('- should return user to Service summary when cancelled on service instance details', () => {
+    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+
     // Select CF/Org/Space
     servicesHelperE2E.setCfOrgSpace();
     createMarketplaceServiceInstance.stepper.next();
diff --git a/src/test-e2e/marketplace/create-service-instance-private-e2e.spec.ts b/src/test-e2e/marketplace/create-service-instance-private-e2e.spec.ts
index 35716683f9..3f81f5b3f0 100644
--- a/src/test-e2e/marketplace/create-service-instance-private-e2e.spec.ts
+++ b/src/test-e2e/marketplace/create-service-instance-private-e2e.spec.ts
@@ -28,10 +28,7 @@ describe('Create Service Instance of Private Service', () => {
     createServiceInstance.navigateTo();
     createServiceInstance.waitForPage();
     createMarketplaceServiceInstance = createServiceInstance.selectMarketplace();
-  });
-
-  it('- should reach create service instance page', () => {
-    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+    createMarketplaceServiceInstance.waitForPage();
   });
 
   describe('Long running tests - ', () => {
@@ -39,6 +36,8 @@ describe('Create Service Instance of Private Service', () => {
     extendE2ETestTime(timeout);
 
     it('- should be able to to create a service instance', () => {
+      expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+
       serviceInstanceName = servicesHelperE2E.createServiceInstanceName();
 
       servicesHelperE2E.createService(e2e.secrets.getDefaultCFEndpoint().services.privateService.name, serviceInstanceName, false);
@@ -51,6 +50,7 @@ describe('Create Service Instance of Private Service', () => {
   });
 
   it('- should return user to Service summary when cancelled on CFOrgSpace selection', () => {
+    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
 
     // Select CF/Org/Space
     servicesHelperE2E.setCfOrgSpace();
@@ -61,6 +61,7 @@ describe('Create Service Instance of Private Service', () => {
   });
 
   it('- should return user to Service summary when cancelled on Service selection', () => {
+    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
 
     // Select CF/Org/Space
     servicesHelperE2E.setCfOrgSpace();
@@ -77,6 +78,7 @@ describe('Create Service Instance of Private Service', () => {
   });
 
   it('- should not show service plan if wrong org/space are selected', () => {
+    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
 
     // Select CF/Org/Space
     servicesHelperE2E.setCfOrgSpace(e2e.secrets.getDefaultCFEndpoint().services.privateService.invalidOrgName,
diff --git a/src/test-e2e/marketplace/create-service-instance-space-scoped-e2e.spec.ts b/src/test-e2e/marketplace/create-service-instance-space-scoped-e2e.spec.ts
index 612e48cdb1..42a9a2f6c0 100644
--- a/src/test-e2e/marketplace/create-service-instance-space-scoped-e2e.spec.ts
+++ b/src/test-e2e/marketplace/create-service-instance-space-scoped-e2e.spec.ts
@@ -27,11 +27,7 @@ describe('Create Service Instance of Space Scoped Service', () => {
     createServiceInstance.waitForPage();
     createMarketplaceServiceInstance = createServiceInstance.selectMarketplace();
     servicesHelperE2E = new ServicesHelperE2E(e2eSetup, createMarketplaceServiceInstance);
-  });
-
-
-  it('- should reach create service instance page', () => {
-    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+    createMarketplaceServiceInstance.waitForPage();
   });
 
   describe('Long running tests - ', () => {
@@ -39,6 +35,8 @@ describe('Create Service Instance of Space Scoped Service', () => {
     extendE2ETestTime(timeout);
 
     it('- should be able to to create a service instance', () => {
+      expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+
       serviceInstanceName = servicesHelperE2E.createServiceInstanceName();
 
       servicesHelperE2E.createService(e2e.secrets.getDefaultCFEndpoint().services.spaceScopedService.name, serviceInstanceName);
@@ -50,6 +48,7 @@ describe('Create Service Instance of Space Scoped Service', () => {
   });
 
   it('- should not show service plan if wrong org/space are selected', () => {
+    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
 
     // Select CF/Org/Space
     servicesHelperE2E.setCfOrgSpace(e2e.secrets.getDefaultCFEndpoint().services.spaceScopedService.invalidOrgName,
diff --git a/src/test-e2e/marketplace/create-service-instance.po.ts b/src/test-e2e/marketplace/create-service-instance.po.ts
index ee3b61997e..a4cdc26f0d 100644
--- a/src/test-e2e/marketplace/create-service-instance.po.ts
+++ b/src/test-e2e/marketplace/create-service-instance.po.ts
@@ -1,10 +1,10 @@
-
+import {
+  SERVICE_INSTANCE_TYPES,
+} from '../../frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance.types';
 import { Page } from '../po/page.po';
 import { BaseCreateServiceInstanceStepper } from './base-create-service-instance-stepper.po';
 import { CreateMarketplaceServiceInstance } from './create-marketplace-service-instance.po';
-import {
-  SERVICE_INSTANCE_TYPES
-} from '../../frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance.types';
+
 
 export class CreateServiceInstance extends Page {
 
@@ -23,4 +23,12 @@ export class CreateServiceInstance extends Page {
     super(url);
   }
 
+  isActivePage() {
+    return super.isActivePage(true);
+  }
+
+  waitForPage() {
+    return super.waitForPage(undefined, true);
+  }
+
 }
diff --git a/src/test-e2e/marketplace/create-service-instances-bind-app-e2e.spec.ts b/src/test-e2e/marketplace/create-service-instances-bind-app-e2e.spec.ts
index 2608a7a66e..91eb24e945 100644
--- a/src/test-e2e/marketplace/create-service-instances-bind-app-e2e.spec.ts
+++ b/src/test-e2e/marketplace/create-service-instances-bind-app-e2e.spec.ts
@@ -30,16 +30,15 @@ describe('Create Service Instance with binding', () => {
     createServiceInstance.waitForPage();
     createMarketplaceServiceInstance = createServiceInstance.selectMarketplace();
     servicesHelperE2E = new ServicesHelperE2E(e2eSetup, createMarketplaceServiceInstance, servicesHelperE2E);
-  });
-
-  it('- should reach create service instance page', () => {
-    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+    createMarketplaceServiceInstance.waitForPage();
   });
 
   describe('Long running tests - ', () => {
     extendE2ETestTime(100000);
 
     it('- should be able to to create a service instance with binding', () => {
+      expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+
       serviceInstanceName = servicesHelperE2E.createServiceInstanceName();
 
       const servicesSecrets = e2e.secrets.getDefaultCFEndpoint().services;
diff --git a/src/test-e2e/marketplace/create-ups-service-instance.po.ts b/src/test-e2e/marketplace/create-ups-service-instance.po.ts
index 70801bb031..55c68241a7 100644
--- a/src/test-e2e/marketplace/create-ups-service-instance.po.ts
+++ b/src/test-e2e/marketplace/create-ups-service-instance.po.ts
@@ -10,4 +10,13 @@ export class CreateUserProvidedServiceInstance extends Page {
     super(url);
     this.stepper = new CreateServiceInstanceStepper();
   }
+
+  isActivePage() {
+    return super.isActivePage(true);
+  }
+
+  waitForPage() {
+    return super.waitForPage(undefined, true);
+  }
+
 }
diff --git a/src/test-e2e/marketplace/delete-service-instance-e2e.spec.ts b/src/test-e2e/marketplace/delete-service-instance-e2e.spec.ts
index 98300f1425..aa74438545 100644
--- a/src/test-e2e/marketplace/delete-service-instance-e2e.spec.ts
+++ b/src/test-e2e/marketplace/delete-service-instance-e2e.spec.ts
@@ -1,16 +1,16 @@
 import { e2e } from '../e2e';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../helpers/extend-test-helpers';
+import { ConfirmDialogComponent } from '../po/confirm-dialog';
+import { ListComponent } from '../po/list.po';
+import { MetaCardTitleType } from '../po/meta-card.po';
 import { CreateMarketplaceServiceInstance } from './create-marketplace-service-instance.po';
 import { CreateServiceInstance } from './create-service-instance.po';
 import { ServicesHelperE2E } from './services-helper-e2e';
 import { ServicesWallPage } from './services-wall.po';
-import { ConfirmDialogComponent } from '../po/confirm-dialog';
-import { MetaCardTitleType } from '../po/meta-card.po';
-import { ListComponent } from '../po/list.po';
 
 // Regression test for:
-// - Deleting a service instance in the services list will delete the service but the list incorerctly shows no services
+// - Deleting a service instance in the services list will delete the service but the list incorrectly shows no services
 describe('Delete Service Instance', () => {
   const createServiceInstance = new CreateServiceInstance();
   let createMarketplaceServiceInstance: CreateMarketplaceServiceInstance;
@@ -41,13 +41,12 @@ describe('Delete Service Instance', () => {
     createServiceInstance.waitForPage();
     createMarketplaceServiceInstance = createServiceInstance.selectMarketplace();
     servicesHelperE2E = new ServicesHelperE2E(e2eSetup, createMarketplaceServiceInstance);
+    createMarketplaceServiceInstance.waitForPage();
   });
 
-  it('should go to create service instance view', () => {
+  it('should be able to create a service instance', () => {
     expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
-  });
 
-  it('should be able to create a service instance', () => {
     const serviceInstanceName = servicesHelperE2E.createServiceInstanceName();
     names.push(serviceInstanceName);
     servicesHelperE2E.createService(e2e.secrets.getDefaultCFEndpoint().services.publicService.name, serviceInstanceName);
diff --git a/src/test-e2e/marketplace/delete-ups-service-instance-e2e.spec.ts b/src/test-e2e/marketplace/delete-ups-service-instance-e2e.spec.ts
index eff4c5be7e..112dec4037 100644
--- a/src/test-e2e/marketplace/delete-ups-service-instance-e2e.spec.ts
+++ b/src/test-e2e/marketplace/delete-ups-service-instance-e2e.spec.ts
@@ -1,13 +1,13 @@
 import { e2e } from '../e2e';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../helpers/extend-test-helpers';
-import { CreateServiceInstance } from './create-service-instance.po';
-import { ServicesHelperE2E } from './services-helper-e2e';
-import { ServicesWallPage } from './services-wall.po';
 import { ConfirmDialogComponent } from '../po/confirm-dialog';
-import { MetaCardTitleType } from '../po/meta-card.po';
 import { ListComponent } from '../po/list.po';
+import { MetaCardTitleType } from '../po/meta-card.po';
+import { CreateServiceInstance } from './create-service-instance.po';
 import { CreateUserProvidedServiceInstance } from './create-ups-service-instance.po';
+import { ServicesHelperE2E } from './services-helper-e2e';
+import { ServicesWallPage } from './services-wall.po';
 
 describe('Delete Service Instance (User Provided Service)', () => {
   const createServiceInstance = new CreateServiceInstance();
diff --git a/src/test-e2e/marketplace/edit-service-instance-e2e.spec.ts b/src/test-e2e/marketplace/edit-service-instance-e2e.spec.ts
index af583a4409..a169e8ab19 100644
--- a/src/test-e2e/marketplace/edit-service-instance-e2e.spec.ts
+++ b/src/test-e2e/marketplace/edit-service-instance-e2e.spec.ts
@@ -65,7 +65,10 @@ describe('Edit Service Instance', () => {
         menu.waitUntilNotShown();
 
         return browser.getCurrentUrl().then(url => {
-          expect(url.endsWith('edit')).toBeTruthy();
+          const query = url.indexOf('?');
+          const urlWithoutQuery = query >= 0 ? url.substring(0, query) : url;
+          expect(urlWithoutQuery.endsWith('edit')).toBeTruthy();
+
           servicesHelperE2E.setServicePlan(true);
           servicesHelperE2E.createServiceInstance.stepper.next();
 
diff --git a/src/test-e2e/marketplace/marketplace-create-service-instances-e2e.spec.ts b/src/test-e2e/marketplace/marketplace-create-service-instances-e2e.spec.ts
index d520f0da8f..a20621fcfb 100644
--- a/src/test-e2e/marketplace/marketplace-create-service-instances-e2e.spec.ts
+++ b/src/test-e2e/marketplace/marketplace-create-service-instances-e2e.spec.ts
@@ -4,6 +4,7 @@ import { e2e, E2ESetup } from '../e2e';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../helpers/extend-test-helpers';
 import { CreateMarketplaceServiceInstance } from './create-marketplace-service-instance.po';
+import { MarketplaceInstancesPage } from './marketplace-instances.po';
 import { MarketplaceSummaryPage } from './marketplace-summary.po';
 import { ServicesHelperE2E } from './services-helper-e2e';
 import { ServicesWallPage } from './services-wall.po';
@@ -11,6 +12,7 @@ import { ServicesWallPage } from './services-wall.po';
 describe('Service Instance from Marketplace', () => {
   let setup: E2ESetup;
   const servicesWall = new ServicesWallPage();
+  let servicesInstances: MarketplaceInstancesPage;
   const timeout = 60000;
   let serviceInstanceName: string;
 
@@ -29,7 +31,6 @@ describe('Service Instance from Marketplace', () => {
     beforeAll(() => init(setup, serviceName).then(res => {
       servicesHelperE2E = res.servicesHelper;
       marketplaceSummaryPage = res.summaryPage;
-
     }));
 
     beforeEach(() => {
@@ -37,10 +38,6 @@ describe('Service Instance from Marketplace', () => {
       marketplaceSummaryPage.waitForPage();
     });
 
-    it('- should have an Add Service Instance button', () => {
-      expect(marketplaceSummaryPage.getAddServiceInstanceButton().isPresent()).toBeTruthy();
-    });
-
     describe('Long running test', () => {
       extendE2ETestTime(timeout);
       it('- should be able to create a new service instance', () => {
@@ -66,10 +63,6 @@ describe('Service Instance from Marketplace', () => {
       marketplaceSummaryPage.waitForPage();
     });
 
-    it('- should have an Add Service Instance button', () => {
-      expect(marketplaceSummaryPage.getAddServiceInstanceButton().isPresent()).toBeTruthy();
-    });
-
     describe('Long running test', () => {
       extendE2ETestTime(timeout);
       it('- should be able to create a new service instance', () => {
@@ -95,11 +88,8 @@ describe('Service Instance from Marketplace', () => {
       marketplaceSummaryPage.waitForPage();
     });
 
-    it('- should have an Add Service Instance button', () => {
-      expect(marketplaceSummaryPage.getAddServiceInstanceButton().isPresent()).toBeTruthy();
-    });
-
     describe('Long running test', () => {
+
       extendE2ETestTime(timeout);
       it('- should be able to create a new service instance', () => {
         serviceInstanceName = servicesHelperE2E.createServiceInstanceName();
@@ -109,48 +99,46 @@ describe('Service Instance from Marketplace', () => {
 
     afterAll(() => servicesHelperE2E.cleanUpServiceInstance(serviceInstanceName));
   });
-});
-
-function createService(
-  marketplaceSummaryPage: MarketplaceSummaryPage,
-  servicesHelperE2E: ServicesHelperE2E,
-  serviceName: string,
-  servicesWall: ServicesWallPage,
-  serviceInstanceName: string
-) {
-  const button = marketplaceSummaryPage.header.getIconButton('add');
-  expect(button).toBeDefined();
-  button.then(bt => bt.click());
-  browser.getCurrentUrl().then(url => {
-    expect(url.endsWith('create?isSpaceScoped=false')).toBeTruthy();
-    // Proceed to create a service instance
-    servicesHelperE2E.createService(serviceName, serviceInstanceName, true);
-
-    servicesWall.waitForPage();
-
-    servicesHelperE2E.getServiceCardWithTitle(servicesWall.serviceInstancesList, serviceInstanceName);
-
-  });
-}
-
-function init(
-  setup: E2ESetup,
-  serviceName: string,
-  spaceScoped = false
-) {
-  const defaultCf = e2e.secrets.getDefaultCFEndpoint();
-  const endpointGuid = e2e.helper.getEndpointGuid(e2e.info, defaultCf.name);
-
-  const servicesHelperE2E = new ServicesHelperE2E(setup);
-  return servicesHelperE2E.fetchServices(endpointGuid).then(response => {
-    serviceName = e2e.secrets.getDefaultCFEndpoint().services.publicService.name;
-    const service = response.resources.find(e => e.entity.label === serviceName);
-    const serviceGuid = service.metadata.guid;
-    servicesHelperE2E.setCreateServiceInstance(
-      new CreateMarketplaceServiceInstance('/marketplace/' + endpointGuid + '/' + serviceGuid +
-        '/create?isSpaceScoped=' + (spaceScoped ? 'true' : 'false')));
-    const marketplaceSummaryPage = new MarketplaceSummaryPage(endpointGuid, serviceGuid);
-    return { servicesHelper: servicesHelperE2E, summaryPage: marketplaceSummaryPage };
-  });
-}
 
+  function createService(
+    marketplaceSummaryPage: MarketplaceSummaryPage,
+    servicesHelperE2E: ServicesHelperE2E,
+    serviceName: string,
+    servicesWall: ServicesWallPage,
+    serviceInstanceName: string
+  ) {
+    expect(marketplaceSummaryPage.getAddServiceInstanceButton().isPresent()).toBeTruthy();
+    marketplaceSummaryPage.getAddServiceInstanceButton().click();
+    servicesHelperE2E.createServiceInstance.waitForPage();
+    browser.getCurrentUrl().then(url => {
+      expect(url.indexOf('isSpaceScoped=false') >= 0).toBeTruthy();
+      // Proceed to create a service instance
+      servicesHelperE2E.createService(serviceName, serviceInstanceName, true);
+
+      servicesInstances.waitForPage();
+      servicesInstances.list.header.setSearchText(serviceInstanceName);
+      servicesInstances.list.table.findRow('name', serviceInstanceName, true);
+    });
+  }
+
+  function init(
+    setup: E2ESetup,
+    serviceName: string,
+  ) {
+    const defaultCf = e2e.secrets.getDefaultCFEndpoint();
+    const endpointGuid = e2e.helper.getEndpointGuid(e2e.info, defaultCf.name);
+
+    const servicesHelperE2E = new ServicesHelperE2E(setup);
+    return servicesHelperE2E.fetchServices(endpointGuid).then(response => {
+      serviceName = e2e.secrets.getDefaultCFEndpoint().services.publicService.name;
+      const service = response.resources.find(e => e.entity.label === serviceName);
+      const serviceGuid = service.metadata.guid;
+      servicesHelperE2E.setCreateServiceInstance(
+        new CreateMarketplaceServiceInstance('/marketplace/' + endpointGuid + '/' + serviceGuid + '/create')
+      );
+      servicesInstances = new MarketplaceInstancesPage(endpointGuid, serviceGuid);
+      const marketplaceSummaryPage = new MarketplaceSummaryPage(endpointGuid, serviceGuid);
+      return { servicesHelper: servicesHelperE2E, summaryPage: marketplaceSummaryPage };
+    });
+  }
+});
diff --git a/src/test-e2e/marketplace/marketplace-instances.po.ts b/src/test-e2e/marketplace/marketplace-instances.po.ts
new file mode 100644
index 0000000000..7dc3791d3e
--- /dev/null
+++ b/src/test-e2e/marketplace/marketplace-instances.po.ts
@@ -0,0 +1,11 @@
+import { ListComponent } from '../po/list.po';
+import { Page } from '../po/page.po';
+
+export class MarketplaceInstancesPage extends Page {
+  public list = new ListComponent();
+
+  constructor(cfGuid: string, serviceGuid: string) {
+    super(`/marketplace/${cfGuid}/${serviceGuid}/instances`);
+  }
+
+}
diff --git a/src/test-e2e/marketplace/marketplace-summary-e2e.spec.ts b/src/test-e2e/marketplace/marketplace-summary-e2e.spec.ts
index c48a61a7eb..c3aac96883 100644
--- a/src/test-e2e/marketplace/marketplace-summary-e2e.spec.ts
+++ b/src/test-e2e/marketplace/marketplace-summary-e2e.spec.ts
@@ -1,7 +1,8 @@
-import { MarketplaceSummaryPage } from './marketplace-summary.po';
-import { ConsoleUserType } from '../helpers/e2e-helpers';
-import { e2e } from '../e2e';
 import { browser } from 'protractor';
+
+import { e2e } from '../e2e';
+import { ConsoleUserType } from '../helpers/e2e-helpers';
+import { MarketplaceSummaryPage } from './marketplace-summary.po';
 import { ServicesHelperE2E } from './services-helper-e2e';
 
 describe('Marketplace Summary', () => {
@@ -56,7 +57,7 @@ describe('Marketplace Summary', () => {
       expect(button).toBeDefined();
       button.then(bt => bt.click());
       browser.getCurrentUrl().then(url => {
-        expect(url.endsWith('create?isSpaceScoped=false')).toBeTruthy();
+        expect(url.indexOf('create?isSpaceScoped=false') >= 0).toBeTruthy();
       });
     });
   });
diff --git a/src/test-e2e/marketplace/marketplace-summary.po.ts b/src/test-e2e/marketplace/marketplace-summary.po.ts
index 1f1ffe0c5f..1fc186e42d 100644
--- a/src/test-e2e/marketplace/marketplace-summary.po.ts
+++ b/src/test-e2e/marketplace/marketplace-summary.po.ts
@@ -23,4 +23,5 @@ export class MarketplaceSummaryPage extends Page {
     return element(by.name('add-service-instance'));
   }
 
+
 }
diff --git a/src/test-e2e/marketplace/services-helper-e2e.ts b/src/test-e2e/marketplace/services-helper-e2e.ts
index 7e358eb5f8..00186196e9 100644
--- a/src/test-e2e/marketplace/services-helper-e2e.ts
+++ b/src/test-e2e/marketplace/services-helper-e2e.ts
@@ -4,7 +4,7 @@ import { IServiceInstance } from '../../frontend/packages/cloud-foundry/src/cf-a
 import { CFResponse, createEmptyCfResponse } from '../../frontend/packages/cloud-foundry/src/store/types/cf-api.types';
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { e2e, E2ESetup } from '../e2e';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { CFRequestHelpers } from '../helpers/cf-request-helpers';
 import { E2EHelpers } from '../helpers/e2e-helpers';
 import { ListComponent } from '../po/list.po';
@@ -65,7 +65,7 @@ export class ServicesHelperE2E {
 
   deleteServiceInstance = (cfGuid: string, serviceGuid: string, userProvided = false): promise.Promise<CFResponse> => {
     const id = `${cfGuid}:${serviceGuid}`;
-    const url = userProvided ?`user_provided_service_instances/${serviceGuid}?async=false&recursive=true` : `service_instances/${serviceGuid}?async=false&recursive=true`;
+    const url = userProvided ? `user_provided_service_instances/${serviceGuid}?async=false&recursive=true` : `service_instances/${serviceGuid}?async=false&recursive=true`;
     return this.cfRequestHelper.sendCfDelete(
       cfGuid,
       url
diff --git a/src/test-e2e/marketplace/services-wall-e2e.spec.ts b/src/test-e2e/marketplace/services-wall-e2e.spec.ts
index 1fa6c985d8..398471326f 100644
--- a/src/test-e2e/marketplace/services-wall-e2e.spec.ts
+++ b/src/test-e2e/marketplace/services-wall-e2e.spec.ts
@@ -128,8 +128,11 @@ describe('Service Instances Wall', () => {
         expect(editMenuItem.getText()).toEqual('Edit');
         expect(editMenuItem.isEnabled()).toBeTruthy();
         editMenuItem.click();
+
         browser.getCurrentUrl().then(url => {
-          expect(url.endsWith('edit')).toBeTruthy();
+          const query = url.indexOf('?');
+          const urlWithoutQuery = query >= 0 ? url.substring(0, query) : url;
+          expect(urlWithoutQuery.endsWith('edit')).toBeTruthy();
         });
         const createMarketplaceServiceInstance = new CreateMarketplaceServiceInstance();
         createMarketplaceServiceInstance.stepper.cancel();
diff --git a/src/test-e2e/marketplace/services-wall.po.ts b/src/test-e2e/marketplace/services-wall.po.ts
index 9f1229751a..c61219b05c 100644
--- a/src/test-e2e/marketplace/services-wall.po.ts
+++ b/src/test-e2e/marketplace/services-wall.po.ts
@@ -1,4 +1,4 @@
-import { ElementArrayFinder, ElementFinder, promise, element, by } from 'protractor';
+import { by, element, ElementArrayFinder, ElementFinder, promise } from 'protractor';
 
 import { ListComponent } from '../po/list.po';
 import { MetaCard, MetaCardTitleType } from '../po/meta-card.po';
@@ -43,4 +43,12 @@ export class ServicesWallPage extends Page {
       applicationsAttached: items[3].value,
     }));
   }
+
+  isActivePage() {
+    return super.isActivePage(true);
+  }
+
+  waitForPage() {
+    return super.waitForPage(undefined, true);
+  }
 }
diff --git a/src/test-e2e/po/invite-users-stepper.po.ts b/src/test-e2e/po/invite-users-stepper.po.ts
index 5945d300c0..5530ba09de 100644
--- a/src/test-e2e/po/invite-users-stepper.po.ts
+++ b/src/test-e2e/po/invite-users-stepper.po.ts
@@ -1,6 +1,6 @@
 import { by, promise } from 'protractor';
 
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { E2EHelpers } from '../helpers/e2e-helpers';
 import { RadioGroup } from './radio-group.po';
 import { SnackBarPo } from './snackbar.po';
diff --git a/src/test-e2e/po/page.po.ts b/src/test-e2e/po/page.po.ts
index 533bc147cd..c7bc7d919a 100644
--- a/src/test-e2e/po/page.po.ts
+++ b/src/test-e2e/po/page.po.ts
@@ -43,13 +43,11 @@ export abstract class Page {
     return browser.get(this.navLink);
   }
 
-  isActivePage(): promise.Promise<boolean> {
-    return browser.getCurrentUrl().then(url => url === this.getUrl());
-  }
-
-  isActivePageOrChildPage(): promise.Promise<boolean> {
+  isActivePage(ignoreQuery = false): promise.Promise<boolean> {
     return browser.getCurrentUrl().then(url => {
-      return url.startsWith(this.getUrl());
+      const browserUrl = ignoreQuery ? this.stripQuery(url) : url;
+      const expectedUrl = ignoreQuery ? this.stripQuery(this.getUrl()) : this.getUrl();
+      return browserUrl === expectedUrl;
     });
   }
 
@@ -62,9 +60,15 @@ export abstract class Page {
     });
   }
 
-  waitForPage(timeout = 20000) {
+  waitForPage(timeout = 20000, ignoreQuery = false) {
     expect(this.navLink.startsWith('/')).toBeTruthy('navLink should start with a /');
-    return browser.wait(until.urlIs(this.getUrl()), timeout, `Failed to wait for page with navlink '${this.navLink}'`);
+    if (ignoreQuery) {
+      return browser.wait(() => {
+        return this.isActivePage(true);
+      });
+    } else {
+      return browser.wait(until.urlIs(this.getUrl()), timeout, `Failed to wait for page with navlink '${this.navLink}'`);
+    }
   }
 
   waitForPageDataLoaded(timeout = 20000) {
@@ -82,4 +86,9 @@ export abstract class Page {
     browser.wait(until.urlContains(browser.baseUrl + this.navLink + childPath), 20000);
   }
   private getUrl = () => browser.baseUrl + this.navLink;
+
+  private stripQuery(url: string): string {
+    const queryStarts = url.indexOf('?');
+    return queryStarts >= 0 ? url.substring(0, queryStarts) : url;
+  }
 }
diff --git a/src/tsconfig.json b/src/tsconfig.json
index acd4416c47..e1e22ea606 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -30,8 +30,10 @@
     ],
     "preserveSymlinks": true,
     "paths": {
+      "@stratosui/core": ["frontend/packages/core/src/public-api.ts"],
       "@stratosui/store": ["frontend/packages/store/src/public-api.ts"],
-      "@stratosui/store/testing": ["frontend/packages/store/testing/public-api.ts"]
-    }    
+      "@stratosui/store/testing": ["frontend/packages/store/testing/public-api.ts"],
+      "@example/extensions": ["frontend/packages/example-extensions/src/public-api.ts"]
+    }
   }
-}
\ No newline at end of file
+}