diff --git a/.fossa.yml b/.fossa.yml
index cce2464e24ddf77481d49d537fb793413576d55a..c7145be402dcdc35f387d347cccbaaeffa516430 100644
--- a/.fossa.yml
+++ b/.fossa.yml
@@ -16,6 +16,10 @@ analyze:
       type: mvn
       target: unit-core/pom.xml
       path: .
+    - name: unit-core-plus
+      type: mvn
+      target: unit-core-plus/pom.xml
+      path: .
     - name: unit-gke
       type: mvn
       target: provider/unit-gc/unit-gke/pom.xml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5113e1d724db6da7f6454cae8d7720a4be03d993..26d71193cd906796ba5cd7136050c949c7cc4ddf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,7 +64,12 @@ include:
   - project: "osdu/platform/ci-cd-pipelines"
     file: "cloud-providers/azure.yml"
 
+  - project: "osdu/platform/ci-cd-pipelines"
+    file: "cloud-providers/core-global.yml"
+
   - local: "devops/gc/pipeline/override-stages.yml"
+  
+  - local: "devops/core-plus/pipeline/override-stages.yml"
 
 azure_containerize:
   variables:
diff --git a/devops/core-plus/deploy/Chart.yaml b/devops/core-plus/deploy/Chart.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..99dde5532e7a0722fa6df2df5c644a16a9b9dee0
--- /dev/null
+++ b/devops/core-plus/deploy/Chart.yaml
@@ -0,0 +1,24 @@
+apiVersion: v2
+name: core-plus-unit-deploy
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.19.0"
diff --git a/devops/core-plus/deploy/README.md b/devops/core-plus/deploy/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..69c8d6c6f285a8092d7b056eb0c2ce0aa9361829
--- /dev/null
+++ b/devops/core-plus/deploy/README.md
@@ -0,0 +1,89 @@
+<!--- Deploy -->
+
+# Deploy helm chart
+
+## Introduction
+
+This chart bootstraps a deployment on a [Kubernetes](https://kubernetes.io) cluster using [Helm](https://helm.sh) package manager.
+
+## Prerequisites
+
+The code was tested on **Kubernetes cluster** (v1.21.11) with **Istio** (1.12.6)
+> It is possible to use other versions, but it hasn't been tested
+
+### Operation system
+
+The code works in Debian-based Linux (Debian 10 and Ubuntu 20.04) and Windows WSL 2. Also, it works but is not guaranteed in Google Cloud Shell. All other operating systems, including macOS, are not verified and supported.
+
+### Packages
+
+Packages are only needed for installation from a local computer.
+
+- **HELM** (version: v3.7.1 or higher) [helm](https://helm.sh/docs/intro/install/)
+- **Kubectl** (version: v1.21.0 or higher) [kubectl](https://kubernetes.io/docs/tasks/tools/#kubectl)
+
+## Installation
+
+First you need to set variables in **values.yaml** file using any code editor. Some of the values are prefilled, but you need to specify some values as well. You can find more information about them below.
+
+### Global variables
+
+| Name | Description | Type | Default |Required |
+|------|-------------|------|---------|---------|
+**global.domain** | your domain for the external endpoint, ex `example.com` | string | - | yes
+**global.onPremEnabled** | whether on-prem is enabled | boolean | false | yes
+**global.limitsEnabled** | whether CPU and memory limits are enabled | boolean | true | yes
+
+### Configmap variables
+
+| Name | Description | Type | Default |Required |
+|------|-------------|------|---------|---------|
+**data.logLevel** | logging level | string | ERROR | yes
+**data.entitlementsHost** | entitlements service host address | string | `http://entitlements` | yes
+
+### Deployment variables
+
+| Name | Description | Type | Default |Required |
+|------|-------------|------|---------|---------|
+**data.requestsCpu** | amount of requested CPU | string | 10m | yes
+**data.requestsMemory** | amount of requested memory| string | 350Mi | yes
+**data.limitsCpu** | CPU limit | string | 1 | only if `global.limitsEnabled` is true
+**data.limitsMemory** | memory limit | string | 1G | only if `global.limitsEnabled` is true
+**data.serviceAccountName** | name of your service account | string | unit | yes
+**data.imagePullPolicy** | when to pull image | string | IfNotPresent | yes
+**data.image** | service image | string | - | yes
+
+### Config variables
+
+| Name | Description | Type | Default |Required |
+|------|-------------|------|---------|---------|
+
+**conf.appName** | name of the app | string | `unit` | yes
+**conf.configmap** | configmap to be used | string | `unit-config` | yes
+
+### Istio variables
+
+| Name | Description | Type | Default |Required |
+|------|-------------|------|---------|---------|
+**istio.proxyCPU** | CPU request for Envoy sidecars | string | `10m` | yes
+**istio.proxyCPULimit** | CPU limit for Envoy sidecars | string | `500m` | yes
+**istio.proxyMemory** | memory request for Envoy sidecars | string | `100Mi` | yes
+**istio.proxyMemoryLimit** | memory limit for Envoy sidecars | string | `512Mi` | yes
+
+### Install the helm chart
+
+Run this command from within this directory:
+
+```console
+helm install gc-unit-deploy .
+```
+
+## Uninstalling the Chart
+
+To uninstall the helm deployment:
+
+```console
+helm uninstall gc-unit-deploy
+```
+
+[Move-to-Top](#deploy-helm-chart)
diff --git a/devops/core-plus/deploy/templates/unit-deploy.yml b/devops/core-plus/deploy/templates/unit-deploy.yml
new file mode 100644
index 0000000000000000000000000000000000000000..71c21539794fd67699d74cd79916b7cb8f47dcac
--- /dev/null
+++ b/devops/core-plus/deploy/templates/unit-deploy.yml
@@ -0,0 +1,54 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: {{ .Values.conf.appName | quote }}
+    type: helper
+    source: java
+  name: {{ .Values.conf.appName | quote }}
+  namespace: {{ .Release.Namespace | quote }}
+spec:
+  selector:
+    matchLabels:
+      app: {{ .Values.conf.appName | quote }}
+  replicas: {{ .Values.conf.replicas }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.conf.appName | quote }}
+      annotations:
+        rollme: {{ randAlphaNum 5 | quote }}
+        sidecar.istio.io/proxyCPU: {{ .Values.istio.proxyCPU | quote }}
+        sidecar.istio.io/proxyMemory: {{ .Values.istio.proxyMemory | quote }}
+        sidecar.istio.io/proxyCPULimit: {{ .Values.istio.proxyCPULimit | quote }}
+        sidecar.istio.io/proxyMemoryLimit: {{ .Values.istio.proxyMemoryLimit | quote }}
+    spec:
+      containers:
+      - name: {{ .Values.conf.appName | quote }}
+        image: {{ .Values.data.image | quote }}
+        imagePullPolicy: {{ .Values.data.imagePullPolicy | quote }}
+        envFrom:
+        - configMapRef:
+            name: {{ .Values.conf.configmap | quote }}
+        securityContext:
+          allowPrivilegeEscalation: false
+          runAsNonRoot: true
+        ports:
+        - containerPort: 8080
+        livenessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: api/unit/_ah/liveness_check
+            port: 8080
+          initialDelaySeconds: 120
+          periodSeconds: 10
+        resources:
+          requests:
+            cpu: {{ .Values.data.requestsCpu | quote }}
+            memory: {{ .Values.data.requestsMemory | quote }}
+          {{- if .Values.global.limitsEnabled }}
+          limits:
+            cpu: {{ .Values.data.limitsCpu | quote }}
+            memory: {{ .Values.data.limitsMemory | quote }}
+          {{- end }}
+      serviceAccountName: {{ .Values.data.serviceAccountName | quote }}
diff --git a/devops/core-plus/deploy/templates/unit-service.yml b/devops/core-plus/deploy/templates/unit-service.yml
new file mode 100644
index 0000000000000000000000000000000000000000..567a2e3676a143daf2e2e6f10760d7afc5378d54
--- /dev/null
+++ b/devops/core-plus/deploy/templates/unit-service.yml
@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.conf.appName | quote }}
+  annotations:
+  {{- if not .Values.global.onPremEnabled }}
+    cloud.google.com/neg: '{"ingress": true}'
+  {{- end }}
+  namespace: {{ .Release.Namespace | quote }}
+  labels:
+    app: {{ .Values.conf.appName | quote }}
+    service: {{ .Values.conf.appName | quote }}
+spec:
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 8080
+      name: http
+  selector:
+    app: {{ .Values.conf.appName | quote }}
diff --git a/devops/core-plus/deploy/templates/unit-serviceaccount.yaml b/devops/core-plus/deploy/templates/unit-serviceaccount.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..eec72f12889eec74d3de43ae6527a860bcd876ea
--- /dev/null
+++ b/devops/core-plus/deploy/templates/unit-serviceaccount.yaml
@@ -0,0 +1,7 @@
+{{- if .Values.global.onPremEnabled }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Values.data.serviceAccountName | quote }}
+  namespace: {{ .Release.Namespace | quote }}
+{{- end }}
diff --git a/devops/core-plus/deploy/templates/unit-variables.yml b/devops/core-plus/deploy/templates/unit-variables.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3c2b1223b2c3f2c07e30783b545c6e41c029987e
--- /dev/null
+++ b/devops/core-plus/deploy/templates/unit-variables.yml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    app: {{ .Values.conf.appName | quote }}
+  name:  {{ .Values.conf.configmap | quote }}
+  namespace: {{ .Release.Namespace | quote }}
+data:
+  LOG_LEVEL: {{ .Values.data.logLevel | quote }}
+  ENTITLEMENTS_HOST: {{ .Values.data.entitlementsHost | quote }}
diff --git a/devops/core-plus/deploy/templates/unit-virtual-service.yml b/devops/core-plus/deploy/templates/unit-virtual-service.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d5abe8e83b368197afc94ae49dfa8e097cb5e4db
--- /dev/null
+++ b/devops/core-plus/deploy/templates/unit-virtual-service.yml
@@ -0,0 +1,25 @@
+apiVersion: networking.istio.io/v1alpha3
+kind: VirtualService
+metadata:
+  name: {{ .Values.conf.appName | quote }}
+  namespace: {{ .Release.Namespace | quote }}
+spec:
+  hosts:
+    {{- if and .Values.global.domain .Values.global.onPremEnabled }}
+    - {{ printf "osdu.%s" .Values.global.domain | quote }}
+    {{- else if .Values.global.domain }}
+    - {{ .Values.global.domain | quote }}
+    {{- else }}
+    - "*"
+    {{- end }}
+  gateways:
+    - service-gateway
+  http:
+    - match:
+        - uri:
+            prefix: "/api/unit"
+      route:
+        - destination:
+            port:
+              number: 80
+            host:  {{ printf "%s.%s.svc.cluster.local" .Values.conf.appName .Release.Namespace | quote }}
diff --git a/devops/core-plus/deploy/values.yaml b/devops/core-plus/deploy/values.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..672caa562f2d2f053cc3aa4cc3eeece4a170b16c
--- /dev/null
+++ b/devops/core-plus/deploy/values.yaml
@@ -0,0 +1,30 @@
+# Default values for unit-deploy.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+global:
+  domain: ""
+  onPremEnabled: false
+  limitsEnabled: true
+
+data:
+  logLevel: "ERROR"
+  entitlementsHost: "http://entitlements"
+  requestsCpu: "5m"
+  requestsMemory: "275Mi"
+  limitsCpu: "1"
+  limitsMemory: "1G"
+  serviceAccountName: "unit"
+  imagePullPolicy: "IfNotPresent"
+  image: ""
+
+conf:
+  appName: "unit"
+  configmap: "unit-config"
+  replicas: 1
+
+istio:
+  proxyCPU: "5m"
+  proxyCPULimit: "500m"
+  proxyMemory: "50Mi"
+  proxyMemoryLimit: "512Mi"
diff --git a/devops/core-plus/pipeline/override-stages.yml b/devops/core-plus/pipeline/override-stages.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f396e8e375663fc96f3e097e1165e0ce8aa83f01
--- /dev/null
+++ b/devops/core-plus/pipeline/override-stages.yml
@@ -0,0 +1,12 @@
+variables:
+  CORE_SERVICE: unit
+  CORE_INT_TEST_TYPE: python
+  CORE_BAREMETAL_PYTHON_INT_TEST_SUBDIR: testing/unit_test_baremetal
+
+core-containerize-gitlab:
+  needs:
+    - "compile-and-unit-test"
+    
+gc-baremetal-test-python:
+  variables:
+    VIRTUAL_SERVICE_HOST_NAME: $OSDU_BAREMETAL_UNIT_HOSTNAME
diff --git a/pom.xml b/pom.xml
index 79a7c0606ccc4c448b217877d6ecfc0b0d420468..87db235a897d05e7a8013c1339bfa936e6ce5608 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
 
     <modules>
         <module>unit-core</module>
