diff --git a/src/openapi/orders/service_engine_orders.yaml b/src/openapi/orders/service_engine_orders.yaml
index a1dbf19..70d34d4 100644
--- a/src/openapi/orders/service_engine_orders.yaml
+++ b/src/openapi/orders/service_engine_orders.yaml
@@ -28,55 +28,65 @@ paths:
             example:
               {
                 "purchaseDate": "2024-03-22",
-                "touchPointId": 1,
-                "customerProfileId": 1,
+                "customerProfileId": 1337,
+                "languageId": 1,
+                "billingAddressId": 1,
+                "shippingAddressId": 1,
                 "contents":
                   [
                     {
                       "productId": 1,
                       "quantity": 5,
-                      "personalization":
-                        {
-                          "gboProduct":
-                            {
-                              "ovPayTokenId": 1,
-                              "serviceReferenceId": "NLOV1234567ABCDEFG",
-                              "amount": 34,
-                              "ovpasNumber": "OV34567",
-                              "verificationCode": "A7H6",
-                              "startDate": "2024-03-22",
-                            },
-                          "tapconnectProduct":
-                            {
-                              "ticketLanguage": "NL",
-                              "validityStart": "2024-03-22",
-                              "validityStartTime": "10:30",
-                            },
-                        },
+                      "validFrom": "2024-03-22T09:00:00",
+                      "validUntil": null,
+                      "tokens":
+                        [
+                          {
+                            "tokenTypeId": 1,
+                            "ovPayTokenId": 1,
+                            "serviceReferenceId": "NLOV1234567ABCDEFG",
+                            "amount": 34,
+                            "ovpasNumber": "OV34567",
+                            "verificationCode": "A7H6",
+                            "personalAccountData":
+                              {
+                                "name": "Jan de Vries",
+                                "dateOfBirth": "01-01-1970",
+                                "photoReference": "DSC_0502.JPG",
+                                "fileType": "image/jpg",
+                                "challengeTypeId": 1,
+                                "oneTimePassword": "H5Iiz3JTaQeIV8p",
+                              },
+                          },
+                        ],
                     },
                     {
                       "productId": 2,
                       "quantity": 3,
-                      "personalization":
-                        {
-                          "gboProduct":
-                            {
-                              "ovPayTokenId": 2,
-                              "serviceReferenceId": "NLOV1234567ABCDEFG",
-                              "amount": 34,
-                              "ovpasNumber": "OV34567",
-                              "verificationCode": "A7H6",
-                              "startDate": "2024-03-22",
-                            },
-                          "tapconnectProduct":
-                            {
-                              "ticketLanguage": "NL",
-                              "validityStart": "2024-03-22",
-                              "validityStartTime": "10:30",
-                            },
-                        },
+                      "validFrom": "2024-03-22T09:00:00",
+                      "validUntil": null,
                     },
                   ],
+                "customer":
+                  {
+                    "birthname": "Jan",
+                    "surname": "Vries",
+                    "prefix": "de",
+                    "emailAddress": "jandevries@outlook.com",
+                    "dateOfBirth": "1970-01-01",
+                    "addresses":
+                      [
+                        {
+                          "addressTypeId": 1,
+                          "street": "Kon. Julianaplein",
+                          "houseNumber": 10,
+                          "houseNumberSuffix": "a",
+                          "postalCode": "2595 AA",
+                          "city": "Den Haag",
+                          "country": "NL",
+                        },
+                      ],
+                  },
               }
       responses:
         "201":
