diff --git a/java/pom.xml b/java/pom.xml
index 7a40985a..97b1ccf4 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -1,603 +1,625 @@
 <?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.6.1</version>
+    <relativePath/>
+    <!-- lookup parent from repository -->
+  </parent>
+
+  <groupId>com.amido.stacks.workloads</groupId>
+  <artifactId>stacks-api</artifactId>
+  <version>1.0.0</version>
+
+  <name>stacks-api</name>
+  <description>Demo project for Java</description>
+
+  <properties>
+    <stacks.core.api.version>1.0.0</stacks.core.api.version>
+    <stacks.core.commons.version>1.0.3</stacks.core.commons.version>
+
+    <java.version>11</java.version>
+    <org.projectlombok.version>1.18.0</org.projectlombok.version>
+    <org.springdoc-openapi.version>1.6.1</org.springdoc-openapi.version>
+    <applicationinsights.version>2.6.4</applicationinsights.version>
+    <azure.springboot.version>3.6.0</azure.springboot.version>
+    <jackson.version>2.13.0</jackson.version>
+    <mockito.version>4.1.0</mockito.version>
+    <lombok.version>1.18.22</lombok.version>
+    <hamcrest.version>2.2</hamcrest.version>
+    <pitest.version>1.7.3</pitest.version>
+    <jacoco.version>0.8.7</jacoco.version>
+    <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
+    <maven-surefire-phase>test</maven-surefire-phase>
+    <junit-jupiter.version>5.8.2</junit-jupiter.version>
+    <equals-verifier.version>3.8.1</equals-verifier.version>
+    <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+    <owasp-dependency-check-plugin.version>6.5.0</owasp-dependency-check-plugin.version>
+    <auth0-spring-security-api.version>1.4.1</auth0-spring-security-api.version>
+    <io-projectreactor-netty.version>1.0.11</io-projectreactor-netty.version>
+    <ch.qos.logback.logback-core.version>1.2.8</ch.qos.logback.logback-core.version>
+    <net.minidev.json-smart-version>2.4.7</net.minidev.json-smart-version>
+    <com.beust.jcommander-version>1.81</com.beust.jcommander-version>
+    <au.com.dius.pact-jvm-provider-spring.version>4.0.10
+    </au.com.dius.pact-jvm-provider-spring.version>
+    <au.com.dius.pact.consumer-version>4.3.2</au.com.dius.pact.consumer-version>
+    <com.nimbusds.oauth2-oidc-sdk-version>9.9</com.nimbusds.oauth2-oidc-sdk-version>
+    <au.com.dius.pact.provider.maven-version>4.2.7</au.com.dius.pact.provider.maven-version>
+    <log4j-version>2.17.0</log4j-version>
+    <org.mapstruct.version>1.5.2.Final</org.mapstruct.version>
+
+    <fmt-maven-plugin.version>2.13</fmt-maven-plugin.version>
+    <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
+    <puppycrawl-tools-checkstyle.version>9.2</puppycrawl-tools-checkstyle.version>
+    <spotbugs-maven-plugin.version>4.2.3</spotbugs-maven-plugin.version>
+    <spotbugs.version>4.5.2</spotbugs.version>
+    <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
+
+    <pact.version>3.5.24</pact.version>
+
+    <!-- Set 'pact.broker.url' and 'pact.broker.token' -->
+    <pact.broker.url/>
+    <pact.broker.token/>
+    <pact.api.name>JavaMenuAPI</pact.api.name>
+    <pact.api.protocol>http</pact.api.protocol>
+    <pact.api.host>localhost</pact.api.host>
+    <pact.api.port>9000</pact.api.port>
+  </properties>
+
+  <repositories>
+    <repository>
+      <snapshots/>
+      <id>snapshots</id>
+      <name>default-maven-virtual</name>
+      <url>https://amidostacks.jfrog.io/artifactory/default-maven-virtual</url>
+    </repository>
+  </repositories>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.projectreactor</groupId>
+        <artifactId>reactor-bom</artifactId>
+        <version>2020.0.14</version>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+
+    <!-- STACKS dependencies -->
+    <dependency>
+      <groupId>com.amido.stacks.modules</groupId>
+      <artifactId>stacks-core-api</artifactId>
+      <version>${stacks.core.api.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.amido.stacks.modules</groupId>
+      <artifactId>stacks-core-commons</artifactId>
+      <version>${stacks.core.commons.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springdoc</groupId>
+      <artifactId>springdoc-openapi-ui</artifactId>
+      <version>${org.springdoc-openapi.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springdoc</groupId>
+      <artifactId>springdoc-openapi-data-rest</artifactId>
+      <version>${org.springdoc-openapi.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>net.minidev</groupId>
+          <artifactId>json-smart</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <version>${log4j-version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.azure.spring</groupId>
+      <artifactId>azure-spring-boot</artifactId>
+      <version>${azure.springboot.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>net.minidev</groupId>
+          <artifactId>json-smart</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>com.microsoft.azure</groupId>
+      <artifactId>applicationinsights-spring-boot-starter</artifactId>
+      <version>${applicationinsights.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.microsoft.azure</groupId>
+      <artifactId>applicationinsights-logging-logback</artifactId>
+      <version>${applicationinsights.version}</version>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>ch.qos.logback</groupId>
+          <artifactId>logback-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>${ch.qos.logback.logback-core.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>net.minidev</groupId>
+      <artifactId>json-smart</artifactId>
+      <version>${net.minidev.json-smart-version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.beust</groupId>
+      <artifactId>jcommander</artifactId>
+      <version>${com.beust.jcommander-version}</version>
+    </dependency>
+
+    <!-- Registering the Auth0 Dependency-->
+    <dependency>
+      <groupId>com.auth0</groupId>
+      <artifactId>auth0-spring-security-api</artifactId>
+      <version>${auth0-spring-security-api.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>${lombok.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!--
+    <dependency>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-keyvault-secrets-spring-boot-starter</artifactId>
+        <version>${azure.springboot.version}</version>
+        <scope>runtime</scope>
+    </dependency>
+    -->
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.junit.vintage</groupId>
+          <artifactId>junit-vintage-engine</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.vaadin.external.google</groupId>
+          <artifactId>android-json</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit-jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>${junit-jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <version>${mockito.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <version>${hamcrest.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>nl.jqno.equalsverifier</groupId>
+      <artifactId>equalsverifier</artifactId>
+      <version>${equals-verifier.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>au.com.dius</groupId>
+      <artifactId>pact-jvm-provider-spring</artifactId>
+      <version>${au.com.dius.pact-jvm-provider-spring.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>au.com.dius.pact</groupId>
+      <artifactId>consumer</artifactId>
+      <version>${au.com.dius.pact.consumer-version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.pitest</groupId>
+      <artifactId>pitest-parent</artifactId>
+      <version>${pitest.version}</version>
+      <type>pom</type>
+    </dependency>
+
+    <dependency>
+      <groupId>com.nimbusds</groupId>
+      <artifactId>oauth2-oidc-sdk</artifactId>
+      <version>${com.nimbusds.oauth2-oidc-sdk-version}</version>
+      <scope>runtime</scope>
+    </dependency>
+
+  </dependencies>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <version>${maven-surefire-plugin.version}</version>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${maven-compiler-plugin.version}</version>
+        <configuration>
+          <source>11</source>
+          <target>11</target>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>org.projectlombok</groupId>
+              <artifactId>lombok</artifactId>
+              <version>${lombok.version}</version>
+            </path>
+            <!-- This is needed when using Lombok 1.18.16 and above -->
+            <path>
+              <groupId>org.projectlombok</groupId>
+              <artifactId>lombok-mapstruct-binding</artifactId>
+              <version>0.2.0</version>
+            </path>
+            <!-- Mapstruct should follow the lombok path(s) -->
+            <path>
+              <groupId>org.mapstruct</groupId>
+              <artifactId>mapstruct-processor</artifactId>
+              <version>${org.mapstruct.version}</version>
+            </path>
+          </annotationProcessorPaths>
+          <forceJavacCompilerUse>true</forceJavacCompilerUse>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${maven-surefire-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>default-test</id>
+            <!-- Only run tests in the `test` phase, avoid running
+            in the `package` phase. -->
+            <phase>${maven-surefire-phase}</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.1</version>
-        <relativePath/>
-        <!-- lookup parent from repository -->
-    </parent>
-
-    <groupId>com.amido.stacks.workloads</groupId>
-    <artifactId>stacks-api</artifactId>
-    <version>1.0.0</version>
-
-    <name>stacks-api</name>
-    <description>Demo project for Java</description>
-
-    <properties>
-        <stacks.core.api.version>1.0.0</stacks.core.api.version>
-
-        <java.version>11</java.version>
-        <org.projectlombok.version>1.18.0</org.projectlombok.version>
-        <org.springdoc-openapi.version>1.6.1</org.springdoc-openapi.version>
-        <applicationinsights.version>2.6.4</applicationinsights.version>
-        <azure.springboot.version>3.6.0</azure.springboot.version>
-        <jackson.version>2.13.0</jackson.version>
-        <mockito.version>4.1.0</mockito.version>
-        <lombok.version>1.18.22</lombok.version>
-        <hamcrest.version>2.2</hamcrest.version>
-        <pitest.version>1.7.3</pitest.version>
-        <jacoco.version>0.8.7</jacoco.version>
-        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
-        <maven-surefire-phase>test</maven-surefire-phase>
-        <junit-jupiter.version>5.8.2</junit-jupiter.version>
-        <equals-verifier.version>3.8.1</equals-verifier.version>
-        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-        <owasp-dependency-check-plugin.version>6.5.0</owasp-dependency-check-plugin.version>
-        <auth0-spring-security-api.version>1.4.1</auth0-spring-security-api.version>
-        <io-projectreactor-netty.version>1.0.11</io-projectreactor-netty.version>
-        <ch.qos.logback.logback-core.version>1.2.8</ch.qos.logback.logback-core.version>
-        <net.minidev.json-smart-version>2.4.7</net.minidev.json-smart-version>
-        <com.beust.jcommander-version>1.81</com.beust.jcommander-version>
-        <au.com.dius.pact-jvm-provider-spring.version>4.0.10</au.com.dius.pact-jvm-provider-spring.version>
-        <au.com.dius.pact.consumer-version>4.3.2</au.com.dius.pact.consumer-version>
-        <com.nimbusds.oauth2-oidc-sdk-version>9.9</com.nimbusds.oauth2-oidc-sdk-version>
-        <au.com.dius.pact.provider.maven-version>4.2.7</au.com.dius.pact.provider.maven-version>
-        <log4j-version>2.17.0</log4j-version>
-        
-        <fmt-maven-plugin.version>2.13</fmt-maven-plugin.version>
-        <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-        <puppycrawl-tools-checkstyle.version>9.2</puppycrawl-tools-checkstyle.version>
-        <spotbugs-maven-plugin.version>4.2.3</spotbugs-maven-plugin.version>
-        <spotbugs.version>4.5.2</spotbugs.version>
-        <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
-
-        <pact.version>3.5.24</pact.version>
-
-        <!-- Set 'pact.broker.url' and 'pact.broker.token' -->
-        <pact.broker.url/>
-        <pact.broker.token/>
-        <pact.api.name>JavaMenuAPI</pact.api.name>
-        <pact.api.protocol>http</pact.api.protocol>
-        <pact.api.host>localhost</pact.api.host>
-        <pact.api.port>9000</pact.api.port>
-    </properties>
-
-    <repositories>
-        <repository>
-            <snapshots/>
-            <id>snapshots</id>
-            <name>default-maven-virtual</name>
-            <url>https://amidostacks.jfrog.io/artifactory/default-maven-virtual</url>
-        </repository>
-    </repositories>
-
-    <dependencyManagement>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>${jacoco.version}</version>
+        <configuration>
+          <excludes>
+            <exclude>**/AuthControllerImpl*</exclude>
+            <exclude>**/ApplicationConfig*</exclude>
+          </excludes>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>report</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>default-check</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <rule>
+                  <element>BUNDLE</element>
+                  <limits>
+                    <limit>
+                      <counter>COMPLEXITY</counter>
+                      <value>COVEREDRATIO</value>
+                      <minimum>0.00</minimum>
+                    </limit>
+                  </limits>
+                </rule>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>au.com.dius.pact.provider</groupId>
+        <artifactId>maven</artifactId>
+        <version>${au.com.dius.pact.provider.maven-version}</version>
+        <configuration>
+          <pactBrokerUrl>${pact.broker.url}</pactBrokerUrl>
+          <pactBrokerToken>${pact.broker.token}</pactBrokerToken>
+          <systemPropertyVariables>
+            <pact.verifier.publishResults>true</pact.verifier.publishResults>
+          </systemPropertyVariables>
+
+          <serviceProviders>
+            <serviceProvider>
+              <name>${pact.api.name}</name>
+              <protocol>${pact.api.protocol}</protocol>
+              <host>${pact.api.host}</host>
+              <port>${pact.api.port}</port>
+            </serviceProvider>
+          </serviceProviders>
+
+        </configuration>
+        <executions>
+          <execution>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.coveo</groupId>
+        <artifactId>fmt-maven-plugin</artifactId>
+        <version>${fmt-maven-plugin.version}</version>
+        <configuration>
+          <displayFiles>true</displayFiles>
+          <verbose>true</verbose>
+          <filesNamePattern>.*\.java</filesNamePattern>
+          <additionalSourceDirectories/>
+          <skip>false</skip>
+          <skipSortingImports>false</skipSortingImports>
+          <style>google</style>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>${maven-checkstyle-plugin.version}</version>
         <dependencies>
-            <dependency>
-                <groupId>io.projectreactor</groupId>
-                <artifactId>reactor-bom</artifactId>
-                <version>2020.0.14</version>
-                <type>pom</type>
-            </dependency>
+          <!--Specify Dependent checkstyle Edition-->
+          <dependency>
+            <groupId>com.puppycrawl.tools</groupId>
+            <artifactId>checkstyle</artifactId>
+            <version>${puppycrawl-tools-checkstyle.version}</version>
+          </dependency>
         </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-
-        <!-- STACKS dependencies -->
-        <dependency>
-            <groupId>com.amido.stacks.modules</groupId>
-            <artifactId>stacks-core-api</artifactId>
-            <version>${stacks.core.api.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
-            <version>${org.springdoc-openapi.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-data-rest</artifactId>
-            <version>${org.springdoc-openapi.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>net.minidev</groupId>
-                    <artifactId>json-smart</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>${log4j-version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.azure.spring</groupId>
-            <artifactId>azure-spring-boot</artifactId>
-            <version>${azure.springboot.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>net.minidev</groupId>
-                    <artifactId>json-smart</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>applicationinsights-spring-boot-starter</artifactId>
-            <version>${applicationinsights.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>applicationinsights-logging-logback</artifactId>
-            <version>${applicationinsights.version}</version>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>${ch.qos.logback.logback-core.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>net.minidev</groupId>
-            <artifactId>json-smart</artifactId>
-            <version>${net.minidev.json-smart-version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.beust</groupId>
-            <artifactId>jcommander</artifactId>
-            <version>${com.beust.jcommander-version}</version>
-        </dependency>
-
-         <!-- Registering the Auth0 Dependency-->
-        <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>auth0-spring-security-api</artifactId>
-            <version>${auth0-spring-security-api.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!--
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-keyvault-secrets-spring-boot-starter</artifactId>
-            <version>${azure.springboot.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        -->
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.junit.vintage</groupId>
-                    <artifactId>junit-vintage-engine</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.vaadin.external.google</groupId>
-                    <artifactId>android-json</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-junit-jupiter</artifactId>
-            <version>${mockito.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <version>${hamcrest.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>nl.jqno.equalsverifier</groupId>
-            <artifactId>equalsverifier</artifactId>
-            <version>${equals-verifier.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>au.com.dius</groupId>
-            <artifactId>pact-jvm-provider-spring</artifactId>
-                <version>${au.com.dius.pact-jvm-provider-spring.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>au.com.dius.pact</groupId>
-            <artifactId>consumer</artifactId>
-            <version>${au.com.dius.pact.consumer-version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
+        <configuration>
+          <configLocation>google_checks.xml</configLocation>
+          <encoding>UTF-8</encoding>
+          <consoleOutput>true</consoleOutput>
+          <failsOnError>true</failsOnError>
+          <linkXRef>false</linkXRef>
+        </configuration>
+        <executions>
+          <execution>
+            <id>validate</id>
+            <phase>validate</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <version>${spotbugs-maven-plugin.version}</version>
+        <dependencies>
+          <!-- overwrite dependency on spotbugs if you want to specify the version of spotbugs -->
+          <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs</artifactId>
+            <version>${spotbugs.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.pitest</groupId>
+        <artifactId>pitest-maven</artifactId>
+        <version>${pitest.version}</version>
+        <dependencies>
+          <dependency>
             <groupId>org.pitest</groupId>
-            <artifactId>pitest-parent</artifactId>
-            <version>${pitest.version}</version>
-            <type>pom</type>
-        </dependency>
-
-        <dependency>
-            <groupId>com.nimbusds</groupId>
-            <artifactId>oauth2-oidc-sdk</artifactId>
-            <version>${com.nimbusds.oauth2-oidc-sdk-version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-    <reporting>
+            <artifactId>pitest-junit5-plugin</artifactId>
+            <version>0.15</version>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <id>pitest</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>mutationCoverage</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <threads>15</threads>
+          <historyInputFile>target/pitHistory.txt</historyInputFile>
+          <historyOutputFile>target/pitHistory.txt</historyOutputFile>
+          <timestampedReports>false</timestampedReports>
+          <mutators>
+            <value>STRONGER</value>
+          </mutators>
+          <outputFormats>
+            <outputFormat>XML</outputFormat>
+            <outputFormat>HTML</outputFormat>
+          </outputFormats>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>owasp-dependency-check</id>
+      <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-            </plugin>
+          <plugin>
+            <groupId>org.owasp</groupId>
+            <artifactId>dependency-check-maven</artifactId>
+            <version>${owasp-dependency-check-plugin.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
-    </reporting>
-
-    <build>
+      </build>
+    </profile>
+    <profile>
+      <id>test</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>spring.profiles.active</name>
+          <value>test</value>
+        </property>
+      </activation>
+    </profile>
+    <profile>
+      <id>local</id>
+      <build>
+        <resources>
+          <resource>
+            <directory>src/main/resources/local</directory>
+          </resource>
+          <resource>
+            <directory>src/main/resources</directory>
+          </resource>
+        </resources>
+      </build>
+    </profile>
+    <profile>
+      <id>update-permissions</id>
+      <activation>
+        <os>
+          <family>!windows</family>
+        </os>
+      </activation>
+      <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>11</source>
-                    <target>11</target>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                            <version>${lombok.version}</version>
-                        </path>
-                    </annotationProcessorPaths>
-                    <forceJavacCompilerUse>true</forceJavacCompilerUse>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>default-test</id>
-                        <!-- Only run tests in the `test` phase, avoid running
-                        in the `package` phase. -->
-                        <phase>${maven-surefire-phase}</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
-                <configuration>
-                    <excludes>
-                        <exclude>**/AuthControllerImpl*</exclude>
-                        <exclude>**/ApplicationConfig*</exclude>
-                    </excludes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-check</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.00</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>au.com.dius.pact.provider</groupId>
-                <artifactId>maven</artifactId>
-                <version>${au.com.dius.pact.provider.maven-version}</version>
-                <configuration>
-                    <pactBrokerUrl>${pact.broker.url}</pactBrokerUrl>
-                    <pactBrokerToken>${pact.broker.token}</pactBrokerToken>
-                    <systemPropertyVariables>
-                        <pact.verifier.publishResults>true</pact.verifier.publishResults>
-                    </systemPropertyVariables>
-
-                    <serviceProviders>
-                        <serviceProvider>
-                            <name>${pact.api.name}</name>
-                            <protocol>${pact.api.protocol}</protocol>
-                            <host>${pact.api.host}</host>
-                            <port>${pact.api.port}</port>
-                        </serviceProvider>
-                    </serviceProviders>
-
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.coveo</groupId>
-                <artifactId>fmt-maven-plugin</artifactId>
-                <version>${fmt-maven-plugin.version}</version>
-                <configuration>
-                    <displayFiles>true</displayFiles>
-                    <verbose>true</verbose>
-                    <filesNamePattern>.*\.java</filesNamePattern>
-                    <additionalSourceDirectories/>
-                    <skip>false</skip>
-                    <skipSortingImports>false</skipSortingImports>
-                    <style>google</style>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>${maven-checkstyle-plugin.version}</version>
-                <dependencies>
-                    <!--Specify Dependent checkstyle Edition-->
-                    <dependency>
-                        <groupId>com.puppycrawl.tools</groupId>
-                        <artifactId>checkstyle</artifactId>
-                        <version>${puppycrawl-tools-checkstyle.version}</version>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <configLocation>google_checks.xml</configLocation>
-                    <encoding>UTF-8</encoding>
-                    <consoleOutput>true</consoleOutput>
-                    <failsOnError>true</failsOnError>
-                    <linkXRef>false</linkXRef>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>validate</id>
-                        <phase>validate</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.github.spotbugs</groupId>
-                <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>${spotbugs-maven-plugin.version}</version>
-                <dependencies>
-                    <!-- overwrite dependency on spotbugs if you want to specify the version of spotbugs -->
-                    <dependency>
-                        <groupId>com.github.spotbugs</groupId>
-                        <artifactId>spotbugs</artifactId>
-                        <version>${spotbugs.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.pitest</groupId>
-                <artifactId>pitest-maven</artifactId>
-                <version>${pitest.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.pitest</groupId>
-                        <artifactId>pitest-junit5-plugin</artifactId>
-                        <version>0.15</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>pitest</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>mutationCoverage</goal>
-                        </goals>
-                    </execution>
-                </executions>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>${exec-maven-plugin.version}</version>
+            <executions>
+              <execution>
+                <id>Add execution rigths on bash scripts</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
                 <configuration>
-                    <threads>15</threads>
-                    <historyInputFile>target/pitHistory.txt</historyInputFile>
-                    <historyOutputFile>target/pitHistory.txt</historyOutputFile>
-                    <timestampedReports>false</timestampedReports>
-                    <mutators>
-                        <value>STRONGER</value>
-                    </mutators>
-                    <outputFormats>
-                        <outputFormat>XML</outputFormat>
-                        <outputFormat>HTML</outputFormat>
-                    </outputFormats>
+                  <executable>chmod</executable>
+                  <arguments>
+                    <argument>755</argument>
+                    <argument>${project.basedir}/mvnw</argument>
+                  </arguments>
                 </configuration>
-            </plugin>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>owasp-dependency-check</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.owasp</groupId>
-                        <artifactId>dependency-check-maven</artifactId>
-                        <version>${owasp-dependency-check-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>check</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>test</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>spring.profiles.active</name>
-                    <value>test</value>
-                </property>
-            </activation>
-        </profile>
-        <profile>
-            <id>local</id>
-            <build>
-                <resources>
-                    <resource>
-                        <directory>src/main/resources/local</directory>
-                    </resource>
-                    <resource>
-                        <directory>src/main/resources</directory>
-                    </resource>
-                </resources>
-            </build>
-        </profile>
-        <profile>
-            <id>update-permissions</id>
-            <activation>
-                <os>
-                    <family>!windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>${exec-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>Add execution rigths on bash scripts</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>chmod</executable>
-                                    <arguments>
-                                        <argument>755</argument>
-                                        <argument>${project.basedir}/mvnw</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/impl/QueryMenuControllerImpl.java b/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/impl/QueryMenuControllerImpl.java
index 99db4098..a478dae7 100644
--- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/impl/QueryMenuControllerImpl.java
+++ b/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/impl/QueryMenuControllerImpl.java
@@ -6,7 +6,8 @@
 import com.amido.stacks.workloads.menu.domain.Category;
 import com.amido.stacks.workloads.menu.domain.Item;
 import com.amido.stacks.workloads.menu.domain.Menu;
-import com.amido.stacks.workloads.menu.mappers.DomainToDtoMapper;
+import com.amido.stacks.workloads.menu.mappers.MenuMapper;
+import com.amido.stacks.workloads.menu.mappers.SearchMenuResultItemMapper;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -14,6 +15,7 @@
 import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,18 +25,13 @@ public class QueryMenuControllerImpl implements QueryMenuController {
 
   Logger logger = LoggerFactory.getLogger(QueryMenuControllerImpl.class);
 
-  private DomainToDtoMapper mapper;
+  @Autowired private MenuMapper menuMapper;
 
-  public QueryMenuControllerImpl(DomainToDtoMapper mapper) {
-    this.mapper = mapper;
-  }
+  @Autowired private SearchMenuResultItemMapper searchMenuResultItemMapper;
 
   @Override
   public ResponseEntity<SearchMenuResult> searchMenu(
-      final String searchTerm,
-      final UUID restaurantId,
-      final Integer pageSize,
-      final Integer pageNumber) {
+      String searchTerm, UUID restaurantId, Integer pageSize, Integer pageNumber) {
 
     List<Menu> menuList = new ArrayList<>();
 
@@ -62,12 +59,12 @@ public ResponseEntity<SearchMenuResult> searchMenu(
             pageSize,
             pageNumber,
             menuList.stream()
-                .map(m -> mapper.toSearchMenuResultItem(m))
+                .map(m -> searchMenuResultItemMapper.toDto(m))
                 .collect(Collectors.toList())));
   }
 
   @Override
-  public ResponseEntity<MenuDTO> getMenu(final UUID id, final String correlationId) {
+  public ResponseEntity<MenuDTO> getMenu(UUID id, String correlationId) {
     final String restaurantId = "58a1df85-6bdc-412a-a118-0f0e394c1342";
     final String categoryId = "2c43dbda-7d4d-46fb-b246-bec2bd348ca1";
     final String itemId = "7e46a698-080b-45e6-a529-2c196d00791c";
@@ -79,6 +76,6 @@ public ResponseEntity<MenuDTO> getMenu(final UUID id, final String correlationId
         new Category(categoryId, "cat name", "cat description", Arrays.asList(item));
     menu.addOrUpdateCategory(category);
 
-    return ResponseEntity.ok(mapper.toMenuDto(menu));
+    return ResponseEntity.ok(menuMapper.toDto(menu));
   }
 }
diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v2/impl/QueryMenuControllerImplV2.java b/java/src/main/java/com/amido/stacks/workloads/menu/api/v2/impl/QueryMenuControllerImplV2.java
index 8116148e..a4d88422 100644
--- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v2/impl/QueryMenuControllerImplV2.java
+++ b/java/src/main/java/com/amido/stacks/workloads/menu/api/v2/impl/QueryMenuControllerImplV2.java
@@ -3,20 +3,17 @@
 import com.amido.stacks.workloads.menu.api.v1.dto.response.MenuDTO;
 import com.amido.stacks.workloads.menu.api.v2.QueryMenuControllerV2;
 import com.amido.stacks.workloads.menu.domain.Menu;
-import com.amido.stacks.workloads.menu.mappers.DomainToDtoMapper;
+import com.amido.stacks.workloads.menu.mappers.MenuMapper;
 import java.util.ArrayList;
 import java.util.UUID;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 public class QueryMenuControllerImplV2 implements QueryMenuControllerV2 {
 
-  private DomainToDtoMapper mapper;
-
-  public QueryMenuControllerImplV2(DomainToDtoMapper mapper) {
-    this.mapper = mapper;
-  }
+  @Autowired private MenuMapper menuMapper;
 
   @Override
   public ResponseEntity<MenuDTO> getMenu(UUID id, String correlationId) {
@@ -26,6 +23,6 @@ public ResponseEntity<MenuDTO> getMenu(UUID id, String correlationId) {
         new Menu(
             id.toString(), restaurantId, "0 Menu", "0 Menu Description", new ArrayList<>(), true);
 
-    return ResponseEntity.ok(mapper.toMenuDto(menu));
+    return ResponseEntity.ok(menuMapper.toDto(menu));
   }
 }
diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/mappers/CategoryMapper.java b/java/src/main/java/com/amido/stacks/workloads/menu/mappers/CategoryMapper.java
new file mode 100644
index 00000000..e4172ee0
--- /dev/null
+++ b/java/src/main/java/com/amido/stacks/workloads/menu/mappers/CategoryMapper.java
@@ -0,0 +1,13 @@
+package com.amido.stacks.workloads.menu.mappers;
+
+import com.amido.stacks.core.mapping.BaseMapper;
+import com.amido.stacks.workloads.menu.api.v1.dto.response.CategoryDTO;
+import com.amido.stacks.workloads.menu.domain.Category;
+import org.mapstruct.Mapper;
+import org.mapstruct.NullValueCheckStrategy;
+
+@Mapper(
+    componentModel = "spring",
+    uses = {ItemMapper.class},
+    nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
+public interface CategoryMapper extends BaseMapper<CategoryDTO, Category> {}
diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/mappers/DomainToDtoMapper.java b/java/src/main/java/com/amido/stacks/workloads/menu/mappers/DomainToDtoMapper.java
deleted file mode 100644
index 49d87a47..00000000
--- a/java/src/main/java/com/amido/stacks/workloads/menu/mappers/DomainToDtoMapper.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.amido.stacks.workloads.menu.mappers;
-
-import com.amido.stacks.workloads.menu.api.v1.dto.response.CategoryDTO;
-import com.amido.stacks.workloads.menu.api.v1.dto.response.ItemDTO;
-import com.amido.stacks.workloads.menu.api.v1.dto.response.MenuDTO;
-import com.amido.stacks.workloads.menu.api.v1.dto.response.SearchMenuResultItem;
-import com.amido.stacks.workloads.menu.domain.Category;
-import com.amido.stacks.workloads.menu.domain.Item;
-import com.amido.stacks.workloads.menu.domain.Menu;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DomainToDtoMapper {
-
-  public static MenuDTO toMenuDto(Menu menu) {
-    return new MenuDTO(
-        UUID.fromString(menu.getId()),
-        UUID.fromString(menu.getRestaurantId()),
-        menu.getName(),
-        menu.getDescription(),
-        menu.getCategories() != null
-            ? menu.getCategories().stream()
-                .map(DomainToDtoMapper::toCategoryDto)
-                .collect(Collectors.toList())
-            : null,
-        menu.getEnabled());
-  }
-
-  public static CategoryDTO toCategoryDto(Category category) {
-    return new CategoryDTO(
-        category.getId(),
-        category.getName(),
-        category.getDescription(),
-        category.getItems() != null
-            ? category.getItems().stream()
-                .map(DomainToDtoMapper::toItemDto)
-                .collect(Collectors.toList())
-            : null);
-  }
-
-  public static ItemDTO toItemDto(Item item) {
-    return new ItemDTO(
-        item.getId(), item.getName(), item.getDescription(), item.getPrice(), item.getAvailable());
-  }
-
-  public static SearchMenuResultItem toSearchMenuResultItem(Menu menu) {
-    return new SearchMenuResultItem(
-        UUID.fromString(menu.getId()),
-        UUID.fromString(menu.getRestaurantId()),
-        menu.getName(),
-        menu.getDescription(),
-        menu.getEnabled());
-  }
-}
diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/mappers/ItemMapper.java b/java/src/main/java/com/amido/stacks/workloads/menu/mappers/ItemMapper.java
new file mode 100644
index 00000000..2d8da0d1
--- /dev/null
+++ b/java/src/main/java/com/amido/stacks/workloads/menu/mappers/ItemMapper.java
@@ -0,0 +1,13 @@
+package com.amido.stacks.workloads.menu.mappers;
+
+import com.amido.stacks.core.mapping.BaseMapper;
+import com.amido.stacks.workloads.menu.api.v1.dto.response.ItemDTO;
+import com.amido.stacks.workloads.menu.domain.Item;
+import org.mapstruct.Mapper;
+import org.mapstruct.NullValueCheckStrategy;
+
+@Mapper(
+    componentModel = "spring",
+    uses = {},
+    nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
+public interface ItemMapper extends BaseMapper<ItemDTO, Item> {}
diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/mappers/MenuMapper.java b/java/src/main/java/com/amido/stacks/workloads/menu/mappers/MenuMapper.java
new file mode 100644
index 00000000..001a331c
--- /dev/null
+++ b/java/src/main/java/com/amido/stacks/workloads/menu/mappers/MenuMapper.java
@@ -0,0 +1,14 @@
+package com.amido.stacks.workloads.menu.mappers;
+
+import com.amido.stacks.core.mapping.BaseMapper;
+import com.amido.stacks.core.mapping.MapperUtils;
+import com.amido.stacks.workloads.menu.api.v1.dto.response.MenuDTO;
+import com.amido.stacks.workloads.menu.domain.Menu;
+import org.mapstruct.Mapper;
+import org.mapstruct.NullValueCheckStrategy;
+
+@Mapper(
+    componentModel = "spring",
+    uses = {MapperUtils.class, CategoryMapper.class},
+    nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
+public interface MenuMapper extends BaseMapper<MenuDTO, Menu> {}
diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/mappers/SearchMenuResultItemMapper.java b/java/src/main/java/com/amido/stacks/workloads/menu/mappers/SearchMenuResultItemMapper.java
new file mode 100644
index 00000000..6536061f
--- /dev/null
+++ b/java/src/main/java/com/amido/stacks/workloads/menu/mappers/SearchMenuResultItemMapper.java
@@ -0,0 +1,14 @@
+package com.amido.stacks.workloads.menu.mappers;
+
+import com.amido.stacks.core.mapping.BaseMapper;
+import com.amido.stacks.core.mapping.MapperUtils;
+import com.amido.stacks.workloads.menu.api.v1.dto.response.SearchMenuResultItem;
+import com.amido.stacks.workloads.menu.domain.Menu;
+import org.mapstruct.Mapper;
+import org.mapstruct.NullValueCheckStrategy;
+
+@Mapper(
+    componentModel = "spring",
+    uses = {MapperUtils.class, CategoryMapper.class},
+    nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
+public interface SearchMenuResultItemMapper extends BaseMapper<SearchMenuResultItem, Menu> {}
diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/impl/QueryMenuControllerImplTest.java b/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/impl/QueryMenuControllerImplTest.java
index ad41c47c..b7e0cc24 100644
--- a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/impl/QueryMenuControllerImplTest.java
+++ b/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/impl/QueryMenuControllerImplTest.java
@@ -13,7 +13,10 @@
 import com.amido.stacks.workloads.menu.domain.Category;
 import com.amido.stacks.workloads.menu.domain.Item;
 import com.amido.stacks.workloads.menu.domain.Menu;
-import com.amido.stacks.workloads.menu.mappers.DomainToDtoMapper;
+import com.amido.stacks.workloads.menu.mappers.CategoryMapper;
+import com.amido.stacks.workloads.menu.mappers.ItemMapper;
+import com.amido.stacks.workloads.menu.mappers.MenuMapper;
+import com.amido.stacks.workloads.menu.mappers.SearchMenuResultItemMapper;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -39,6 +42,14 @@ public class QueryMenuControllerImplTest {
 
   @Autowired private TestRestTemplate testRestTemplate;
 
+  @Autowired private MenuMapper menuMapper;
+
+  @Autowired private CategoryMapper categoryMapper;
+
+  @Autowired private ItemMapper itemMapper;
+
+  @Autowired private SearchMenuResultItemMapper searchMenuResultItemMapper;
+
   final int DEFAULT_PAGE_NUMBER = 1;
   final int DEFAULT_PAGE_SIZE = 20;
 
@@ -80,7 +91,7 @@ public void listMenusFilteredByRestaurantId() {
 
     List<SearchMenuResultItem> expectedMenuList =
         matching.stream()
-            .map(DomainToDtoMapper::toSearchMenuResultItem)
+            .map(m -> searchMenuResultItemMapper.toDto(m))
             .collect(Collectors.toList());
 
     SearchMenuResult expectedResponse =
@@ -111,7 +122,7 @@ public void getMenuById() {
         new Category(categoryId, "cat name", "cat description", Arrays.asList(item));
     menu.addOrUpdateCategory(category);
 
-    MenuDTO expectedResponse = DomainToDtoMapper.toMenuDto(menu);
+    MenuDTO expectedResponse = menuMapper.toDto(menu);
 
     // When
     var response =
diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/api/v2/impl/QueryMenuControllerImplV2Test.java b/java/src/test/java/com/amido/stacks/workloads/menu/api/v2/impl/QueryMenuControllerImplV2Test.java
index cb85f728..0b0b657b 100644
--- a/java/src/test/java/com/amido/stacks/workloads/menu/api/v2/impl/QueryMenuControllerImplV2Test.java
+++ b/java/src/test/java/com/amido/stacks/workloads/menu/api/v2/impl/QueryMenuControllerImplV2Test.java
@@ -6,7 +6,7 @@
 
 import com.amido.stacks.workloads.menu.api.v1.dto.response.MenuDTO;
 import com.amido.stacks.workloads.menu.domain.Menu;
-import com.amido.stacks.workloads.menu.mappers.DomainToDtoMapper;
+import com.amido.stacks.workloads.menu.mappers.MenuMapper;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,13 +28,15 @@ class QueryMenuControllerImplV2Test {
 
   @Autowired private TestRestTemplate testRestTemplate;
 
+  @Autowired private MenuMapper menuMapper;
+
   @Test
   void getMenuById() {
     // Given
     Menu menu = createMenu(0);
     String restaurantId = "3930ddff-82ce-4f7e-b910-b0709b276cf0";
     menu.setRestaurantId(restaurantId);
-    MenuDTO expectedResponse = DomainToDtoMapper.toMenuDto(menu);
+    MenuDTO expectedResponse = menuMapper.toDto(menu);
 
     // When
     var response =
diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/mappers/DomainToDtoMapperTest.java b/java/src/test/java/com/amido/stacks/workloads/menu/mappers/DomainToDtoMapperMapstructTest.java
similarity index 82%
rename from java/src/test/java/com/amido/stacks/workloads/menu/mappers/DomainToDtoMapperTest.java
rename to java/src/test/java/com/amido/stacks/workloads/menu/mappers/DomainToDtoMapperMapstructTest.java
index 693ed0b1..9b4a573b 100644
--- a/java/src/test/java/com/amido/stacks/workloads/menu/mappers/DomainToDtoMapperTest.java
+++ b/java/src/test/java/com/amido/stacks/workloads/menu/mappers/DomainToDtoMapperMapstructTest.java
@@ -15,9 +15,30 @@
 import java.util.UUID;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
 
 @Tag("Unit")
-class DomainToDtoMapperTest {
+@SpringBootTest(
+    classes = {
+      MenuMapper.class,
+      MenuMapperImpl.class,
+      CategoryMapper.class,
+      CategoryMapperImpl.class,
+      ItemMapper.class,
+      ItemMapperImpl.class,
+      SearchMenuResultItemMapper.class,
+      SearchMenuResultItemMapperImpl.class
+    })
+class DomainToDtoMapperMapstructTest {
+
+  @Autowired private MenuMapper menuMapper;
+
+  @Autowired private CategoryMapper categoryMapper;
+
+  @Autowired private ItemMapper itemMapper;
+
+  @Autowired private SearchMenuResultItemMapper searchMenuResultItemMapper;
 
   @Test
   void menuToMenuDto() {
@@ -39,7 +60,7 @@ void menuToMenuDto() {
             enabled);
 
     // When
-    MenuDTO menuDTO = DomainToDtoMapper.toMenuDto(menu);
+    MenuDTO menuDTO = menuMapper.toDto(menu);
 
     // Then
     assertThat(menuDTO.getId()).isEqualTo(id);
@@ -63,14 +84,14 @@ void menuToMenuDtoWithNullCategories() {
     Menu menu = new Menu(id.toString(), restaurantId.toString(), name, description, null, enabled);
 
     // When
-    MenuDTO menuDTO = DomainToDtoMapper.toMenuDto(menu);
+    MenuDTO menuDTO = menuMapper.toDto(menu);
 
     // Then
     assertThat(menuDTO.getId()).isEqualTo(id);
     assertThat(menuDTO.getRestaurantId()).isEqualTo(restaurantId);
     assertThat(menuDTO.getName()).isEqualTo(name);
     assertThat(menuDTO.getDescription()).isEqualTo(description);
-    assertThat(menuDTO.getCategories()).isNull();
+    assertThat(menuDTO.getCategories()).isEmpty();
     assertThat(menuDTO.getEnabled()).isEqualTo(enabled);
   }
 
@@ -97,7 +118,7 @@ void menuToMenuDtoWithNullCategoryItems() {
             enabled);
 
     // When
-    MenuDTO menuDTO = DomainToDtoMapper.toMenuDto(menu);
+    MenuDTO menuDTO = menuMapper.toDto(menu);
 
     // Then
     assertThat(menuDTO.getId()).isEqualTo(id);
@@ -110,7 +131,7 @@ void menuToMenuDtoWithNullCategoryItems() {
     assertThat(menuDTO.getCategories().get(0).getDescription())
         .isEqualTo(category.getDescription());
     assertThat(menuDTO.getCategories().get(0).getId()).isEqualTo(category.getId());
-    assertThat(menuDTO.getCategories().get(0).getItems()).isNull();
+    assertThat(menuDTO.getCategories().get(0).getItems()).isEmpty();
   }
 
   @Test
@@ -126,7 +147,7 @@ void menuToSearchMenuResultItem() {
     Menu menu = new Menu(id.toString(), restaurantId.toString(), name, description, null, enabled);
 
     // When
-    SearchMenuResultItem resultItem = DomainToDtoMapper.toSearchMenuResultItem(menu);
+    SearchMenuResultItem resultItem = searchMenuResultItemMapper.toDto(menu);
 
     // Then
     assertThat(resultItem.getId()).isEqualTo(id);
@@ -148,7 +169,7 @@ void itemToItemDto() {
     Item item = new Item(id, name, description, price, available);
 
     // When
-    ItemDTO itemDTO = DomainToDtoMapper.toItemDto(item);
+    ItemDTO itemDTO = itemMapper.toDto(item);
 
     // Then
     assertThat(itemDTO.getId()).isEqualTo(id);
@@ -168,7 +189,7 @@ void categoryToCategoryDto() {
     Category category = new Category(id, name, description, Collections.emptyList());
 
     // When
-    CategoryDTO categoryDTO = DomainToDtoMapper.toCategoryDto(category);
+    CategoryDTO categoryDTO = categoryMapper.toDto(category);
 
     // Then
     assertThat(categoryDTO.getId()).isEqualTo(id);