+        <module>unit-core-plus</module>
         <module>provider/unit-gc/unit-gke</module>
         <module>provider/unit-azure/unit-aks</module>
         <module>provider/unit-aws</module>
diff --git a/provider/unit-aws/.gitignore b/provider/unit-aws/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..00d2ab71ddbd82cb0db5e0db90650628a231e318
--- /dev/null
+++ b/provider/unit-aws/.gitignore
@@ -0,0 +1,2 @@
+/.apt_generated/
+/.apt_generated_tests/
diff --git a/provider/unit-azure/unit-aks/.gitignore b/provider/unit-azure/unit-aks/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..00d2ab71ddbd82cb0db5e0db90650628a231e318
--- /dev/null
+++ b/provider/unit-azure/unit-aks/.gitignore
@@ -0,0 +1,2 @@
+/.apt_generated/
+/.apt_generated_tests/
diff --git a/provider/unit-gc/unit-gke/.gitignore b/provider/unit-gc/unit-gke/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..00d2ab71ddbd82cb0db5e0db90650628a231e318
--- /dev/null
+++ b/provider/unit-gc/unit-gke/.gitignore
@@ -0,0 +1,2 @@
+/.apt_generated/
+/.apt_generated_tests/
diff --git a/provider/unit-ibm/unit-ocp/.gitignore b/provider/unit-ibm/unit-ocp/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..00d2ab71ddbd82cb0db5e0db90650628a231e318
--- /dev/null
+++ b/provider/unit-ibm/unit-ocp/.gitignore
@@ -0,0 +1,2 @@
+/.apt_generated/
+/.apt_generated_tests/
diff --git a/testing/unit_test_baremetal/jwt_client.py b/testing/unit_test_baremetal/jwt_client.py
index f580bb09a38adf5bd5539f8916775e87ef666041..201e8ef590c1b39cb1983060910c4fab5cb04f98 100644
--- a/testing/unit_test_baremetal/jwt_client.py
+++ b/testing/unit_test_baremetal/jwt_client.py
@@ -22,7 +22,7 @@ import requests
 
 TEST_OPENID_PROVIDER_CLIENT_ID = os.environ["TEST_OPENID_PROVIDER_CLIENT_ID"]
 TEST_OPENID_PROVIDER_URL = os.environ["TEST_OPENID_PROVIDER_URL"]
-TEST_OPENID_PROVIDER_CLIENT_SECRET = os.environ["GC_OPENID_PROVIDER_CLIENT_SECRET"]
+TEST_OPENID_PROVIDER_CLIENT_SECRET = os.environ["TEST_OPENID_PROVIDER_CLIENT_SECRET"]
 
 
 def get_id_token():
diff --git a/unit-core-plus/.gitignore b/unit-core-plus/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..00d2ab71ddbd82cb0db5e0db90650628a231e318
--- /dev/null
+++ b/unit-core-plus/.gitignore
@@ -0,0 +1,2 @@
+/.apt_generated/
+/.apt_generated_tests/
diff --git a/unit-core-plus/.vscode/settings.json b/unit-core-plus/.vscode/settings.json
new file mode 100644
index 0000000000000000000000000000000000000000..e0f15db2eb22b5d618150277e48b741f8fdd277a
--- /dev/null
+++ b/unit-core-plus/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "automatic"
+}
\ No newline at end of file
diff --git a/unit-core-plus/README.md b/unit-core-plus/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..8df788a681ede885440c3c14cfc1a66e70aed2f8
--- /dev/null
+++ b/unit-core-plus/README.md
@@ -0,0 +1,200 @@
+# Unit Service
+
+The Unit service provides dimension/measurement and unit definitions. Given two unit definitions, the service also offers conversion parameters in two different parameterizations.
+
+## Getting Started
+
+These instructions will get you a copy of the project up and running on your local machine for development and testing purposes. See deployment for notes on how to deploy the project on a live system.
+
+### Prerequisites
+
+- [Maven 3.8.0+](https://maven.apache.org/download.cgi)
+- [AdoptOpenJDK17](https://adoptopenjdk.net/)
+- [Lombok 1.18 or later](https://projectlombok.org/setup/maven)
+
+### Installation
+
+- Setup Apache Maven
+- Setup AdoptOpenJDK
+- Setup GCloud SDK
+- Install Eclipse (or other IDE) to run applications
+- Set up environment variables for Apache Maven and AdoptOpenJDK. For example M2_HOME, JAVA_HOME, etc.
+- Add a configuration for build project in Eclipse(or other IDE)
+
+### Run Locally
+
+| name | value | description | sensitive? | source |
+| ---  | ---   | ---         | ---        | ---    |
+| `UNIT_CATALOG_FILENAME` | ex `/mnt/unit_catalogs/unit_catalog_v2.json` | File location of the unit catalog | no | - |
+| `LOG_PREFIX` | `service` | Logging prefix | no | - |
+| `SERVER_SERVLET_CONTEXPATH` | `/api/unit/` | CRS conversion service context path | no | - |
+| `ENTITLEMENT_URL` | ex `https://entitlements.com/entitlements/v1` | Entitlements API endpoint | no | output of infrastructure deployment |
+
+Check that maven is installed:
+
+```bash
+$ mvn --version
+Apache Maven 3.8.0
+Maven home: /usr/share/maven
+Java version: 17 vendor: AdoptOpenJDK, runtime: /usr/lib/jvm/jdk17/jre
+...
+```
+
+You may need to configure access to the remote maven repository that holds the OSDU dependencies. This file should live within `~/.mvn/community-maven.settings.xml`:
+
+```bash
+$ cat ~/.m2/settings.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <servers>
+        <server>
+            <id>community-maven-via-private-token</id>
+            <!-- Treat this auth token like a password. Do not share it with anyone, including Microsoft support. -->
+            <!-- The generated token expires on or before 11/14/2019 -->
+             <configuration>
+              <httpHeaders>
+                  <property>
+                      <name>Private-Token</name>
+                      <value>${env.COMMUNITY_MAVEN_TOKEN}</value>
+                  </property>
+              </httpHeaders>
+             </configuration>
+        </server>
+    </servers>
+</settings>
+```
+
+- Navigate to Unit service's root folder and run:
+
+```bash
+mvn clean install   
+```
+
+- If you wish to build the project without running tests
+
+```bash
+mvn clean install -DskipTests
+```
+
+After configuring your environment as specified above, you can follow these steps to build and run the application. These steps should be invoked from the *repository root.*
+
+```bash
+cd provider/unit-gc/unit-gke && mvn spring-boot:run
+```
+
+## Testing
+
+### Running E2E Tests
+
+#### Folder structure
+
+testing/  
+
+- unit_test_core/  
+  - ...
+- unit_test_$PROVIDER_NAME/  
+  - jwt_client.py  
+  - run_test.py  
+
+This integration test uses a swagger generated Python client to test a
+deployed unit-service. The source is located in this repository
+```./api_spec/unit_service_openapi.json```.
+
+The python client code is automatically generated. The latest online version (May 2018)
+created incorrect impost statements for cyclic class references. Therefore the current
+code is generated using [swagger-codegen-cli-2.2.3.jar](https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.2.3/swagger-codegen-cli-2.2.3.jar).
+The command to create the python code is:  
+Linux
+
+```bash
+cd testing
+java -jar ~/swagger-codegen-cli-2.2.3.jar generate -i unit_test_core/api_spec/unit_service_openapi.json -l python -o unit_test_core/v2
+```
+
+Windows
+
+```bat
+cd testing
+java -jar %UserProfile%\swagger-codegen-cli-2.2.3.jar generate -i unit_test_core\api_spec\unit_service_openapi_v2.json -l python -o unit_test_core\v2
+```
+
+#### Environment
+
+The following parameters are expected as environment variables:
+
+**Auth provider (catalog_test_gc/jwt_client.py)**
+
+| Variable | Contents |
+|----------|----------|
+| INTEGRATION_TESTER | go to the Cloud provider environment example google IAM & admin console, navigate to Service accounts to create a key and download the account info file. |
+
+**Tests core (unit_test_core/constants.py)**
+
+| Variable | Contents |
+|----------|----------|
+| BASE_URL | e.g. /api/unit |
+| VIRTUAL_SERVICE_HOST_NAME | e.g. az-osdu1.evd.csp.slb.com |
+| MY_TENANT | e.g. opendes |
+
+**Entitlements configuration for integration accounts**
+
+| INTEGRATION_TESTER |
+| ---  |
+| users<br/>service.entitlements.user<br/>data.test1<br/>data.integration.test<br/>users@{tenant1}@{domain}.com |
+
+#### Building/running
+
+Go to the provider folder:
+
+```bash
+cd unit_test_$PROVIDER_NAME/ # e.g. unit_test_gc
+```
+
+To set up a virtual environment:
+
+```bash
+virtualenv venv
+```
+
+To activate the venv:
+
+```bash
+venv\Scripts\activate (on Windows)
+source venv/bin/activate (on Linux)
+```
+
+Install runtime dependencies in venv
+
+```bash
+python3 -m pip install -r requirements.txt
+```
+
+To run:
+
+```bash
+python3 run_test.py
+```
+
+## Deployment
+
+Please follow cloud providers documentation. 
+
+## Licence
+
+Copyright © Google LLC
+Copyright © EPAM Systems
+Copyright © Amazon Web Services
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+[http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/unit-core-plus/build/Dockerfile b/unit-core-plus/build/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..2ddf17278221f8654a4fc4df9b74a2bd8e7e900f
--- /dev/null
+++ b/unit-core-plus/build/Dockerfile
@@ -0,0 +1,17 @@
+FROM azul/zulu-openjdk:17
+WORKDIR /app
+ARG PORT
+ENV PORT $PORT
+
+# Copy the jar to the production image from the builder stage.
+COPY unit-core-plus/target/unit-core-plus-*.jar unit.jar
+COPY data/unit_catalog_v2.json /mnt/unit_catalogs/unit_catalog_v2.json
+
+# Add a non-root user
+RUN groupadd -g 10001 -r nonroot \
+  && useradd -g 10001 -r -u 10001 nonroot
+# Run as non-root user
+USER 10001:10001
+
+# Run the web service on container startup.
+CMD java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${PORT} -Dlog4j.formatMsgNoLookups=true -jar /app/unit.jar
diff --git a/unit-core-plus/pom.xml b/unit-core-plus/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f1b18533095381bf1c00f3ed87a3c4eb72554f19
--- /dev/null
+++ b/unit-core-plus/pom.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.opengroup.osdu.unit-service</groupId>
+		<artifactId>unit-service</artifactId>
+		<version>0.26.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>unit-core-plus</artifactId>
+	<version>0.26.0-SNAPSHOT</version>
+	<name>unit-core-plus</name>
+	<description>Unit service Community Implementation</description>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<slf4j.version>1.7.25</slf4j.version>
+		<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
+		<jackson-databind.version>2.14.0</jackson-databind.version>
+		<spring-security-core.version>6.0.7</spring-security-core.version>
+	</properties>
+
+	<dependencyManagement>
+		<dependencies>
+			<!--      <dependency>-->
+			<!--        <groupId>org.springframework.boot</groupId>-->
+			<!--        <artifactId>spring-boot-dependencies</artifactId>-->
+			<!--        <version>3.2.3</version>-->
+			<!--        <type>pom</type>-->
+			<!--        <scope>import</scope>-->
+			<!--      </dependency>-->
+			<!--      <dependency>-->
+			<!--        <groupId>org.springdoc</groupId>-->
+			<!--        <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>-->
+			<!--        <version>2.1.0</version>-->
+			<!--      </dependency>-->
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<!--    <dependency>-->
+		<!--      <groupId>org.springdoc</groupId>-->
+		<!--      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>-->
+		<!--      <version>2.1.0</version>-->
+		<!--    </dependency>-->
+		<dependency>
+			<groupId>org.opengroup.osdu.unit-service</groupId>
+			<artifactId>unit-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<!-- Compile/runtime dependencies -->
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.9.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.28</version>
+			<scope>provided</scope>
+		</dependency>
+		<!--    <dependency>-->
+		<!--      <groupId>org.slf4j</groupId>-->
+		<!--      <artifactId>slf4j-api</artifactId>-->
+		<!--      <version>${slf4j.version}</version>-->
+		<!--    </dependency>-->
+		<!--    <dependency>-->
+		<!--      <groupId>org.springframework.boot</groupId>-->
+		<!--      <artifactId>spring-boot-starter-logging</artifactId>-->
+		<!--    </dependency>-->
+		<!--    <dependency>-->
+		<!--      <groupId>org.springframework.boot</groupId>-->
+		<!--      <artifactId>spring-boot-starter</artifactId>-->
+		<!--    </dependency>-->
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback.contrib</groupId>
+			<artifactId>logback-json-classic</artifactId>
+			<version>0.1.5</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback.contrib</groupId>
+			<artifactId>logback-jackson</artifactId>
+			<version>0.1.5</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson-databind.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<!--    <dependency>-->
+		<!--      <groupId>org.springdoc</groupId>-->
+		<!--      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>-->
+		<!--      <version>2.3.0</version>-->
+		<!--    </dependency>-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
+
+
+	</dependencies>
+
+	<build>
+		<!-- for hot reload of the web application-->
+		<outputDirectory>
+			${project.build.directory}/${project.build.finalName}/WEB-INF/classes
+    </outputDirectory>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>3.2.2</version>
+				<configuration>
+					<mainClass>
+						org.opengroup.osdu.unitservice.UomApplication</mainClass>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>versions-maven-plugin</artifactId>
+				<version>2.7</version>
+				<executions>
+					<execution>
+						<phase>compile</phase>
+						<goals>
+							<goal>display-dependency-updates</goal>
+							<goal>display-plugin-updates</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.2.1</version>
+				<configuration>
+					<redirectTestOutputToFile>true</redirectTestOutputToFile>
+				</configuration>
+			</plugin>
+
+		</plugins>
+	</build>
+
+</project>
diff --git a/unit-core-plus/src/main/java/org/opengroup/osdu/unitservice/UnitCatalogConfiguration.java b/unit-core-plus/src/main/java/org/opengroup/osdu/unitservice/UnitCatalogConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..579c5a4d584db184cea4fe836672e885b295b37a
--- /dev/null
+++ b/unit-core-plus/src/main/java/org/opengroup/osdu/unitservice/UnitCatalogConfiguration.java
@@ -0,0 +1,38 @@
+/*
+  Copyright 2020 Google LLC
+  Copyright 2020 EPAM Systems, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ */
+
+package org.opengroup.osdu.unitservice;
+
+import org.opengroup.osdu.unitservice.model.CatalogImpl;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+import java.io.FileReader;
+
+@Configuration
+@PropertySource("classpath:swagger.properties")
+public class UnitCatalogConfiguration {
+
+    @Bean
+    public CatalogImpl catalogImpl(@Value("${osdu.unit.catalog.filename}") String location) throws Exception {
+        try (FileReader reader = new FileReader(location)) {
+            return CatalogImpl.createCatalog(reader);
+        }
+    }
+}
diff --git a/unit-core-plus/src/main/java/org/opengroup/osdu/unitservice/UomApplication.java b/unit-core-plus/src/main/java/org/opengroup/osdu/unitservice/UomApplication.java
new file mode 100644
index 0000000000000000000000000000000000000000..da7e4c4c57665381075fcf1a718bf036386e5208
--- /dev/null
+++ b/unit-core-plus/src/main/java/org/opengroup/osdu/unitservice/UomApplication.java
@@ -0,0 +1,31 @@
+/*
+  Copyright 2020 Google LLC
+  Copyright 2020 EPAM Systems, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ */
+
+package org.opengroup.osdu.unitservice;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+@ComponentScan({"org.opengroup.osdu"})
+@SpringBootApplication
+public class UomApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(UomApplication.class, args);
+	}
+}
diff --git a/unit-core-plus/src/main/java/org/opengroup/osdu/unitservice/security/SecurityConfiguration.java b/unit-core-plus/src/main/java/org/opengroup/osdu/unitservice/security/SecurityConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..a05c0f9ab73d156c05ba381a44c6d9463e61d5ab
--- /dev/null
+++ b/unit-core-plus/src/main/java/org/opengroup/osdu/unitservice/security/SecurityConfiguration.java
@@ -0,0 +1,90 @@
+/*
+ Copyright 2020-2024 Google LLC
+ Copyright 2020-2024 EPAM Systems, Inc
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package org.opengroup.osdu.unitservice.security;
+
+import org.apache.tomcat.util.buf.EncodedSolidusHandling;
+import org.opengroup.osdu.unitservice.middleware.AuthenticationRequestFilter;
+import org.opengroup.osdu.unitservice.middleware.AuthenticationService;
+import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfiguration {
+
+  private final AuthenticationRequestFilter authFilter;
+
+  private static final String[] AUTH_WHITELIST = {
+    "/",
+    "/v2/api-docs",
+    "/v3/api-docs",
+    "/swagger",
+    "/swagger-resources/**",
+    "/swagger-ui.html",
+    "/v3/info",
+    "**/v3/info",
+    "/v3/_ah/**",
+    "/api/unit/v3/info",
+    "/webjars/**",
+    "/_ah/**",
+    "/actuator/**",
+    "/error",
+    "/favicon.ico",
+    "/csrf",
+    "/error",
+    "/favicon.ico",
+    "/api/unit/actuator/health",
+    "**/swagger-ui/**/",
+    "**/api-docs/**",
+    "/unit"
+  };
+
+  public SecurityConfiguration(AuthenticationService authenticationService) {
+    authFilter = new AuthenticationRequestFilter(authenticationService);
+  }
+
+  @Bean
+  public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+    http.authorizeHttpRequests(
+            authorizeRequests ->
+                authorizeRequests
+                    .requestMatchers(AUTH_WHITELIST)
+                    .permitAll()
+                    .anyRequest()
+                    .authenticated())
+        .sessionManagement(
+            sessionManagement ->
+                sessionManagement.sessionCreationPolicy(SessionCreationPolicy.NEVER))
+        .addFilterBefore(authFilter, UsernamePasswordAuthenticationFilter.class)
+        .csrf(csrf -> csrf.disable());
+    return http.build();
+  }
+
+  @Bean
+  public WebSecurityCustomizer webSecurityCustomizer() {
+    return web -> web.ignoring().requestMatchers(AUTH_WHITELIST);
+  }
+
+}
diff --git a/unit-core-plus/src/main/resources/application.properties b/unit-core-plus/src/main/resources/application.properties
new file mode 100644
index 0000000000000000000000000000000000000000..237a87e10a24acdd8a73db644fb7c8edc57caa0c
--- /dev/null
+++ b/unit-core-plus/src/main/resources/application.properties
@@ -0,0 +1,15 @@
+LOG_PREFIX=unit
+server.servlet.contextPath=/api/unit/
+logging.level.org.springframework.web=${LOG_LEVEL:INFO}
+server.port=8080
+
+spring.main.allow-bean-definition-overriding=true
+
+osdu.entitlement.url=${ENTITLEMENT_URL}
+
+ENTITLEMENTS_HOST=http://entitlements
+ENTITLEMENTS_PATH=/api/entitlements/v2
+ENTITLEMENT_URL=${ENTITLEMENTS_HOST}${ENTITLEMENTS_PATH}
+
+# [Optional] [AKS] [GKE] File location of the unit catalog
+osdu.unit.catalog.filename=${UNIT_CATALOG_FILENAME:/mnt/unit_catalogs/unit_catalog_v2.json}
diff --git a/unit-core-plus/src/main/resources/logback.xml b/unit-core-plus/src/main/resources/logback.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a4b51ebdb0160c589fd3ed43c6b505534d8de8c9
--- /dev/null
+++ b/unit-core-plus/src/main/resources/logback.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+  <logger name="org.opengroup.osdu" level="${LOG_LEVEL}"/>
+  <springProfile name="local">
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+      <encoder>
+        <pattern>%yellow([%thread]) %highlight(| %-5level |) %green(%d) %cyan(| %logger{15} |) %highlight(%msg) %n</pattern>
+        <charset>utf8</charset>
+      </encoder>
+    </appender>
+    <root level="info">
+      <appender-ref ref="CONSOLE"/>
+    </root>
+  </springProfile>
+
+  <springProfile name="!local">
+    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+      <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+        <layout class="ch.qos.logback.contrib.json.classic.JsonLayout">
+          <timestampFormat>yyyy-MM-dd HH:mm:ss.SSS</timestampFormat>
+          <timestampFormatTimezoneId>Etc/UTC</timestampFormatTimezoneId>
+          <appendLineSeparator>true</appendLineSeparator>
+        </layout>
+      </encoder>
+    </appender>
+
+    <root level="info">
+      <appender-ref ref="stdout"/>
+    </root>
+  </springProfile>
+
+</configuration>
diff --git a/unit-core/.gitignore b/unit-core/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..00d2ab71ddbd82cb0db5e0db90650628a231e318
--- /dev/null
+++ b/unit-core/.gitignore
@@ -0,0 +1,2 @@
+/.apt_generated/
+/.apt_generated_tests/