@@ -88,127 +98,117 @@ paths:
               example:
                 {
                   "validContents": true,
-                  "amountExclTax": 200,
-                  "taxPercentage": 21,
-                  "amountInclTax": 242,
                   "purchaseDate": "2024-03-22",
-                  "touchPointId": 1,
-                  "customerProfileId": 1,
+                  "customerProfileId": 1337,
+                  "languageId": 1,
+                  "billingAddressId": 1,
+                  "shippingAddressId": 1,
+                  "totalAmount": 121,
                   "contents":
                     [
                       {
                         "productId": 1,
                         "quantity": 5,
+                        "validFrom": "2024-03-22T09:00:00",
+                        "validUntil": null,
+                        "taxAmount": 21,
+                        "taxCode": "V21",
                         "amountExclTax": 100,
-                        "taxPercentage": 21,
                         "amountInclTax": 121,
-                        "personalization":
-                          {
-                            "gboProduct":
-                              {
-                                "ovPayTokenId": 1,
-                                "serviceReferenceId": "NLOV1234567ABCDEFG",
-                                "amount": 34,
-                                "ovpasNumber": "OV34567",
-                                "verificationCode": "A7H6",
-                                "startDate": "2024-03-22",
-                                "endDate": null,
-                                "isRenewable": true,
-                                "nextDebitDate": "2024-04-22",
-                                "termAmountExclTax": 100,
-                                "termAmountInclTax": 121,
-                              },
-                            "tapconnectProduct":
-                              {
-                                "ticketLanguage": "NL",
-                                "validityStart": "2020-03-22",
-                                "validityStartTime": "10:30",
-                              },
-                          },
-                        "additionalRemarks":
+                        "isRenewable": true,
+                        "nextDebitDate": "2024-04-22",
+                        "termAmountExclTax": 100,
+                        "termAmountInclTax": 121,
+                        "tokens":
                           [
                             {
-                              "code": "PERSONAL_DATA_NEEDED",
-                              "parameter": "dateOfBirth",
-                            },
-                            {
-                              "code": "PERSONAL_DATA_NEEDED",
-                              "parameter": "photo",
-                            },
-                            {
-                              "code": "MANDATE_REQUIRED",
-                              "parameter": "directDebitMandateId",
+                              "tokenTypeId": 1,
+                              "ovPayTokenId": 1,
+                              "serviceReferenceId": "NLOV1234567ABCDEFG",
+                              "amount": 34,
+                              "ovpasNumber": "OV34567",
+                              "verificationCode": "A7H6",
+                              "personalAccountData":
+                                {
+                                  "name": "Jan de Vries",
+                                  "dateOfBirth": "01-01-1970",
+                                  "photoReference": "DSC_0502.JPG",
+                                  "fileType": "image/jpg",
+                                  "challengeTypeId": 1,
+                                  "oneTimePassword": "H5Iiz3JTaQeIV8p",
+                                },
                             },
                           ],
+                        "additionalRemarks": [],
                         "validationErrors":
                           [
                             {
                               "detail": "Startdate of this product should be at most 60 days in the future.",
-                              "pointer": "#/contents[0]/personalization/gboProduct/startDate",
+                              "pointer": "#/contents[0]/validFrom",
                             },
                             {
                               "detail": "Combination of product and token type is not valid.",
-                              "pointer": "#/contents[0]/personalization/gboProduct/ovPayTokenId",
+                              "pointer": "#/contents[0]/tokens[0]/ovPayTokenId",
                             },
                           ],
                       },
                       {
                         "productId": 2,
                         "quantity": 3,
+                        "validFrom": "2024-03-22T09:00:00",
+                        "validUntil": null,
+                        "taxAmount": 21,
+                        "taxCode": "V21",
                         "amountExclTax": 100,
-                        "taxPercentage": 21,
                         "amountInclTax": 121,
-                        "personalization":
-                          {
-                            "gboProduct":
-                              {
-                                "ovPayTokenId": 1,
-                                "serviceReferenceId": "NLOV1234567ABCDEFG",
-                                "amount": 34,
-                                "ovpasNumber": "OV34567",
-                                "verificationCode": "A7H6",
-                                "startDate": "2024-03-22",
-                                "endDate": null,
-                                "isRenewable": true,
-                                "nextDebitDate": "2024-04-22",
-                                "termAmountExclTax": 100,
-                                "termAmountInclTax": 121,
-                              },
-                            "tapconnectProduct":
-                              {
-                                "ticketLanguage": "NL",
-                                "validityStart": "2020-03-22",
-                                "validityStartTime": "10:30",
-                              },
-                          },
-                        "additionalRemarks":
-                          [
-                            {
-                              "code": "PERSONAL_DATA_NEEDED",
-                              "parameter": "dateOfBirth",
-                            },
-                            {
-                              "code": "PERSONAL_DATA_NEEDED",
-                              "parameter": "photo",
-                            },
-                            {
-                              "code": "MANDATE_REQUIRED",
-                              "parameter": "directDebitMandateId",
-                            },
-                          ],
-                        "validationErrors":
-                          [
-                            {
-                              "detail": "Startdate of this product should be at most 60 days in the future.",
-                              "pointer": "#/contents[1]/personalization/gboProduct/startDate",
-                            },
-                            {
-                              "detail": "Combination of product and token type is not valid.",
-                              "pointer": "#/contents[1]/personalization/gboProduct/ovPayTokenId",
-                            },
-                          ],
+                        "isRenewable": true,
+                        "nextDebitDate": "2024-04-22",
+                        "termAmountExclTax": 100,
+                        "termAmountInclTax": 121,
                       },
                     ],
+                  "customer":
+                    {
+                      "birthname": "Jan",
+                      "surname": "Vries",
+                      "prefix": "de",
+                      "emailAddress": "jandevries@outlook.com",
+                      "dateOfBirth": "1970-01-01",
+                      "addresses":
+                        [
+                          {
+                            "addressTypeId": 1,
+                            "street": "Kon. Julianaplein",
+                            "houseNumber": 10,
+                            "houseNumberSuffix": "a",
+                            "postalCode": "2595 AA",
+                            "city": "Den Haag",
+                            "country": "NL",
+                          },
+                        ],
+                      "additionalRemarks":
+                        [
+                          {
+                            "code": "PERSONAL_DATA_NEEDED",
+                            "parameter": "dateOfBirth",
+                          },
+                          {
+                            "code": "PERSONAL_DATA_NEEDED",
+                            "parameter": "photo",
+                          },
+                          {
+                            "code": "MANDATE_REQUIRED",
+                            "parameter": "directDebitMandateId",
+                          },
+                        ],
+                      "validationErrors":
+                        [
+                          {
+                            "detail": "Startdate of this product should be at most 60 days in the future.",
+                            "pointer": "#/contents[1]/validFrom",
+                          },
+                        ],
+                    },
                 }
   /orders/{orderId}/fulfillment:
     post: