diff --git a/src/openapi/products/productreference-crud.yaml b/src/openapi/products/productreference-crud.yaml
index 61b5e2b..7428502 100644
--- a/src/openapi/products/productreference-crud.yaml
+++ b/src/openapi/products/productreference-crud.yaml
@@ -23,7 +23,10 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/clientAttributesGetEntity'
+                type: object
+                properties:
+                  Entries:
+                    $ref: '#/components/schemas/clientAttributesGetList'
           description: A list of client attributes
         "400":
           content:
@@ -58,14 +61,14 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/clientAttributesPostEntity'
+              $ref: '#/components/schemas/clientAttributesPostPutEntity'
         required: true
       responses:
         "201":
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/_clientattributes_post_201_response'
+                $ref: '#/components/schemas/postPutSuccessResponse'
           description: ok
         "400":
           content:
@@ -126,7 +129,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/_clientattributes__clientAttributeId__put_404_response'
+                $ref: '#/components/schemas/postPut404Response'
           description: Not Found
         "500":
           content:
@@ -153,14 +156,14 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/clientAttributesPutEntity'
+              $ref: '#/components/schemas/clientAttributesPostPutEntity'
         required: true
       responses:
         "202":
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/_clientattributes_post_201_response'
+                $ref: '#/components/schemas/postPutSuccessResponse'
           description: ok
         "400":
           content:
@@ -178,7 +181,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/_clientattributes__clientAttributeId__put_404_response'
+                $ref: '#/components/schemas/postPut404Response'
           description: Not Found
         "409":
           content:
@@ -195,6 +198,188 @@ paths:
       summary: Modify a client attribute.
       tags:
       - ABTProductReference CRUD
+  /layerInfo:
+    get:
+      description: |
+        This method will get the list of all LayerInfo entries.
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  Entries:
+                    $ref: '#/components/schemas/layerInfoGetList'
+          description: A list of LayerInfo entries
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/400Response'
+          description: Bad Request
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/401Response'
+          description: Unauthorized
+        "404":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/404Response'
+          description: Not Found
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/500Response'
+          description: Internal Server Error
+      summary: Get all LayerInfo entries.
+      tags:
+      - ABTProductReference CRUD
+    post:
+      description: "This method will create new LayerInfo entry. \n"
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/layerInfoPostPutEntity'
+        required: true
+      responses:
+        "201":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/postPutSuccessResponse'
+          description: ok
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/400Response'
+          description: Bad Request
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/401Response'
+          description: Unauthorized
+        "404":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/404Response'
+          description: Not Found
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/500Response'
+          description: Internal Server Error
+      summary: Create a client attribute.
+      tags:
+      - ABTProductReference CRUD
+  /layerInfo/{layerInfoId}:
+    delete:
+      description: "This method will delete the LayerInfo entry for the given layerInfoId. \n"
+      parameters:
+      - explode: false
+        in: path
+        name: layerInfoId
+        required: true
+        schema:
+          format: integer
+          type: integer
+        style: simple
+      responses:
+        "202":
+          description: Deleted record successfully
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/400Response'
+          description: Bad Request
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/401Response'
+          description: Unauthorized
+        "404":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/postPut404Response'
+          description: Not Found
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/500Response'
+          description: Internal Server Error
+      summary: Delete a LayerInfo entry.
+      tags:
+      - ABTProductReference CRUD
+    put:
+      description: "This method will update the LayerInfo entry for the given layerInfoId. \n"
+      parameters:
+      - explode: false
+        in: path
+        name: layerInfoId
+        required: true
+        schema:
+          format: integer
+          type: integer
+        style: simple
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/layerInfoPostPutEntity'
+        required: true
+      responses:
+        "202":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/postPutSuccessResponse'
+          description: ok
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/400Response'
+          description: Bad Request
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/401Response'
+          description: Unauthorized
+        "404":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/postPut404Response'
+          description: Not Found
+        "409":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/409Response'
+          description: Conflict
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/500Response'
+          description: Internal Server Error
+      summary: Modify a LayerInfo entry.
+      tags:
+      - ABTProductReference CRUD
   /productowners:
     get:
       description: |
@@ -204,7 +389,10 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/productOwners'
+                type: object
+                properties:
+                  Entries:
+                    $ref: '#/components/schemas/productOwnerGetList'
           description: A list of users
         "400":
           content:
@@ -239,14 +427,14 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/productOwner'
+              $ref: '#/components/schemas/productOwnerPostPutEntity'
         required: true
       responses:
         "201":
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/_clientattributes_post_201_response'
+                $ref: '#/components/schemas/postPutSuccessResponse'
           description: ok
         "400":
           content:
@@ -307,7 +495,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/_clientattributes__clientAttributeId__put_404_response'
+                $ref: '#/components/schemas/postPut404Response'
           description: Not Found
         "500":
           content:
@@ -334,14 +522,14 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/productOwner'
+              $ref: '#/components/schemas/productOwnerPostPutEntity'
         required: true
       responses:
         "202":
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/_clientattributes_post_201_response'
+                $ref: '#/components/schemas/postPutSuccessResponse'
           description: ok
         "400":
           content:
@@ -359,7 +547,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/_clientattributes__clientAttributeId__put_404_response'
+                $ref: '#/components/schemas/postPut404Response'
           description: Not Found
         "409":
           content:
@@ -385,7 +573,10 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/productCategories'
+                type: object
+                properties:
+                  Entries:
+                    $ref: '#/components/schemas/productCategoryGetList'
           description: A list of users
         "400":
           content:
@@ -414,157 +605,6 @@ paths:
       summary: Get all productcategories.
       tags:
       - ABTProductReference CRUD
-    post:
-      description: |
-        This method will create a single product category.
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/productCategory'
-      responses:
-        "201":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/_clientattributes_post_201_response'
-          description: ok
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400Response'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/401Response'
-          description: Unauthorized
-        "404":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/404Response'
-          description: Not Found
-        "409":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/409Response'
-          description: Conflict
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/500Response'
-          description: Internal Server Error
-      summary: Create a product category.
-      tags:
-      - ABTProductReference CRUD
-  /productcategories/{productCategoryId}:
-    delete:
-      description: |
-        This method will delete the productCategory when provided the
-        productCategoryId.
-      parameters:
-      - explode: false
-        in: path
-        name: productCategoryId
-        required: true
-        schema:
-          format: integer
-          type: integer
-        style: simple
-      responses:
-        "202":
-          description: Deleted record successfully
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400Response'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/401Response'
-          description: Unauthorized
-        "404":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/_clientattributes__clientAttributeId__put_404_response'
-          description: Not Found
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/500Response'
-          description: Internal Server Error
-      summary: Delete a product category.
-      tags:
-      - ABTProductReference CRUD
-    put:
-      description: |
-        This method will update productCategory when provided the
-        productCategoryId.
-      parameters:
-      - explode: false
-        in: path
-        name: productCategoryId
-        required: true
-        schema:
-          format: integer
-          type: integer
-        style: simple
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/productCategory'
-        required: true
-      responses:
-        "202":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/_clientattributes_post_201_response'
-          description: ok
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400Response'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/401Response'
-          description: Unauthorized
-        "404":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/_clientattributes__clientAttributeId__put_404_response'
-          description: Not Found
-        "409":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/409Response'
-          description: Conflict
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/500Response'
-          description: Internal Server Error
-      summary: Modify a product category.
-      tags:
-      - ABTProductReference CRUD
   /customersegments:
     get:
       description: This method will get the list of customer segments.
@@ -573,7 +613,10 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/customerSegments'
+                type: object
+                properties:
+                  Entries:
+                    $ref: '#/components/schemas/customerSegmentGetList'
           description: A list of users
         "400":
           content:
@@ -602,154 +645,6 @@ paths:
       summary: Get all customer segments.
       tags:
       - ABTProductReference CRUD
-    post:
-      description: This method will create a single customer segment.
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/customerSegment'
-      responses:
-        "201":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/_clientattributes_post_201_response'
-          description: ok
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400Response'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/401Response'
-          description: Unauthorized
-        "404":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/404Response'
-          description: Not Found
-        "409":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/409Response'
-          description: Conflict
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/500Response'
-          description: Internal Server Error
-      summary: Create a customer segment.
-      tags:
-      - ABTProductReference CRUD
-  /customersegments/{customerSegmentId}:
-    delete:
-      description: |
-        This method will delete a customer segment when provided the customerSegmentId.
-      parameters:
-      - explode: false
-        in: path
-        name: customerSegmentId
-        required: true
-        schema:
-          format: integer
-          type: integer
-        style: simple
-      responses:
-        "202":
-          description: Deleted record successfully
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400Response'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/401Response'
-          description: Unauthorized
-        "404":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/_clientattributes__clientAttributeId__put_404_response'
-          description: Not Found
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/500Response'
-          description: Internal Server Error
-      summary: Delete a customer segment.
-      tags:
-      - ABTProductReference CRUD
-    put:
-      description: |
-        This method will update a customer segment when provided the customerSegmentId.
-      parameters:
-      - explode: false
-        in: path
-        name: customerSegmentId
-        required: true
-        schema:
-          format: integer
-          type: integer
-        style: simple
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/customerSegment'
-        required: true
-      responses:
-        "202":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/_clientattributes_post_201_response'
-          description: ok
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400Response'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/401Response'
-          description: Unauthorized
-        "404":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/_clientattributes__clientAttributeId__put_404_response'
-          description: Not Found
-        "409":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/409Response'
-          description: Conflict
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/500Response'
-          description: Internal Server Error
-      summary: Modify a customer segment.
-      tags:
-      - ABTProductReference CRUD
   /marketsegments:
     get:
       description: This method will get the list of market segments.
@@ -758,7 +653,10 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/marketSegments'
+                type: object
+                properties:
+                  Entries:
+                    $ref: '#/components/schemas/marketSegmentGetList'
           description: A list of users
         "400":
           content:
@@ -787,154 +685,6 @@ paths:
       summary: Get all market segments.
       tags:
       - ABTProductReference CRUD
-    post:
-      description: This method will create a single market segment.
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/marketSegment'
-      responses:
-        "201":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/_clientattributes_post_201_response'
-          description: ok
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400Response'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/401Response'
-          description: Unauthorized
-        "404":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/404Response'
-          description: Not Found
-        "409":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/409Response'
-          description: Conflict
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/500Response'
-          description: Internal Server Error
-      summary: Create a market segment.
-      tags:
-      - ABTProductReference CRUD
-  /marketsegments/{marketSegmentId}:
-    delete:
-      description: |
-        This method will delete a market segment when provided the marketSegmentId.
-      parameters:
-      - explode: false
-        in: path
-        name: marketSegmentId
-        required: true
-        schema:
-          format: integer
-          type: integer
-        style: simple
-      responses:
-        "202":
-          description: Deleted record successfully
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400Response'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/401Response'
-          description: Unauthorized
-        "404":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/_clientattributes__clientAttributeId__put_404_response'
-          description: Not Found
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/500Response'
-          description: Internal Server Error
-      summary: Delete a market segment.
-      tags:
-      - ABTProductReference CRUD
-    put:
-      description: |
-        This method will update a market segment when provided the marketSegmentId.
-      parameters:
-      - explode: false
-        in: path
-        name: marketSegmentId
-        required: true
-        schema:
-          format: integer
-          type: integer
-        style: simple
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/marketSegment'
-        required: true
-      responses:
-        "202":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/_clientattributes_post_201_response'
-          description: ok
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400Response'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/401Response'
-          description: Unauthorized
-        "404":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/_clientattributes__clientAttributeId__put_404_response'
-          description: Not Found
-        "409":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/409Response'
-          description: Conflict
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/500Response'
-          description: Internal Server Error
-      summary: Modify a market segment.
-      tags:
-      - ABTProductReference CRUD
   /paymentmoments:
     get:
       description: |
@@ -944,7 +694,10 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/paymentMoments'
+                type: object
+                properties:
+                  Entries:
+                    $ref: '#/components/schemas/paymentMomentGetList'
           description: A list of payment moments
         "400":
           content:
@@ -982,7 +735,10 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/retailers'
+                type: object
+                properties:
+                  Entries:
+                    $ref: '#/components/schemas/retailerGetList'
           description: A list of retailers
         "400":
           content:
@@ -1018,13 +774,13 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/retailer'
+              $ref: '#/components/schemas/retailerPostPutEntity'
       responses:
         "201":
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/_clientattributes_post_201_response'
+                $ref: '#/components/schemas/postPutSuccessResponse'
           description: ok
         "400":
           content:
@@ -1091,7 +847,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/_clientattributes__clientAttributeId__put_404_response'
+                $ref: '#/components/schemas/postPut404Response'
           description: Not Found
         "500":
           content:
@@ -1118,14 +874,14 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/retailer'
+              $ref: '#/components/schemas/retailerPostPutEntity'
         required: true
       responses:
         "202":
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/_clientattributes_post_201_response'
+                $ref: '#/components/schemas/postPutSuccessResponse'
           description: ok
         "400":
           content:
@@ -1143,7 +899,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/_clientattributes__clientAttributeId__put_404_response'
+                $ref: '#/components/schemas/postPut404Response'
           description: Not Found
         "409":
           content:
@@ -1180,7 +936,10 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/salesTouchpoints'
+                type: object
+                properties:
+                  Entries:
+                    $ref: '#/components/schemas/salesTouchpointGetList'
           description: A list of users
         "400":
           content:
@@ -1217,13 +976,13 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/salesTouchpoint'
+              $ref: '#/components/schemas/salesTouchpointPostPutEntity'
       responses:
         "201":
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/_clientattributes_post_201_response'
+                $ref: '#/components/schemas/postPutSuccessResponse'
           description: ok
         "400":
           content:
@@ -1285,7 +1044,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/_clientattributes__clientAttributeId__put_404_response'
+                $ref: '#/components/schemas/postPut404Response'
           description: Not Found
         "500":
           content:
@@ -1313,14 +1072,14 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/salesTouchpoint'
+              $ref: '#/components/schemas/salesTouchpointPostPutEntity'
         required: true
       responses:
         "202":
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/_clientattributes_post_201_response'
+                $ref: '#/components/schemas/postPutSuccessResponse'
           description: ok
         "400":
           content:
@@ -1338,7 +1097,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/_clientattributes__clientAttributeId__put_404_response'
+                $ref: '#/components/schemas/postPut404Response'
           description: Not Found
         "409":
           content:
@@ -1364,7 +1123,10 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/serviceOptions'
+                type: object
+                properties:
+                  Entries:
+                    $ref: '#/components/schemas/serviceOptionGetList'
           description: A list of users
         "400":
           content:
@@ -1393,156 +1155,6 @@ paths:
       summary: Get the list of serviceoptions.
       tags:
       - ABTProductReference CRUD
-    post:
-      description: |
-        This method will create a new serviceoptions.
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/serviceOption'
-      responses:
-        "201":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/_clientattributes_post_201_response'
-          description: ok
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400Response'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/401Response'
-          description: Unauthorized
-        "404":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/404Response'
-          description: Not Found
-        "409":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/409Response'
-          description: Conflict
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/500Response'
-          description: Internal Server Error
-      summary: Create a serviceoptions.
-      tags:
-      - ABTProductReference CRUD
-  /serviceoptions/{serviceOptionId}:
-    delete:
-      description: |
-        This method will delete serviceoptions when provided the
-        serviceoptionsId.
-      parameters:
-      - explode: false
-        in: path
-        name: serviceOptionId
-        required: true
-        schema:
-          format: integer
-          type: integer
-        style: simple
-      responses:
-        "202":
-          description: Deleted record successfully
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400Response'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/401Response'
-          description: Unauthorized
-        "404":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/_clientattributes__clientAttributeId__put_404_response'
-          description: Not Found
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/500Response'
-          description: Internal Server Error
-      summary: Delete a serviceoptions.
-      tags:
-      - ABTProductReference CRUD
-    put:
-      description: |
-        This method will create a new serviceoption.
-      parameters:
-      - explode: false
-        in: path
-        name: serviceOptionId
-        required: true
-        schema:
-          format: integer
-          type: integer
-        style: simple
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/serviceOption'
-        required: true
-      responses:
-        "202":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/_clientattributes_post_201_response'
-          description: ok
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400Response'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/401Response'
-          description: Unauthorized
-        "404":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/_clientattributes__clientAttributeId__put_404_response'
-          description: Not Found
-        "409":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/409Response'
-          description: Conflict
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/500Response'
-          description: Internal Server Error
-      summary: Create a serviceoption.
-      tags:
-      - ABTProductReference CRUD
   /mandatorycustomerdataitems:
     get:
       description: |
@@ -1551,30 +1163,11 @@ paths:
         "200":
           content:
             application/json:
-              example:
-                Entries:
-                - mandatoryCustomerDataItemId: 1
-                  customerDataItem: birthname
-                - mandatoryCustomerDataItemId: 2
-                  customerDataItem: surname
-                - mandatoryCustomerDataItemId: 3
-                  customerDataItem: dateOfBirth
-                - mandatoryCustomerDataItemId: 4
-                  customerDataItem: emailAddress
-                - mandatoryCustomerDataItemId: 5
-                  customerDataItem: address
-                - mandatoryCustomerDataItemId: 6
-                  customerDataItem: phone
-                - mandatoryCustomerDataItemId: 7
-                  customerDataItem: ovPayToken
-                - mandatoryCustomerDataItemId: 8
-                  customerDataItem: padBirthDate
-                - mandatoryCustomerDataItemId: 9
-                  customerDataItem: shippingAddress
-                - mandatoryCustomerDataItemId: 10
-                  customerDataItem: billingAddress
               schema:
-                $ref: '#/components/schemas/mandatoryCustomerDataItems'
+                type: object
+                properties:
+                  Entries:              
+                    $ref: '#/components/schemas/mandatoryCustomerDataItemGetList'
           description: A list of users
         "400":
           content:
@@ -1611,17 +1204,12 @@ paths:
         "200":
           content:
             application/json:
-              example:
-                Entries:
-                - requiredCustomerLevelId: 1
-                  name: guest
-                - requiredCustomerLevelId: 2
-                  name: contact
-                - requiredCustomerLevelId: 3
-                  name: profile
               schema:
-                $ref: '#/components/schemas/requiredCustomerLevels'
-          description: A list of users
+                type: object
+                properties:
+                  Entries:
+                    $ref: '#/components/schemas/requiredCustomerLevelGetList'
+          description: The list possible requiredcustomerlevels
         "400":
           content:
             application/json:
@@ -1657,7 +1245,10 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/getforbiddenPaymentMethodList'
+                type: object
+                properties:
+                  Entries:
+                    $ref: '#/components/schemas/forbiddenPaymentMethodGetList'
           description: A list of forbidden payment methods
         "400":
           content:
@@ -1696,7 +1287,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/requiredGboPersonalAttributes'
+                $ref: '#/components/schemas/requiredGboPersonalAttributeGetList'
           description: A list of Required GBO personal attributes
         "400":
           content:
@@ -1735,7 +1326,10 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/GboAgeProfileList'
+                type: object
+                properties:
+                  Entries:
+                    $ref: '#/components/schemas/gboAgeProfileGetList'
           description: A list of GBO age profiles
         "400":
           content:
@@ -1772,73 +1366,8 @@ paths:
         "200":
           content:
             application/json:
-              example:
-                Entries:
-                  clientAttributes:
-                    type: array
-                    items:
-                      type: object
-                      properties:
-                      - clientAttributeId: 1
-                        clientId: htm
-                        description: description
-                        isActive: "true"
-                        retailerId: 1
-                        salesTouchpointId: 2
-                productOwners:
-                - productOwnerId: 123
-                  name: name
-                  organization: org
-                productCategories:
-                - isTravelProduct: true
-                  name: name
-                  productCategoryId: 21
-                customerSegments:
-                - name: name
-                  customerSegmentId: 123
-                marketSegments:
-                - name: name
-                  marketSegmentId: 123
-                paymentMoments:
-                - paymentMomentId: 123
-                  name: name
-                retailers:
-                - name: name
-                  street: StreetName
-                  number: "12"
-                  numberAddition: E
-                  postalCode: 2222 BV
-                  city: Amsterdam
-                  country: NL
-                  emailAddress: sample@email.com
-                  phoneNumber: "6123456789"
-                  taxId: taxId
-                  imageReference: imageReference
-                  retailerId: 123
-                salesTouchpoints:
-                - isActive: true
-                  name: name
-                  retailerId: 21
-                  salesTouchPointId: 123
-                serviceOptions:
-                - action: action
-                  description: description
-                  serviceOptionId: 123
-                mandatoryCustomerDataItems:
-                - mandatoryCustomerDataItemId: 123
-                  customerDataItem: customerDataItem
-                requiredCustomerLevels:
-                - requiredCustomerLevelId: 123
-                  name: requiredCustomerLevel
-                forbiddenPaymentMethods:
-                - forbiddenPaymentMethodId: 123
-                  name: requiredCustomerLevel
-                  issuer: Kane
-                requiredGboPersonalAttributes:
-                - requiredGboPersonalAttributeId: 123
-                  name: requiredCustomerLevel
               schema:
-                $ref: '#/components/schemas/_productreferences_get_200_response'
+                $ref: '#/components/schemas/productReferencesGetList'
           description: Successful retrieved list of all possible product reference
             values
         "400":
@@ -1870,8 +1399,28 @@ paths:
       - ABTProductReference CRUD
 components:
   schemas:
-    clientAttribute:
+    clientAttributesGetList:
+        example:
+          - clientAttributesId: 1
+            clientId: 34r0QSQfr46rKmNezXpAteSymkLe
+            description: description1
+            isActive: "true"
+            retailerId: 1001
+            salesTouchpointId: 3
+          - clientAttributesId: 2
+            clientId: 65TkBRk5DyQkKmNezXpAteKlRzE6
+            description: description2
+            isActive: "false"
+            retailerId: 1000
+            salesTouchpointId: 2
+        type: array
+        items:
+          $ref: '#/components/schemas/clientAttributesGetEntity'
+    clientAttributesGetEntity:
       properties:
+        clientAttributesId:
+          example: 1
+          type: integer
         clientId:
           example: htm
           type: string
@@ -1888,190 +1437,267 @@ components:
           example: 2
           type: integer
       type: object
-    clientAttributesGetList:
-      items:
-        $ref: '#/components/schemas/clientAttributesGetList_inner'
-      type: array
-    clientAttributesGetEntity:
+    clientAttributesPostPutEntity:
+      properties:
+        clientId:
+          example: 34r0QSQfr46rKmNezXpAteSymkLe
+          type: string
+        description:
+          example: description
+          type: string
+        isActive:
+          example: true
+          type: boolean
+        retailerId:
+          example: 1001
+          type: integer
+        salesTouchpointId:
+          example: 3
+          type: integer
+      type: object
+    layerInfoGetList:
+        example:
+          - layerInfoId: 1
+            choiceKey: isRenewable
+            choiceLabel: Kies voor een doorlopend abonnement of een enkele termijn
+            isCustomChoice: false
+          - layerInfoId: 2
+            choiceKey: regio
+            choiceLabel: Kies een regio
+            isCustomChoice: true
+        type: array
+        items:
+          $ref: '#/components/schemas/layerInfoGetEntity'
+    layerInfoGetEntity:
+      properties:
+        layerInfoId:
+          example: 1
+          type: integer
+        choiceKey:
+          example: isRenewable
+          type: string
+        choiceLabel:
+          example: Kies voor een doorlopend abonnement of een enkele termijn
+          type: string
+        isCustomChoice:
+          example: false
+          type: boolean
+      type: object
+    layerInfoPostPutEntity:
+      properties:
+        choiceKey:
+          example: isRenewable
+          type: string
+        choiceLabel:
+          example: Kies voor een doorlopend abonnement of een enkele termijn
+          type: string
+        isCustomChoice:
+          example: false
+          type: boolean
+      type: object
+    productOwnerGetList:
       example:
-        Entries:
-        - clientId: htm
-          description: description
-          clientAttributeId: 1
-          isActive: "true"
-          retailerId: 1
-          salesTouchpointId: 2
-        - clientId: htm
-          description: description
-          clientAttributeId: 1
-          isActive: "true"
-          retailerId: 1
-          salesTouchpointId: 2
+        - productOwnerId: 1
+          organization: HTM
+          name: Corneel Verstoep
+        - productOwnerId: 2
+          organization: ABC
+          name: Pietje Puk
+      items:
+        $ref: '#/components/schemas/productOwnerGetEntity'
+      type: array
+    productOwnerGetEntity:
       properties:
-        Entries:
-          items:
-            $ref: '#/components/schemas/clientAttributesGetList_inner'
-          type: array
-      type: object
-    clientAttributesPostEntity:
-      properties:
-        clientId:
-          example: htm
-          type: string
-        description:
-          example: description
-          type: string
-        isActive:
-          example: true
-          type: boolean
-        retailerId:
+        productOwnerId:
           example: 1
           type: integer
-        salesTouchpointId:
-          example: 2
-          type: integer
-      type: object
-    clientAttributesPutEntity:
-      properties:
-        description:
-          example: description
-          type: string
-        isActive:
-          example: true
-          type: boolean
-        retailerId:
-          example: 1
-          type: integer
-        clientId:
-          example: retailer001
-          type: string
-        salesTouchpointId:
-          example: 1
-          type: integer
-      type: object
-    productOwner:
-      properties:
         organization:
-          example: org
+          example: HTM
           type: string
         name:
-          example: name
+          example: Corneel Verstoep
           type: string
       type: object
-    productOwnerIdList:
-      items:
-        $ref: '#/components/schemas/productOwnerIdList_inner'
-      type: array
-    productOwners:
-      example:
-        Entries:
-        - productOwnerId: 123
-          organization: org
-          name: name
-        - productOwnerId: 123
-          organization: org
-          name: name
+    productOwnerPostPutEntity:
       properties:
-        Entries:
-          items:
-            $ref: '#/components/schemas/productOwnerIdList_inner'
-          type: array
+        organization:
+          example: HTM
+          type: string
+        name:
+          example: Corneel Verstoep
+          type: string
       type: object
-    productCategory:
+    productCategoryGetList:
+      example:
+        - productCategoryId: 1
+          name: Kortingsabonnement
+          isTravelProduct: true
+        - productCategoryId: 2
+          name: Afgekocht reisrecht
+          isTravelProduct: true
+        - productCategoryId: 3
+          name: Supplement
+          isTravelProduct: true
+        - productCategoryId: 4
+          name: Productdrager
+          isTravelProduct: false
+        - productCategoryId: 5
+          name: Barcode
+          isTravelProduct: false
+        - productCategoryId: 6
+          name: Merchandise
+          isTravelProduct: false
+        - productCategoryId: 7
+          name: Functioneel product
+          isTravelProduct: false
+      type: array
+      items:
+        $ref: '#/components/schemas/productCategoryGetEntity'    
+    productCategoryGetEntity:
       properties:
+        productCategoryId:
+          example: 1
+          type: integer
+        name:
+          example: Kortingsabonnement
+          type: string
         isTravelProduct:
           example: true
           type: boolean
+      type: object
+    customerSegmentGetList:
+      example:
+        - customerSegmentId: 1
+          name: Kind (4-11)
+        - customerSegmentId: 2
+          name: Jongere (12-17)
+        - customerSegmentId: 3
+          name: Volwassene (18-64)
+        - customerSegmentId: 4
+          name: Oudere (65+)
+        - customerSegmentId: 5
+          name: Student
+        - customerSegmentId: 6
+          name: Ooievaarspas-gerechtigde
+      items:
+        $ref: '#/components/schemas/customerSegmentGetEntity'
+      type: array
+    customerSegmentGetEntity:
+      properties:
+        customerSegmentId:
+          example: 1
+          type: integer
+        name:
+          example: Kind (4-11)
+          type: string
+      type: object
+    marketSegmentGetList:
+      example:
+        Entries:
+        - marketSegmentId: 1
+          name: B2C
+        - marketSegmentId: 2
+          name: B2B2C  
+        - marketSegmentId: 3
+          name: B2B  
+      items:
+        $ref: '#/components/schemas/marketSegmentGetEntity'
+      type: array
+    marketSegmentGetEntity:
+      properties:
+        marketSegmentId:
+          example: 1
+          type: integer
+        name:
+          example: name
+          type: string    
+    paymentMomentGetList:
+      example:
+        - paymentMomentId: 1
+          name: prepaid
+        - paymentMomentId: 2
+          name: postpaid
+        - paymentMomentId: 3
+          name: prepaid and postpaid
+      items:
+        $ref: '#/components/schemas/paymentMomentGetEntity'
+      type: array
+    paymentMomentGetEntity:
+      properties:
+         paymentMomentId:
+          example: 1
+          type: integer
+         name:
+          example: prepaid
+          type: string    
+    retailerGetList:
+      example:
+        - retailerId: 1000
+          name: HTM interne touchpoints
+          street: Koningin Julianaplein
+          number: "10"
+          numberAddition: 
+          postalCode: 2595 AA
+          city: Den Haag
+          country: NL
+          emailAddress: info@htm.nl
+          phoneNumber: "070 374 9002"        
+          taxId: "572309345923"
+          imageReference: https://www.htm.nl/media/leif2leu/htm-logo-mobile.svg
+        - retailerId: 1001
+          name: HTM externe touchpoints
+          street: Koningin Julianaplein
+          number: "10"
+          numberAddition: 
+          postalCode: 2595 AA
+          city: Den Haag
+          country: NL
+          emailAddress: info@htm.nl
+          phoneNumber: "070 374 9002"        
+          taxId: "572309345923"
+          imageReference: https://www.htm.nl/media/leif2leu/htm-logo-mobile.svg     
+      items:
+        $ref: '#/components/schemas/retailerGetEntity'
+      type: array
+    retailerGetEntity:
+      properties:
+        retailerId:
+          example: 1
+          type: integer
         name:
           example: name
           type: string
-      type: object
-    productCategoryIdList:
-      items:
-        $ref: '#/components/schemas/productCategoryIdList_inner'
-      type: array
-    productCategories:
-      example:
-        Entries:
-        - productCategoryId: 21
-          name: name
-          isTravelProduct: true
-        - productCategoryId: 21
-          name: name
-          isTravelProduct: true
-      properties:
-        Entries:
-          items:
-            $ref: '#/components/schemas/productCategoryIdList_inner'
-          type: array
-      type: object
-    customerSegment:
-      properties:
-        name:
-          example: name
+        street:
+          example: StreetName
           type: string
-      type: object
-    customerSegmentIdList:
-      items:
-        $ref: '#/components/schemas/customerSegmentIdList_inner'
-      type: array
-    customerSegments:
-      example:
-        Entries:
-        - name: name
-          customerSegmentId: 123
-        - name: name
-          customerSegmentId: 123
-      properties:
-        Entries:
-          items:
-            $ref: '#/components/schemas/customerSegmentIdList_inner'
-          type: array
-      type: object
-    paymentMoment:
-      properties:
-        results:
-          $ref: '#/components/schemas/paymentMoment_results'
-    paymentMomentIdList:
-      items:
-        $ref: '#/components/schemas/paymentMoment_results'
-      type: array
-    paymentMoments:
-      example:
-        Entries:
-        - paymentMomentId: 123
-          name: name
-        - paymentMomentId: 123
-          name: name
-      properties:
-        Entries:
-          items:
-            $ref: '#/components/schemas/paymentMoment_results'
-          type: array
-      type: object
-    marketSegment:
-      properties:
-        name:
-          example: name
+        number:
+          example: "12"
           type: string
-    marketSegmentIdList:
-      items:
-        $ref: '#/components/schemas/marketSegmentIdList_inner'
-      type: array
-    marketSegments:
-      example:
-        Entries:
-        - name: name
-          marketSegmentId: 123
-        - name: name
-          marketSegmentId: 123
-      properties:
-        Entries:
-          items:
-            $ref: '#/components/schemas/marketSegmentIdList_inner'
-          type: array
-      type: object
-    retailer:
+        numberAddition:
+          example: E
+          type: string
+        postalCode:
+          example: 2222 BV
+          type: string
+        city:
+          example: Amsterdam
+          type: string
+        country:
+          example: NL
+          type: string
+        emailAddress:
+          example: sample@email.com
+          type: string
+        phoneNumber:
+          example: "6123456789"
+          type: string
+        taxId:
+          example: taxId
+          type: string
+        imageReference:
+          example: imageReference
+          type: string
+    retailerPostPutEntity:
       properties:
         name:
           example: name
@@ -2106,78 +1732,62 @@ components:
         imageReference:
           example: imageReference
           type: string
-    retailerIdList:
-      items:
-        $ref: '#/components/schemas/retailerIdList_inner'
-      type: array
-    retailers:
+    salesTouchpointGetList:
       example:
-        Entries:
-        - number: "12"
-          country: NL
-          emailAddress: sample@email.com
-          phoneNumber: "6123456789"
-          city: Amsterdam
-          street: StreetName
-          taxId: taxId
-          postalCode: 2222 BV
-          name: name
-          numberAddition: E
-          imageReference: imageReference
-          retailerId: 123
-        - number: "12"
-          country: NL
-          emailAddress: sample@email.com
-          phoneNumber: "6123456789"
-          city: Amsterdam
-          street: StreetName
-          taxId: taxId
-          postalCode: 2222 BV
-          name: name
-          numberAddition: E
-          imageReference: imageReference
-          retailerId: 123
+        - salesTouchpointId: 1
+          name: SMP (Service Medewerker Portaal)
+          isActive: true
+          retailerId: 1000
+        - salesTouchpointId: 2
+          name: Website (Perplex)
+          isActive: true
+          retailerId: 1001
+      items:
+        $ref: '#/components/schemas/salesTouchpointGetEntity'
+      type: array
+    salesTouchpointGetEntity:
       properties:
-        Entries:
-          items:
-            $ref: '#/components/schemas/retailerIdList_inner'
-          type: array
-      type: object
-    salesTouchpoint:
-      properties:
-        isActive:
-          example: true
-          type: boolean
+        salesTouchpointId:
+          example: 1
+          type: integer
         name:
           example: name
           type: string
+        isActive:
+          example: true
+          type: boolean
         retailerId:
-          example: 21
+          example: 1
           type: integer
       type: object
-    salesTouchpointIdList:
-      items:
-        $ref: '#/components/schemas/salesTouchpointIdList_inner'
-      type: array
-    salesTouchpoints:
-      example:
-        Entries:
-        - name: name
-          isActive: true
-          retailerId: 21
-          salesTouchpointId: 123
-        - name: name
-          isActive: true
-          retailerId: 21
-          salesTouchpointId: 123
+    salesTouchpointPostPutEntity:
       properties:
-        Entries:
-          items:
-            $ref: '#/components/schemas/salesTouchpointIdList_inner'
-          type: array
+        name:
+          example: name
+          type: string
+        isActive:
+          example: true
+          type: boolean
+        retailerId:
+          example: 1
+          type: integer
       type: object
-    serviceOption:
+    serviceOptionGetList:
+      example:
+        - serviceOptionId: 1
+          action: refundablePerDay
+          description: Per dag opzegbaar met geldteruggave naar rato
+        - serviceOptionId: 2
+          action: cancellableTermAhead
+          description: Per termijn vooruit opzegbaar, dus géén terugwerkende geldteruggave
+      items:
+        $ref: '#/components/schemas/serviceOptionGetEntity'
+      type: array
+    serviceOptionGetEntity:
       properties:
+        serviceOptionId:
+          example: 1
+          type: integer
         action:
           example: action
           type: string
@@ -2185,106 +1795,109 @@ components:
           example: description
           type: string
       type: object
-    serviceOptionIdList:
-      items:
-        $ref: '#/components/schemas/serviceOptionIdList_inner'
-      type: array
-    serviceOptions:
+    mandatoryCustomerDataItemGetList:
       example:
-        Entries:
-        - serviceOptionId: 123
-          action: action
-          description: description
-        - serviceOptionId: 123
-          action: action
-          description: description
-      properties:
-        Entries:
-          items:
-            $ref: '#/components/schemas/serviceOptionIdList_inner'
-          type: array
-      type: object
-    mandatoryCustomerDataItem:
+        - mandatoryCustomerDataItemId: 1
+          customerDataItem: birthname
+        - mandatoryCustomerDataItemId: 2
+          customerDataItem: surname
+        - mandatoryCustomerDataItemId: 3
+          customerDataItem: dateOfBirth
+        - mandatoryCustomerDataItemId: 4
+          customerDataItem: emailAddress
+        - mandatoryCustomerDataItemId: 5
+          customerDataItem: address
+        - mandatoryCustomerDataItemId: 6
+          customerDataItem: phone
+        - mandatoryCustomerDataItemId: 7
+          customerDataItem: ovPayToken
+        - mandatoryCustomerDataItemId: 8
+          customerDataItem: padBirthDate
+        - mandatoryCustomerDataItemId: 9
+          customerDataItem: shippingAddress
+        - mandatoryCustomerDataItemId: 10
+          customerDataItem: billingAddress
+      items:
+        $ref: '#/components/schemas/mandatoryCustomerDataItemGetEntity'
+      type: array
+    mandatoryCustomerDataItemGetEntity:
       properties:
+        mandatoryCustomerDataItemId:
+          example: 1
+          type: integer
         customerDataItem:
           example: customerDataItem
           type: string
       type: object
-    mandatoryCustomerDataItemIdList:
-      items:
-        $ref: '#/components/schemas/mandatoryCustomerDataItemIdList_inner'
-      type: array
-    mandatoryCustomerDataItems:
+    requiredCustomerLevelGetList:
       example:
-        Entries:
-        - mandatoryCustomerDataItemId: 1
-          customerDataItem: birthname
-        - mandatoryCustomerDataItemId: 1
-          customerDataItem: birthname
-      properties:
-        Entries:
-          items:
-            $ref: '#/components/schemas/mandatoryCustomerDataItemIdList_inner'
-          type: array
+        - requiredCustomerLevelId: 1
+          name: guest
+        - requiredCustomerLevelId: 2
+          name: contact
+        - requiredCustomerLevelId: 3
+          name: profile
+      items:
+        $ref: '#/components/schemas/requiredCustomerLevelGetEntity'
+      type: array
+    requiredCustomerLevelGetEntity:
       type: object
-    requiredCustomerLevelIdList:
-      items:
-        $ref: '#/components/schemas/requiredCustomerLevelIdList_inner'
-      type: array
-    requiredCustomerLevels:
-      example:
-        Entries:
-        - requiredCustomerLevelId: 123
-          name: requiredCustomerLevel
-        - requiredCustomerLevelId: 123
-          name: requiredCustomerLevel
       properties:
-        Entries:
-          items:
-            $ref: '#/components/schemas/requiredCustomerLevelIdList_inner'
-          type: array
-      type: object
-    forbiddenPaymentMethodList:
-      items:
-        $ref: '#/components/schemas/forbiddenPaymentMethodList_inner'
-      type: array
-    getforbiddenPaymentMethodList:
+        requiredCustomerLevelId:
+          example: 1
+          type: integer
+        name:
+          example: guest
+          type: string 
+    forbiddenPaymentMethodGetList:
       example:
-        Entries:
-        - forbiddenPaymentMethodId: 123
-          name: requiredCustomerLevel
-          issuer: Kane
-        - forbiddenPaymentMethodId: 123
-          name: requiredCustomerLevel
-          issuer: Kane
+        - forbiddenPaymentMethodId: 1
+          name: creditcard
+          issuer: Mastercard
+        - forbiddenPaymentMethodId: 2
+          name: creditcard
+          issuer: Visa
+        - forbiddenPaymentMethodId: 3
+          name: creditcard
+          issuer: American Express
+      items:
+        $ref: '#/components/schemas/forbiddenPaymentMethodGetEntity'
+      type: array
+    forbiddenPaymentMethodGetEntity:
       properties:
-        Entries:
-          items:
-            $ref: '#/components/schemas/forbiddenPaymentMethodList_inner'
-          type: array
+        forbiddenPaymentMethodId:
+          example: 3
+          type: integer
+        name:
+          example: creditcard
+          type: string
+        issuer:
+          example: American Express
+          type: string
       type: object
-    GetRequiredGboPersonalAttribute:
-      items:
-        $ref: '#/components/schemas/GetRequiredGboPersonalAttribute_inner'
-      type: array
-    requiredGboPersonalAttributes:
+    requiredGboPersonalAttributeGetList:
       example:
-        Entries:
         - name: NAME
           requiredGboPersonalAttributeId: 1
         - name: BIRTHDATE
           requiredGboPersonalAttributeId: 2
         - name: PHOTO
           requiredGboPersonalAttributeId: 3
-      properties:
-        Entries:
-          items:
-            $ref: '#/components/schemas/GetRequiredGboPersonalAttribute_inner'
-          type: array
-      type: object
-    GboAgeProfileList:
       items:
-        $ref: '#/components/schemas/GboAgeProfile'
+        $ref: '#/components/schemas/requiredGboPersonalAttributeGetEntity'
+      type: array
+    requiredGboPersonalAttributeGetEntity:
+      properties:
+        requiredGboPersonalAttributeId:
+          example: 1
+          type: integer
+        name:
+          example: NAME
+          type: string
+      type: object
+    gboAgeProfileGetList:
+      items:
+        $ref: '#/components/schemas/gboAgeProfileGetEntity'
       type: array
       example:
         Entries:
@@ -2308,7 +1921,7 @@ components:
           name: Oudere (65 jaar of ouder)
           ageFromInclusive: 65
           ageToInclusive: 999
-    GboAgeProfile:
+    gboAgeProfileGetEntity:
       type: object
       required:
         - gboAgeProfileId
@@ -2329,13 +1942,46 @@ components:
         ageToInclusive:
           type: integer
           description: The maximum age that the GBO age profile applies to
-          example: 11
-    GetproductReferences:
+          example: 11   
+    productReferencesGetList:
+      type: object
+      required:
+      - Entries
       properties:
         Entries:
-          $ref: '#/components/schemas/GetproductReferences_Entries'
-      type: object
-    "400Response":
+          type: object
+          properties:
+            clientAttributes:
+              $ref: '#/components/schemas/clientAttributesGetList'
+            layerInfos:
+              $ref: '#/components/schemas/layerInfoGetList'
+            productOwners:
+              $ref: '#/components/schemas/productOwnerGetList'
+            productCategories:
+              $ref: '#/components/schemas/productCategoryGetList'
+            customerSegments:
+              $ref: '#/components/schemas/customerSegmentGetList'
+            marketSegments:
+              $ref: '#/components/schemas/marketSegmentGetList'
+            paymentMoments:
+              $ref: '#/components/schemas/paymentMomentGetList'
+            retailers:
+              $ref: '#/components/schemas/retailerGetList'
+            salesTouchpoints:
+              $ref: '#/components/schemas/salesTouchpointGetList'
+            serviceOptions:      
+              $ref: '#/components/schemas/serviceOptionGetList'
+            mandatoryCustomerDataItems:
+              $ref: '#/components/schemas/mandatoryCustomerDataItemGetList'
+            requiredCustomerLevels:
+              $ref: '#/components/schemas/requiredCustomerLevelGetList'
+            forbiddenPaymentMethods:
+              $ref: '#/components/schemas/forbiddenPaymentMethodGetList'
+            requiredGboPersonalAttributes:
+              $ref: '#/components/schemas/requiredGboPersonalAttributeGetList'
+            gboAgeProfiles:
+              $ref: '#/components/schemas/gboAgeProfileGetList'
+    400Response:
       properties:
         code:
           example: "400"
@@ -2349,7 +1995,7 @@ components:
           example: '''2023-02-01 00:00:00'' is not a valid Datetime'
           type: string
       type: object
-    "401Response":
+    401Response:
       properties:
         code:
           example: "900901"
@@ -2364,7 +2010,7 @@ components:
             credentials
           type: string
       type: object
-    "404Response":
+    404Response:
       properties:
         code:
           example: "404"
@@ -2379,19 +2025,19 @@ components:
           example: The requested resource is not available.
           type: string
       type: object
-    "404ResponseId":
+    404ResponseId:
       properties:
         error:
           example: "No record found for id: 5"
           type: string
       type: object
-    "409Response":
+    409Response:
       properties:
         error:
           example: Entry already exists
           type: string
       type: object
-    "500Response":
+    500Response:
       properties:
         code:
           example: "500"
@@ -2404,7 +2050,7 @@ components:
         description:
           type: string
       type: object
-    _clientattributes_post_201_response:
+    postPutSuccessResponse:
       example:
         id: 1
       properties:
@@ -2412,251 +2058,7 @@ components:
           example: 1
           type: integer
       type: object
-    _clientattributes__clientAttributeId__put_404_response:
+    postPut404Response:
       oneOf:
       - $ref: '#/components/schemas/404ResponseId'
       - $ref: '#/components/schemas/404Response'
-    _productreferences_get_200_response:
-      allOf:
-      - $ref: '#/components/schemas/GetproductReferences'
-    clientAttributesGetList_inner:
-      example:
-        clientId: htm
-        description: description
-        clientAttributeId: 1
-        isActive: "true"
-        retailerId: 1
-        salesTouchpointId: 2
-      properties:
-        clientAttributeId:
-          example: 1
-          type: integer
-        clientId:
-          example: htm
-          type: string
-        description:
-          example: description
-          type: string
-        isActive:
-          example: "true"
-          type: string
-        retailerId:
-          example: 1
-          type: integer
-        salesTouchpointId:
-          example: 2
-          type: integer
-    productOwnerIdList_inner:
-      example:
-        productOwnerId: 123
-        organization: org
-        name: name
-      properties:
-        productOwnerId:
-          example: 123
-          type: integer
-        name:
-          example: name
-          type: string
-        organization:
-          example: org
-          type: string
-    productCategoryIdList_inner:
-      example:
-        productCategoryId: 21
-        name: name
-        isTravelProduct: true
-      properties:
-        isTravelProduct:
-          example: true
-          type: boolean
-        name:
-          example: name
-          type: string
-        productCategoryId:
-          example: 21
-          type: integer
-    customerSegmentIdList_inner:
-      example:
-        name: name
-        customerSegmentId: 123
-      properties:
-        name:
-          example: name
-          type: string
-        customerSegmentId:
-          example: 123
-          type: integer
-    paymentMoment_results:
-      example:
-        paymentMomentId: 123
-        name: name
-      properties:
-        paymentMomentId:
-          example: 123
-          type: integer
-        name:
-          example: name
-          type: string
-    marketSegmentIdList_inner:
-      example:
-        name: name
-        marketSegmentId: 123
-      properties:
-        name:
-          example: name
-          type: string
-        marketSegmentId:
-          example: 123
-          type: integer
-    retailerIdList_inner:
-      example:
-        number: "12"
-        country: NL
-        emailAddress: sample@email.com
-        phoneNumber: "6123456789"
-        city: Amsterdam
-        street: StreetName
-        taxId: taxId
-        postalCode: 2222 BV
-        name: name
-        numberAddition: E
-        imageReference: imageReference
-        retailerId: 123
-      properties:
-        name:
-          example: name
-          type: string
-        street:
-          example: StreetName
-          type: string
-        number:
-          example: "12"
-          type: string
-        numberAddition:
-          example: E
-          type: string
-        postalCode:
-          example: 2222 BV
-          type: string
-        city:
-          example: Amsterdam
-          type: string
-        country:
-          example: NL
-          type: string
-        emailAddress:
-          example: sample@email.com
-          type: string
-        phoneNumber:
-          example: "6123456789"
-          type: string
-        taxId:
-          example: taxId
-          type: string
-        imageReference:
-          example: imageReference
-          type: string
-        retailerId:
-          example: 123
-          type: integer
-    salesTouchpointIdList_inner:
-      example:
-        name: name
-        isActive: true
-        retailerId: 21
-        salesTouchpointId: 123
-      properties:
-        isActive:
-          example: true
-          type: boolean
-        name:
-          example: name
-          type: string
-        retailerId:
-          example: 21
-          type: integer
-        salesTouchpointId:
-          example: 123
-          type: integer
-    serviceOptionIdList_inner:
-      example:
-        serviceOptionId: 123
-        action: action
-        description: description
-      properties:
-        action:
-          example: action
-          type: string
-        description:
-          example: description
-          type: string
-        serviceOptionId:
-          example: 123
-          type: integer
-    mandatoryCustomerDataItemIdList_inner:
-      example:
-        mandatoryCustomerDataItemId: 1
-        customerDataItem: birthname
-      properties:
-        mandatoryCustomerDataItemId:
-          example: 1
-          type: integer
-        customerDataItem:
-          example: birthname
-          type: string
-    requiredCustomerLevelIdList_inner:
-      example:
-        requiredCustomerLevelId: 123
-        name: requiredCustomerLevel
-      properties:
-        requiredCustomerLevelId:
-          example: 123
-          type: integer
-        name:
-          example: requiredCustomerLevel
-          type: string
-    forbiddenPaymentMethodList_inner:
-      example:
-        forbiddenPaymentMethodId: 123
-        name: requiredCustomerLevel
-        issuer: Kane
-      properties:
-        forbiddenPaymentMethodId:
-          example: 123
-          type: integer
-        name:
-          example: CreditCard
-          type: string
-        issuer:
-          example: American Express
-          type: string
-      type: object
-    GetRequiredGboPersonalAttribute_inner:
-      example:
-        requiredGboPersonalAttributeId: 1
-        name: NAME
-      properties:
-        requiredGboPersonalAttributeId:
-          example: 1
-          type: integer
-        name:
-          example: NAME
-          type: string
-      type: object
-    GetproductReferences_Entries:
-      oneOf:
-      - $ref: '#/components/schemas/clientAttributesGetEntity'
-      - $ref: '#/components/schemas/productOwners'
-      - $ref: '#/components/schemas/productCategories'
-      - $ref: '#/components/schemas/customerSegments'
-      - $ref: '#/components/schemas/marketSegments'
-      - $ref: '#/components/schemas/paymentMoments'
-      - $ref: '#/components/schemas/retailers'
-      - $ref: '#/components/schemas/salesTouchpoints'
-      - $ref: '#/components/schemas/serviceOptions'
-      - $ref: '#/components/schemas/mandatoryCustomerDataItems'
-      - $ref: '#/components/schemas/requiredCustomerLevels'
-      - $ref: '#/components/schemas/getforbiddenPaymentMethodList'
-      - $ref: '#/components/schemas/requiredGboPersonalAttributes'
-      - $ref: '#/components/schemas/GboAgeProfileList'
\ No newline at end of file