diff --git a/gen/xyz/openbmc_project/Inventory/Connector/Embedded/meson.build b/gen/xyz/openbmc_project/Inventory/Connector/Embedded/meson.build
index cf2e4ab..9dc749d 100644
--- a/gen/xyz/openbmc_project/Inventory/Connector/Embedded/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Connector/Embedded/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Connector/Embedded__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Connector/Embedded.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Connector/Port/meson.build b/gen/xyz/openbmc_project/Inventory/Connector/Port/meson.build
index aa197d7..0f8ee14 100644
--- a/gen/xyz/openbmc_project/Inventory/Connector/Port/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Connector/Port/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Connector/Port__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Connector/Port.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Connector/Slot/meson.build b/gen/xyz/openbmc_project/Inventory/Connector/Slot/meson.build
index 6e08031..d580acf 100644
--- a/gen/xyz/openbmc_project/Inventory/Connector/Slot/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Connector/Slot/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Connector/Slot__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Connector/Slot.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/Asset/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Asset/meson.build
index 0043305..8bf8558 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Asset/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Asset/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Asset__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Asset.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/AssetTag/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/AssetTag/meson.build
index 66cf310..f6245ac 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/AssetTag/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/AssetTag/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/AssetTag__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/AssetTag.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/CLEI/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/CLEI/meson.build
index 967c894..905e9b8 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/CLEI/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/CLEI/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/CLEI__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/CLEI.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/Cacheable/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Cacheable/meson.build
index 5679fce..fa759a0 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Cacheable/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Cacheable/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Cacheable__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Cacheable.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/Compatible/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Compatible/meson.build
index e88631f..97902e6 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Compatible/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Compatible/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Compatible__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Compatible.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/CoolingType/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/CoolingType/meson.build
index e0c766d..c2f0072 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/CoolingType/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/CoolingType/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/CoolingType__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/CoolingType.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/Dimension/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Dimension/meson.build
index e9348bd..520276e 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Dimension/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Dimension/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Dimension__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Dimension.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/I2CDevice/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/I2CDevice/meson.build
index 13c0840..9f10faf 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/I2CDevice/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/I2CDevice/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/I2CDevice__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/I2CDevice.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/LocationCode/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/LocationCode/meson.build
index 9212321..bde930b 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/LocationCode/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/LocationCode/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/LocationCode__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/LocationCode.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/ManufacturerExt/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/ManufacturerExt/meson.build
index 9922c79..b7888ba 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/ManufacturerExt/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/ManufacturerExt/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/ManufacturerExt__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/ManufacturerExt.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel/meson.build
index 9461ab8..87a0f0f 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/Replaceable/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Replaceable/meson.build
index c13b00e..10dfbce 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Replaceable/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Replaceable/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Replaceable__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Replaceable.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/Revision/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Revision/meson.build
index fd5c16d..ca800ee 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Revision/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Revision/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Revision__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Revision.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/Slot/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Slot/meson.build
index 3480841..6d43d62 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Slot/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Slot/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Slot__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Slot.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/ThermalDirection/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/ThermalDirection/meson.build
index 776b30a..9497427 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/ThermalDirection/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/ThermalDirection/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/ThermalDirection__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/ThermalDirection.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier/meson.build
index 486a62c..2f05840 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/VendorInformation/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/VendorInformation/meson.build
index 0356ff7..6a9a172 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/VendorInformation/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/VendorInformation/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/VendorInformation__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/VendorInformation.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/VoltageControl/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/VoltageControl/meson.build
index 1b0d938..4b1a0aa 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/VoltageControl/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/VoltageControl/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/VoltageControl__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/VoltageControl.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Accelerator/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Accelerator/meson.build
index b059067..afb542f 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Accelerator/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Accelerator/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Accelerator__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Accelerator.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Battery/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Battery/meson.build
index dc67d71..1e3302c 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Battery/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Battery/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Battery__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Battery.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Bmc/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Bmc/meson.build
index 45abd95..d1fbd43 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Bmc/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Bmc/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Bmc__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Bmc.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Board/IOBoard/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Board/IOBoard/meson.build
index 5b288d2..bc1e497 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Board/IOBoard/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Board/IOBoard/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Board/IOBoard__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Board/IOBoard.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Board/Motherboard/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Board/Motherboard/meson.build
index 22e76f1..ac7b5f3 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Board/Motherboard/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Board/Motherboard/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Board/Motherboard__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Board/Motherboard.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Board/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Board/meson.build
index f5227d2..bf26102 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Board/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Board/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Board__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Board.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Cable/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Cable/meson.build
index 44fd1c2..fb82895 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Cable/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Cable/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Cable__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Cable.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Chassis/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Chassis/meson.build
index 11ae92b..752d777 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Chassis/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Chassis/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Chassis__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Chassis.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Connector/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Connector/meson.build
index aaf8678..66f7507 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Connector/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Connector/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Connector__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Connector.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig/meson.build
index e9a6cf3..4516423 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Cpu/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Cpu/meson.build
index 978a66b..0fa6066 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Cpu/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Cpu/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Cpu__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Cpu.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/CpuCore/meson.build b/gen/xyz/openbmc_project/Inventory/Item/CpuCore/meson.build
index a8047d1..ed462d6 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/CpuCore/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/CpuCore/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/CpuCore__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/CpuCore.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation/meson.build
index ec60754..fa11fa5 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Dimm/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Dimm/meson.build
index 892ca1c..eee51c7 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Dimm/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Dimm/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Dimm__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Dimm.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/DiskBackplane/meson.build b/gen/xyz/openbmc_project/Inventory/Item/DiskBackplane/meson.build
index 3ec573c..6fbec6a 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/DiskBackplane/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/DiskBackplane/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/DiskBackplane__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/DiskBackplane.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Drive/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Drive/meson.build
index 8c284ba..97306d2 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Drive/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Drive/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Drive__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Drive.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Ethernet/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Ethernet/meson.build
index be187e5..377c3a0 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Ethernet/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Ethernet/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Ethernet__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Ethernet.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/FabricAdapter/meson.build b/gen/xyz/openbmc_project/Inventory/Item/FabricAdapter/meson.build
index 9d47455..b4bd616 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/FabricAdapter/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/FabricAdapter/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/FabricAdapter__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/FabricAdapter.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Fan/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Fan/meson.build
index 0e0b70e..fb25897 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Fan/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Fan/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Fan__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Fan.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Global/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Global/meson.build
index 935712e..b4fe0fe 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Global/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Global/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Global__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Global.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/MemoryBuffer/meson.build b/gen/xyz/openbmc_project/Inventory/Item/MemoryBuffer/meson.build
index 12431b7..50b7393 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/MemoryBuffer/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/MemoryBuffer/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/MemoryBuffer__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/MemoryBuffer.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/NetworkInterface/meson.build b/gen/xyz/openbmc_project/Inventory/Item/NetworkInterface/meson.build
index 5ab263b..058cc68 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/NetworkInterface/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/NetworkInterface/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/NetworkInterface__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/NetworkInterface.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/PCIeDevice/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PCIeDevice/meson.build
index a4f6646..1daf876 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PCIeDevice/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PCIeDevice/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PCIeDevice__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PCIeDevice.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/PCIeSlot/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PCIeSlot/meson.build
index 76dcbac..a0b2247 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PCIeSlot/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PCIeSlot/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PCIeSlot__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PCIeSlot.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Panel/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Panel/meson.build
index d2336b2..b5e9cd5 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Panel/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Panel/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Panel__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Panel.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition/meson.build
index 21ad852..a53e471 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy/meson.build
index 5fede1c..21f6dc2 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities/meson.build
index 4835225..5f0dc48 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/meson.build
index 4c596d2..05dd356 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PersistentMemory__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PersistentMemory.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/PowerSupply/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PowerSupply/meson.build
index 19c0961..b8311e1 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PowerSupply/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PowerSupply/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PowerSupply__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PowerSupply.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Rotor/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Rotor/meson.build
index 4d1472a..8c3584c 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Rotor/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Rotor/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Rotor__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Rotor.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Storage/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Storage/meson.build
index 494d805..ce696ac 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Storage/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Storage/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Storage__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Storage.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/StorageController/meson.build b/gen/xyz/openbmc_project/Inventory/Item/StorageController/meson.build
index 846a54e..d3d31c9 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/StorageController/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/StorageController/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/StorageController__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/StorageController.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/System/meson.build b/gen/xyz/openbmc_project/Inventory/Item/System/meson.build
index 59ba629..ab1d865 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/System/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/System/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/System__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/System.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Tpm/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Tpm/meson.build
index e8a364d..7a1cd18 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Tpm/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Tpm/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Tpm__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Tpm.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Volume/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Volume/meson.build
index afe5246..a221001 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Volume/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Volume/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Volume__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Volume.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Vrm/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Vrm/meson.build
index 82b3de2..59e32ea 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Vrm/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Vrm/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Vrm__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Vrm.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Item/meson.build b/gen/xyz/openbmc_project/Inventory/Item/meson.build
index 602be81..86008f3 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Manager/meson.build b/gen/xyz/openbmc_project/Inventory/Manager/meson.build
index 2d4e11e..7840dca 100644
--- a/gen/xyz/openbmc_project/Inventory/Manager/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Manager/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Manager__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Manager.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Source/PLDM/Entity/meson.build b/gen/xyz/openbmc_project/Inventory/Source/PLDM/Entity/meson.build
index 51a29ac..fbc67cd 100644
--- a/gen/xyz/openbmc_project/Inventory/Source/PLDM/Entity/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Source/PLDM/Entity/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Source/PLDM/Entity__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Source/PLDM/Entity.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Inventory/Source/PLDM/FRU/meson.build b/gen/xyz/openbmc_project/Inventory/Source/PLDM/FRU/meson.build
index 9e301d4..9d4fa40 100644
--- a/gen/xyz/openbmc_project/Inventory/Source/PLDM/FRU/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Source/PLDM/FRU/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Source/PLDM/FRU__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Source/PLDM/FRU.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',