@almadar/std 8.4.2 → 9.0.0

package/behaviors/registry/service/organisms/std-service-marketplace.orb

@@ -54,7 +54,7 @@
             {
               "event": "CHECKOUT",
               "scope": "external",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -65,7 +65,7 @@
               "event": "ProductLoaded",
               "description": "Fired when Product finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Product]"
@@ -76,7 +76,7 @@
               "event": "ProductLoadFailed",
               "description": "Fired when Product fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -90,7 +90,7 @@
             {
               "event": "ProductSaved",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -100,7 +100,7 @@
             {
               "event": "ProductSaveFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -114,7 +114,7 @@
             {
               "event": "ProductUpdated",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -124,7 +124,7 @@
             {
               "event": "ProductUpdateFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -138,7 +138,7 @@
             {
               "event": "ProductDeleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -148,7 +148,7 @@
             {
               "event": "ProductDeleteFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -162,9 +162,9 @@
             {
               "event": "ProductOauthCompleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
-                  "name": "result",
+                  "name": "data",
                   "type": "object"
                 }
               ]
@@ -172,7 +172,7 @@
             {
               "event": "ProductOauthFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -186,9 +186,9 @@
             {
               "event": "ProductStripeCompleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
-                  "name": "result",
+                  "name": "data",
                   "type": "object"
                 }
               ]
@@ -196,7 +196,7 @@
             {
               "event": "ProductStripeFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -210,9 +210,9 @@
             {
               "event": "ProductEmailCompleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
-                  "name": "result",
+                  "name": "data",
                   "type": "object"
                 }
               ]
@@ -220,7 +220,7 @@
             {
               "event": "ProductEmailFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -234,7 +234,7 @@
             {
               "event": "OrderSaved",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -244,7 +244,7 @@
             {
               "event": "OrderSaveFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -258,7 +258,7 @@
             {
               "event": "OrderUpdated",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -268,7 +268,7 @@
             {
               "event": "OrderUpdateFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -282,7 +282,7 @@
             {
               "event": "OrderDeleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -292,7 +292,7 @@
             {
               "event": "OrderDeleteFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -345,7 +345,7 @@
               {
                 "key": "ProductLoaded",
                 "name": "Product loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Product]"
@@ -355,7 +355,7 @@
               {
                 "key": "ProductLoadFailed",
                 "name": "Product load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -373,7 +373,7 @@
               {
                 "key": "ProductSaved",
                 "name": "Product saved",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -383,7 +383,7 @@
               {
                 "key": "ProductSaveFailed",
                 "name": "Product save failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -397,7 +397,7 @@
               {
                 "key": "ProductUpdated",
                 "name": "Product updated",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -407,7 +407,7 @@
               {
                 "key": "ProductUpdateFailed",
                 "name": "Product update failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -421,7 +421,7 @@
               {
                 "key": "ProductDeleted",
                 "name": "Product deleted",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -431,7 +431,7 @@
               {
                 "key": "ProductDeleteFailed",
                 "name": "Product delete failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -445,9 +445,9 @@
               {
                 "key": "ProductOauthCompleted",
                 "name": "Product oauth completed",
-                "payload": [
+                "payloadSchema": [
                   {
-                    "name": "result",
+                    "name": "data",
                     "type": "object"
                   }
                 ]
@@ -455,7 +455,7 @@
               {
                 "key": "ProductOauthFailed",
                 "name": "Product oauth failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -469,9 +469,9 @@
               {
                 "key": "ProductStripeCompleted",
                 "name": "Product stripe completed",
-                "payload": [
+                "payloadSchema": [
                   {
-                    "name": "result",
+                    "name": "data",
                     "type": "object"
                   }
                 ]
@@ -479,7 +479,7 @@
               {
                 "key": "ProductStripeFailed",
                 "name": "Product stripe failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -493,9 +493,9 @@
               {
                 "key": "ProductEmailCompleted",
                 "name": "Product email completed",
-                "payload": [
+                "payloadSchema": [
                   {
-                    "name": "result",
+                    "name": "data",
                     "type": "object"
                   }
                 ]
@@ -503,7 +503,7 @@
               {
                 "key": "ProductEmailFailed",
                 "name": "Product email failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -517,7 +517,7 @@
               {
                 "key": "OrderSaved",
                 "name": "Order saved",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -527,7 +527,7 @@
               {
                 "key": "OrderSaveFailed",
                 "name": "Order save failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -541,7 +541,7 @@
               {
                 "key": "OrderUpdated",
                 "name": "Order updated",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -551,7 +551,7 @@
               {
                 "key": "OrderUpdateFailed",
                 "name": "Order update failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -565,7 +565,7 @@
               {
                 "key": "OrderDeleted",
                 "name": "Order deleted",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -575,7 +575,7 @@
               {
                 "key": "OrderDeleteFailed",
                 "name": "Order delete failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -589,7 +589,7 @@
               {
                 "key": "VIEW",
                 "name": "View",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -604,7 +604,7 @@
               {
                 "key": "EDIT",
                 "name": "Edit",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -619,7 +619,7 @@
               {
                 "key": "DELETE",
                 "name": "Delete",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -655,18 +655,18 @@
                       "direction": "vertical",
                       "className": "py-12",
                       "gap": "md",
+                      "type": "stack",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
-                          "content": "Loading…",
                           "variant": "caption",
+                          "content": "Loading…",
                           "type": "typography",
                           "color": "muted"
                         }
                       ],
-                      "type": "stack",
                       "align": "center"
                     }
                   ]
@@ -683,117 +683,116 @@
                     {
                       "children": [
                         {
-                          "type": "stack",
+                          "gap": "lg",
                           "direction": "vertical",
-                          "className": "max-w-5xl mx-auto w-full",
                           "children": [
                             {
+                              "direction": "horizontal",
+                              "justify": "between",
                               "children": [
                                 {
-                                  "align": "center",
+                                  "gap": "sm",
+                                  "type": "stack",
                                   "direction": "horizontal",
+                                  "align": "center",
                                   "children": [
                                     {
-                                      "name": "shopping-bag",
-                                      "type": "icon"
+                                      "type": "icon",
+                                      "name": "shopping-bag"
                                     },
                                     {
                                       "type": "typography",
-                                      "content": "Products",
-                                      "variant": "h2"
+                                      "variant": "h2",
+                                      "content": "Products"
                                     }
-                                  ],
-                                  "type": "stack",
-                                  "gap": "sm"
+                                  ]
                                 },
                                 {
+                                  "gap": "sm",
+                                  "direction": "horizontal",
+                                  "type": "stack",
                                   "children": [
                                     {
                                       "type": "button",
                                       "label": "Create Product",
                                       "action": "CREATE",
-                                      "icon": "plus",
-                                      "variant": "primary"
+                                      "variant": "primary",
+                                      "icon": "plus"
                                     }
-                                  ],
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "sm"
+                                  ]
                                 }
                               ],
-                              "type": "stack",
                               "gap": "md",
-                              "direction": "horizontal",
-                              "align": "center",
-                              "justify": "between"
+                              "type": "stack",
+                              "align": "center"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "entity": "@payload.data",
-                              "type": "data-grid",
-                              "itemActions": [
-                                {
-                                  "event": "VIEW",
-                                  "label": "View",
-                                  "variant": "ghost"
-                                },
-                                {
-                                  "label": "Edit",
-                                  "variant": "ghost",
-                                  "event": "EDIT"
-                                },
-                                {
-                                  "variant": "danger",
-                                  "event": "DELETE",
-                                  "label": "Delete"
-                                }
-                              ],
-                              "fields": [],
                               "columns": [
                                 {
-                                  "variant": "h4",
-                                  "name": "name",
                                   "label": "Name",
-                                  "icon": "shopping-bag"
+                                  "icon": "shopping-bag",
+                                  "variant": "h4",
+                                  "name": "name"
                                 },
                                 {
                                   "label": "Description",
-                                  "name": "description",
-                                  "variant": "badge",
                                   "colorMap": {
-                                    "archived": "neutral",
-                                    "done": "success",
-                                    "pending": "warning",
-                                    "error": "destructive",
-                                    "cancelled": "destructive",
-                                    "scheduled": "warning",
                                     "completed": "success",
-                                    "disabled": "neutral",
+                                    "cancelled": "destructive",
                                     "inactive": "neutral",
-                                    "active": "success",
+                                    "error": "destructive",
+                                    "pending": "warning",
+                                    "disabled": "neutral",
+                                    "draft": "warning",
                                     "failed": "destructive",
-                                    "draft": "warning"
-                                  }
+                                    "scheduled": "warning",
+                                    "done": "success",
+                                    "active": "success",
+                                    "archived": "neutral"
+                                  },
+                                  "variant": "badge",
+                                  "name": "description"
                                 },
                                 {
-                                  "variant": "caption",
                                   "label": "Price",
+                                  "variant": "caption",
                                   "name": "price"
                                 }
-                              ]
+                              ],
+                              "itemActions": [
+                                {
+                                  "variant": "ghost",
+                                  "event": "VIEW",
+                                  "label": "View"
+                                },
+                                {
+                                  "label": "Edit",
+                                  "event": "EDIT",
+                                  "variant": "ghost"
+                                },
+                                {
+                                  "variant": "danger",
+                                  "label": "Delete",
+                                  "event": "DELETE"
+                                }
+                              ],
+                              "type": "data-grid",
+                              "entity": "@payload.data",
+                              "fields": []
                             }
                           ],
-                          "gap": "lg"
+                          "type": "stack",
+                          "className": "max-w-5xl mx-auto w-full"
                         }
                       ],
-                      "appName": "ServiceMarketplace",
                       "navItems": [
                         {
-                          "label": "Products",
                           "icon": "package",
-                          "href": "/products"
+                          "href": "/products",
+                          "label": "Products"
                         },
                         {
                           "icon": "layout-list",
@@ -802,8 +801,8 @@
                         },
                         {
                           "href": "/checkout",
-                          "icon": "credit-card",
-                          "label": "Checkout"
+                          "label": "Checkout",
+                          "icon": "credit-card"
                         },
                         {
                           "label": "Orders",
@@ -811,6 +810,7 @@
                           "icon": "clipboard-list"
                         }
                       ],
+                      "appName": "ServiceMarketplace",
                       "type": "dashboard-layout"
                     }
                   ]
@@ -826,35 +826,35 @@
                     "main",
                     {
                       "gap": "md",
+                      "type": "stack",
                       "className": "py-12",
-                      "direction": "vertical",
                       "children": [
                         {
+                          "color": "destructive",
                           "type": "icon",
-                          "name": "alert-triangle",
-                          "color": "destructive"
+                          "name": "alert-triangle"
                         },
                         {
-                          "content": "Failed to load product",
+                          "type": "typography",
                           "variant": "h3",
-                          "type": "typography"
+                          "content": "Failed to load product"
                         },
                         {
-                          "variant": "body",
                           "color": "muted",
-                          "content": "@payload.error",
-                          "type": "typography"
+                          "variant": "body",
+                          "type": "typography",
+                          "content": "@payload.error"
                         },
                         {
                           "label": "Retry",
-                          "variant": "primary",
                           "type": "button",
+                          "variant": "primary",
                           "icon": "rotate-ccw",
                           "action": "INIT"
                         }
                       ],
-                      "type": "stack",
-                      "align": "center"
+                      "align": "center",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -871,7 +871,7 @@
             {
               "event": "PRODUCT_CREATED",
               "scope": "external",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -882,7 +882,7 @@
               "event": "ProductLoadFailed",
               "description": "Fired when Product fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -897,7 +897,7 @@
               "event": "ProductLoaded",
               "description": "Fired when Product finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Product]"
@@ -907,7 +907,7 @@
             {
               "event": "ProductSaveFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -921,7 +921,7 @@
             {
               "event": "ProductSaved",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -955,7 +955,7 @@
               {
                 "key": "SAVE",
                 "name": "Save",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "object",
@@ -970,7 +970,7 @@
               {
                 "key": "ProductLoadFailed",
                 "name": "Product load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -984,7 +984,7 @@
               {
                 "key": "ProductLoaded",
                 "name": "Product loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Product]"
@@ -994,7 +994,7 @@
               {
                 "key": "ProductSaveFailed",
                 "name": "Product save failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1008,7 +1008,7 @@
               {
                 "key": "ProductSaved",
                 "name": "Product saved",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -1047,31 +1047,33 @@
                     "render-ui",
                     "modal",
                     {
+                      "gap": "md",
                       "type": "stack",
                       "direction": "vertical",
                       "children": [
                         {
-                          "direction": "horizontal",
-                          "type": "stack",
-                          "gap": "sm",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "plus-circle"
+                              "name": "plus-circle",
+                              "type": "icon"
                             },
                             {
+                              "variant": "h3",
                               "type": "typography",
-                              "content": "Create Product",
-                              "variant": "h3"
+                              "content": "Create Product"
                             }
-                          ]
+                          ],
+                          "gap": "sm",
+                          "direction": "horizontal",
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "type": "form-section",
                           "mode": "create",
+                          "submitEvent": "SAVE",
+                          "type": "form-section",
                           "cancelEvent": "CLOSE",
                           "fields": [
                             "name",
@@ -1079,11 +1081,9 @@
                             "price",
                             "category",
                             "inStock"
-                          ],
-                          "submitEvent": "SAVE"
+                          ]
                         }
-                      ],
-                      "gap": "md"
+                      ]
                     }
                   ]
                 ]
@@ -1124,8 +1124,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "success": "ProductSaved",
-                        "failure": "ProductSaveFailed"
+                        "failure": "ProductSaveFailed",
+                        "success": "ProductSaved"
                       }
                     }
                   ],
@@ -1159,7 +1159,7 @@
             {
               "event": "PRODUCT_UPDATED",
               "scope": "external",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -1170,7 +1170,7 @@
               "event": "ProductLoadFailed",
               "description": "Fired when Product fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1185,7 +1185,7 @@
               "event": "ProductLoaded",
               "description": "Fired when Product finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Product]"
@@ -1195,7 +1195,7 @@
             {
               "event": "ProductUpdateFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1209,7 +1209,7 @@
             {
               "event": "ProductUpdated",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -1235,7 +1235,7 @@
               {
                 "key": "EDIT",
                 "name": "Edit",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -1254,7 +1254,7 @@
               {
                 "key": "SAVE",
                 "name": "Save",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "object",
@@ -1269,7 +1269,7 @@
               {
                 "key": "ProductLoadFailed",
                 "name": "Product load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1283,7 +1283,7 @@
               {
                 "key": "ProductLoaded",
                 "name": "Product loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Product]"
@@ -1293,7 +1293,7 @@
               {
                 "key": "ProductUpdateFailed",
                 "name": "Product update failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1307,7 +1307,7 @@
               {
                 "key": "ProductUpdated",
                 "name": "Product updated",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -1338,8 +1338,8 @@
                     {
                       "id": "@payload.id",
                       "emit": {
-                        "failure": "ProductLoadFailed",
-                        "success": "ProductLoaded"
+                        "success": "ProductLoaded",
+                        "failure": "ProductLoadFailed"
                       }
                     }
                   ],
@@ -1347,29 +1347,31 @@
                     "render-ui",
                     "modal",
                     {
+                      "type": "stack",
                       "direction": "vertical",
+                      "gap": "md",
                       "children": [
                         {
                           "gap": "sm",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "edit"
+                              "name": "edit",
+                              "type": "icon"
                             },
                             {
-                              "content": "Edit Product",
                               "type": "typography",
+                              "content": "Edit Product",
                               "variant": "h3"
                             }
                           ],
-                          "type": "stack",
-                          "direction": "horizontal"
+                          "direction": "horizontal",
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "submitEvent": "SAVE",
+                          "entity": "@payload.row",
                           "type": "form-section",
                           "mode": "edit",
                           "cancelEvent": "CLOSE",
@@ -1380,11 +1382,9 @@
                             "category",
                             "inStock"
                           ],
-                          "entity": "@payload.row"
+                          "submitEvent": "SAVE"
                         }
-                      ],
-                      "gap": "md",
-                      "type": "stack"
+                      ]
                     }
                   ]
                 ]
@@ -1461,7 +1461,7 @@
               "event": "ProductLoaded",
               "description": "Fired when Product finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Product]"
@@ -1472,7 +1472,7 @@
               "event": "ProductLoadFailed",
               "description": "Fired when Product fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1502,7 +1502,7 @@
               {
                 "key": "VIEW",
                 "name": "View",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -1517,7 +1517,7 @@
               {
                 "key": "SAVE",
                 "name": "Save",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "object",
@@ -1528,7 +1528,7 @@
               {
                 "key": "ProductLoaded",
                 "name": "Product loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Product]"
@@ -1538,7 +1538,7 @@
               {
                 "key": "ProductLoadFailed",
                 "name": "Product load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1571,35 +1571,35 @@
                     "fetch",
                     "Product",
                     {
-                      "id": "@payload.id",
                       "emit": {
-                        "failure": "ProductLoadFailed",
-                        "success": "ProductLoaded"
-                      }
+                        "success": "ProductLoaded",
+                        "failure": "ProductLoadFailed"
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "gap": "md",
+                      "type": "stack",
                       "children": [
                         {
-                          "gap": "sm",
-                          "type": "stack",
                           "align": "center",
+                          "gap": "sm",
                           "children": [
                             {
-                              "name": "eye",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "eye"
                             },
                             {
-                              "type": "typography",
+                              "content": "@entity.name",
                               "variant": "h3",
-                              "content": "@entity.name"
+                              "type": "typography"
                             }
                           ],
-                          "direction": "horizontal"
+                          "direction": "horizontal",
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
@@ -1607,62 +1607,61 @@
                         {
                           "direction": "horizontal",
                           "gap": "md",
-                          "type": "stack",
                           "children": [
                             {
+                              "variant": "caption",
                               "type": "typography",
-                              "content": "Name",
-                              "variant": "caption"
+                              "content": "Name"
                             },
                             {
-                              "content": "@entity.name",
                               "variant": "body",
+                              "content": "@entity.name",
                               "type": "typography"
                             }
-                          ]
+                          ],
+                          "type": "stack"
                         },
                         {
-                          "gap": "md",
                           "type": "stack",
+                          "gap": "md",
                           "direction": "horizontal",
                           "children": [
                             {
-                              "type": "typography",
                               "variant": "caption",
-                              "content": "Description"
+                              "content": "Description",
+                              "type": "typography"
                             },
                             {
                               "type": "typography",
-                              "content": "@entity.description",
-                              "variant": "body"
+                              "variant": "body",
+                              "content": "@entity.description"
                             }
                           ]
                         },
                         {
-                          "type": "stack",
                           "direction": "horizontal",
+                          "gap": "md",
+                          "type": "stack",
                           "children": [
                             {
                               "variant": "caption",
-                              "type": "typography",
-                              "content": "Price"
+                              "content": "Price",
+                              "type": "typography"
                             },
                             {
                               "type": "typography",
-                              "content": "@entity.price",
-                              "variant": "body"
+                              "variant": "body",
+                              "content": "@entity.price"
                             }
-                          ],
-                          "gap": "md"
+                          ]
                         },
                         {
                           "direction": "horizontal",
-                          "gap": "md",
                           "children": [
                             {
                               "variant": "caption",
-                              "type": "typography",
-                              "content": "Category"
+                              "content": "Category",
+                              "type": "typography"
                             },
                             {
                               "variant": "body",
@@ -1670,21 +1669,22 @@
                               "content": "@entity.category"
                             }
                           ],
-                          "type": "stack"
+                          "type": "stack",
+                          "gap": "md"
                         },
                         {
-                          "gap": "md",
                           "direction": "horizontal",
+                          "gap": "md",
                           "children": [
                             {
                               "variant": "caption",
-                              "type": "typography",
-                              "content": "In Stock"
+                              "content": "In Stock",
+                              "type": "typography"
                             },
                             {
-                              "content": "@entity.inStock",
                               "type": "typography",
-                              "variant": "body"
+                              "variant": "body",
+                              "content": "@entity.inStock"
                             }
                           ],
                           "type": "stack"
@@ -1693,29 +1693,29 @@
                           "type": "divider"
                         },
                         {
-                          "type": "stack",
-                          "justify": "end",
-                          "direction": "horizontal",
-                          "gap": "sm",
                           "children": [
                             {
-                              "type": "button",
                               "icon": "edit",
-                              "variant": "primary",
                               "action": "EDIT",
-                              "label": "Edit"
+                              "type": "button",
+                              "label": "Edit",
+                              "variant": "primary"
                             },
                             {
                               "type": "button",
                               "label": "Close",
-                              "action": "CLOSE",
-                              "variant": "ghost"
+                              "variant": "ghost",
+                              "action": "CLOSE"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "sm",
+                          "justify": "end"
                         }
                       ],
-                      "direction": "vertical",
-                      "type": "stack"
+                      "gap": "md",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -1775,7 +1775,7 @@
             {
               "event": "PRODUCT_DELETED",
               "scope": "external",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -1785,7 +1785,7 @@
             {
               "event": "ProductDeleteFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1799,7 +1799,7 @@
             {
               "event": "ProductDeleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -1810,7 +1810,7 @@
               "event": "ProductLoadFailed",
               "description": "Fired when Product fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1825,7 +1825,7 @@
               "event": "ProductLoaded",
               "description": "Fired when Product finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Product]"
@@ -1851,7 +1851,7 @@
               {
                 "key": "DELETE",
                 "name": "Delete",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -1878,7 +1878,7 @@
               {
                 "key": "ProductDeleteFailed",
                 "name": "Product delete failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1892,7 +1892,7 @@
               {
                 "key": "ProductDeleted",
                 "name": "Product deleted",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -1902,7 +1902,7 @@
               {
                 "key": "ProductLoadFailed",
                 "name": "Product load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1916,7 +1916,7 @@
               {
                 "key": "ProductLoaded",
                 "name": "Product loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Product]"
@@ -1950,67 +1950,67 @@
                     "fetch",
                     "Product",
                     {
+                      "id": "@payload.id",
                       "emit": {
-                        "failure": "ProductLoadFailed",
-                        "success": "ProductLoaded"
-                      },
-                      "id": "@payload.id"
+                        "success": "ProductLoaded",
+                        "failure": "ProductLoadFailed"
+                      }
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
+                      "direction": "vertical",
+                      "type": "stack",
                       "children": [
                         {
                           "type": "stack",
+                          "align": "center",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "alert-triangle"
+                              "name": "alert-triangle",
+                              "type": "icon"
                             },
                             {
                               "content": "Delete Product",
-                              "type": "typography",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "type": "typography"
                             }
                           ],
-                          "gap": "sm",
-                          "align": "center",
-                          "direction": "horizontal"
+                          "direction": "horizontal",
+                          "gap": "sm"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "variant": "error",
+                          "message": "This action cannot be undone.",
                           "type": "alert",
-                          "message": "This action cannot be undone."
+                          "variant": "error"
                         },
                         {
-                          "direction": "horizontal",
-                          "gap": "sm",
                           "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "label": "Cancel",
-                              "variant": "ghost",
                               "type": "button",
-                              "action": "CANCEL"
+                              "action": "CANCEL",
+                              "label": "Cancel",
+                              "variant": "ghost"
                             },
                             {
-                              "label": "Delete",
                               "action": "CONFIRM_DELETE",
                               "icon": "check",
                               "type": "button",
-                              "variant": "danger"
+                              "variant": "danger",
+                              "label": "Delete"
                             }
                           ],
+                          "gap": "sm",
                           "justify": "end"
                         }
                       ],
-                      "type": "stack",
-                      "direction": "vertical",
                       "gap": "md"
                     }
                   ]
@@ -2177,7 +2177,7 @@
               "event": "AuthSessionLoadFailed",
               "description": "Fired when AuthSession fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -2192,7 +2192,7 @@
               "event": "AuthSessionLoaded",
               "description": "Fired when AuthSession finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[AuthSession]"
@@ -2202,7 +2202,7 @@
             {
               "event": "ProductOauthCompleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "object"
@@ -2212,7 +2212,7 @@
             {
               "event": "ProductOauthFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -2255,7 +2255,7 @@
               {
                 "key": "AUTH_URL_RECEIVED",
                 "name": "Auth Url Received",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "authUrl",
                     "type": "string"
@@ -2265,7 +2265,7 @@
               {
                 "key": "CALLBACK",
                 "name": "Callback",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "code",
                     "type": "string"
@@ -2275,7 +2275,7 @@
               {
                 "key": "FAILED",
                 "name": "Failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -2285,7 +2285,7 @@
               {
                 "key": "TOKEN_RECEIVED",
                 "name": "Token Received",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "accessToken",
                     "type": "string"
@@ -2307,7 +2307,7 @@
               {
                 "key": "TOKEN_REFRESHED",
                 "name": "Token Refreshed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "accessToken",
                     "type": "string"
@@ -2321,7 +2321,7 @@
               {
                 "key": "AuthSessionLoadFailed",
                 "name": "AuthSession load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -2335,7 +2335,7 @@
               {
                 "key": "AuthSessionLoaded",
                 "name": "AuthSession loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[AuthSession]"
@@ -2345,7 +2345,7 @@
               {
                 "key": "ProductOauthCompleted",
                 "name": "Product oauth completed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "object"
@@ -2355,7 +2355,7 @@
               {
                 "key": "ProductOauthFailed",
                 "name": "Product oauth failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -2387,29 +2387,51 @@
                     "render-ui",
                     "main",
                     {
+                      "navItems": [
+                        {
+                          "href": "/products",
+                          "label": "Products",
+                          "icon": "package"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Login",
+                          "href": "/login"
+                        },
+                        {
+                          "label": "Checkout",
+                          "href": "/checkout",
+                          "icon": "credit-card"
+                        },
+                        {
+                          "label": "Orders",
+                          "href": "/orders",
+                          "icon": "clipboard-list"
+                        }
+                      ],
+                      "appName": "ServiceMarketplace",
+                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "align": "center",
-                          "type": "stack",
                           "direction": "vertical",
                           "gap": "lg",
                           "children": [
                             {
-                              "gap": "md",
+                              "type": "stack",
+                              "direction": "horizontal",
                               "align": "center",
                               "children": [
                                 {
-                                  "type": "icon",
-                                  "name": "lock"
+                                  "name": "lock",
+                                  "type": "icon"
                                 },
                                 {
-                                  "variant": "h2",
                                   "type": "typography",
-                                  "content": "Sign In"
+                                  "content": "Sign In",
+                                  "variant": "h2"
                                 }
                               ],
-                              "direction": "horizontal",
-                              "type": "stack"
+                              "gap": "md"
                             },
                             {
                               "type": "divider"
@@ -2418,8 +2440,8 @@
                               "type": "select",
                               "options": [
                                 {
-                                  "value": "google",
-                                  "label": "Google"
+                                  "label": "Google",
+                                  "value": "google"
                                 },
                                 {
                                   "label": "GitHub",
@@ -2432,39 +2454,17 @@
                               ]
                             },
                             {
-                              "type": "button",
-                              "icon": "log-in",
-                              "variant": "primary",
                               "action": "LOGIN",
-                              "label": "Login"
+                              "icon": "log-in",
+                              "type": "button",
+                              "label": "Login",
+                              "variant": "primary"
                             }
-                          ]
-                        }
-                      ],
-                      "navItems": [
-                        {
-                          "href": "/products",
-                          "label": "Products",
-                          "icon": "package"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "label": "Login",
-                          "href": "/login"
-                        },
-                        {
-                          "href": "/checkout",
-                          "icon": "credit-card",
-                          "label": "Checkout"
-                        },
-                        {
-                          "href": "/orders",
-                          "label": "Orders",
-                          "icon": "clipboard-list"
+                          ],
+                          "align": "center",
+                          "type": "stack"
                         }
-                      ],
-                      "appName": "ServiceMarketplace",
-                      "type": "dashboard-layout"
+                      ]
                     }
                   ]
                 ]
@@ -2478,25 +2478,25 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "ServiceMarketplace",
-                      "type": "dashboard-layout",
                       "children": [
                         {
                           "title": "Authorizing...",
-                          "message": "Redirecting to provider for authorization.",
-                          "type": "loading-state"
+                          "type": "loading-state",
+                          "message": "Redirecting to provider for authorization."
                         }
                       ],
+                      "type": "dashboard-layout",
+                      "appName": "ServiceMarketplace",
                       "navItems": [
                         {
-                          "label": "Products",
                           "href": "/products",
-                          "icon": "package"
+                          "icon": "package",
+                          "label": "Products"
                         },
                         {
                           "icon": "layout-list",
-                          "label": "Login",
-                          "href": "/login"
+                          "href": "/login",
+                          "label": "Login"
                         },
                         {
                           "label": "Checkout",
@@ -2504,8 +2504,8 @@
                           "icon": "credit-card"
                         },
                         {
-                          "icon": "clipboard-list",
                           "href": "/orders",
+                          "icon": "clipboard-list",
                           "label": "Orders"
                         }
                       ]
@@ -2524,8 +2524,8 @@
                     },
                     {
                       "emit": {
-                        "success": "ProductOauthCompleted",
-                        "failure": "ProductOauthFailed"
+                        "failure": "ProductOauthFailed",
+                        "success": "ProductOauthCompleted"
                       }
                     }
                   ]
@@ -2545,13 +2545,11 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "ServiceMarketplace",
-                      "type": "dashboard-layout",
                       "navItems": [
                         {
+                          "icon": "package",
                           "label": "Products",
-                          "href": "/products",
-                          "icon": "package"
+                          "href": "/products"
                         },
                         {
                           "label": "Login",
@@ -2559,19 +2557,19 @@
                           "icon": "layout-list"
                         },
                         {
-                          "href": "/checkout",
                           "label": "Checkout",
+                          "href": "/checkout",
                           "icon": "credit-card"
                         },
                         {
-                          "label": "Orders",
+                          "icon": "clipboard-list",
                           "href": "/orders",
-                          "icon": "clipboard-list"
+                          "label": "Orders"
                         }
                       ],
+                      "appName": "ServiceMarketplace",
                       "children": [
                         {
-                          "gap": "lg",
                           "align": "center",
                           "children": [
                             {
@@ -2579,32 +2577,34 @@
                               "type": "icon"
                             },
                             {
-                              "variant": "h2",
                               "content": "Authorization Required",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "h2"
                             },
                             {
-                              "type": "typography",
                               "content": "@entity.authUrl",
                               "variant": "body",
+                              "type": "typography",
                               "color": "muted"
                             },
                             {
-                              "placeholder": "Paste authorization code here",
-                              "type": "input"
+                              "type": "input",
+                              "placeholder": "Paste authorization code here"
                             },
                             {
+                              "label": "Submit",
+                              "icon": "check",
                               "type": "button",
-                              "action": "CALLBACK",
                               "variant": "primary",
-                              "label": "Submit",
-                              "icon": "check"
+                              "action": "CALLBACK"
                             }
                           ],
+                          "gap": "lg",
                           "type": "stack",
                           "direction": "vertical"
                         }
-                      ]
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -2632,35 +2632,30 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "ServiceMarketplace",
-                      "type": "dashboard-layout",
                       "navItems": [
                         {
                           "label": "Products",
-                          "href": "/products",
-                          "icon": "package"
+                          "icon": "package",
+                          "href": "/products"
                         },
                         {
+                          "label": "Login",
                           "href": "/login",
-                          "icon": "layout-list",
-                          "label": "Login"
+                          "icon": "layout-list"
                         },
                         {
-                          "href": "/checkout",
                           "icon": "credit-card",
-                          "label": "Checkout"
+                          "label": "Checkout",
+                          "href": "/checkout"
                         },
                         {
-                          "href": "/orders",
+                          "label": "Orders",
                           "icon": "clipboard-list",
-                          "label": "Orders"
+                          "href": "/orders"
                         }
                       ],
                       "children": [
                         {
-                          "direction": "vertical",
-                          "type": "stack",
-                          "gap": "lg",
                           "align": "center",
                           "children": [
                             {
@@ -2668,35 +2663,40 @@
                               "name": "check-circle"
                             },
                             {
-                              "variant": "success",
                               "message": "Authenticated successfully",
-                              "type": "alert"
+                              "type": "alert",
+                              "variant": "success"
                             },
                             {
+                              "gap": "sm",
+                              "type": "stack",
+                              "justify": "center",
                               "children": [
                                 {
                                   "type": "button",
+                                  "action": "REFRESH",
                                   "label": "Refresh Token",
                                   "variant": "ghost",
-                                  "action": "REFRESH",
                                   "icon": "refresh-cw"
                                 },
                                 {
-                                  "icon": "log-out",
-                                  "action": "LOGOUT",
                                   "label": "Logout",
+                                  "action": "LOGOUT",
                                   "type": "button",
+                                  "icon": "log-out",
                                   "variant": "ghost"
                                 }
                               ],
-                              "justify": "center",
-                              "direction": "horizontal",
-                              "gap": "sm",
-                              "type": "stack"
+                              "direction": "horizontal"
                             }
-                          ]
+                          ],
+                          "direction": "vertical",
+                          "gap": "lg",
+                          "type": "stack"
                         }
-                      ]
+                      ],
+                      "type": "dashboard-layout",
+                      "appName": "ServiceMarketplace"
                     }
                   ]
                 ]
@@ -2715,53 +2715,53 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "ServiceMarketplace",
                       "children": [
                         {
-                          "direction": "vertical",
-                          "gap": "lg",
                           "children": [
                             {
-                              "onRetry": "RETRY",
                               "type": "error-state",
                               "title": "Authentication Failed",
+                              "onRetry": "RETRY",
                               "message": "@entity.error"
                             },
                             {
                               "type": "button",
                               "label": "Try Again",
-                              "action": "RETRY",
                               "variant": "primary",
+                              "action": "RETRY",
                               "icon": "rotate-ccw"
                             }
                           ],
                           "align": "center",
-                          "type": "stack"
+                          "direction": "vertical",
+                          "type": "stack",
+                          "gap": "lg"
                         }
                       ],
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
+                          "label": "Products",
                           "href": "/products",
-                          "icon": "package",
-                          "label": "Products"
+                          "icon": "package"
                         },
                         {
-                          "label": "Login",
                           "icon": "layout-list",
+                          "label": "Login",
                           "href": "/login"
                         },
                         {
-                          "href": "/checkout",
+                          "label": "Checkout",
                           "icon": "credit-card",
-                          "label": "Checkout"
+                          "href": "/checkout"
                         },
                         {
+                          "label": "Orders",
                           "href": "/orders",
-                          "icon": "clipboard-list",
-                          "label": "Orders"
+                          "icon": "clipboard-list"
                         }
-                      ],
-                      "appName": "ServiceMarketplace",
-                      "type": "dashboard-layout"
+                      ]
                     }
                   ]
                 ]
@@ -2792,43 +2792,43 @@
                     {
                       "children": [
                         {
+                          "align": "center",
                           "children": [
                             {
-                              "name": "check-circle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "check-circle"
                             },
                             {
                               "type": "alert",
-                              "variant": "success",
-                              "message": "Authenticated successfully"
+                              "message": "Authenticated successfully",
+                              "variant": "success"
                             },
                             {
-                              "gap": "sm",
-                              "direction": "horizontal",
                               "type": "stack",
                               "justify": "center",
+                              "direction": "horizontal",
                               "children": [
                                 {
-                                  "variant": "ghost",
                                   "type": "button",
-                                  "icon": "refresh-cw",
+                                  "variant": "ghost",
                                   "label": "Refresh Token",
-                                  "action": "REFRESH"
+                                  "action": "REFRESH",
+                                  "icon": "refresh-cw"
                                 },
                                 {
-                                  "variant": "ghost",
                                   "type": "button",
                                   "icon": "log-out",
                                   "label": "Logout",
+                                  "variant": "ghost",
                                   "action": "LOGOUT"
                                 }
-                              ]
+                              ],
+                              "gap": "sm"
                             }
                           ],
+                          "gap": "lg",
                           "direction": "vertical",
-                          "align": "center",
-                          "type": "stack",
-                          "gap": "lg"
+                          "type": "stack"
                         }
                       ],
                       "type": "dashboard-layout",
@@ -2840,19 +2840,19 @@
                           "href": "/products"
                         },
                         {
-                          "icon": "layout-list",
+                          "label": "Login",
                           "href": "/login",
-                          "label": "Login"
+                          "icon": "layout-list"
                         },
                         {
+                          "label": "Checkout",
                           "href": "/checkout",
-                          "icon": "credit-card",
-                          "label": "Checkout"
+                          "icon": "credit-card"
                         },
                         {
                           "href": "/orders",
-                          "label": "Orders",
-                          "icon": "clipboard-list"
+                          "icon": "clipboard-list",
+                          "label": "Orders"
                         }
                       ]
                     }
@@ -2869,17 +2869,24 @@
                     "main",
                     {
                       "type": "dashboard-layout",
+                      "children": [
+                        {
+                          "title": "Refreshing token...",
+                          "type": "loading-state",
+                          "message": "Obtaining a new access token."
+                        }
+                      ],
                       "appName": "ServiceMarketplace",
                       "navItems": [
                         {
                           "href": "/products",
-                          "icon": "package",
-                          "label": "Products"
+                          "label": "Products",
+                          "icon": "package"
                         },
                         {
                           "href": "/login",
-                          "label": "Login",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "label": "Login"
                         },
                         {
                           "label": "Checkout",
@@ -2887,16 +2894,9 @@
                           "icon": "credit-card"
                         },
                         {
-                          "label": "Orders",
+                          "href": "/orders",
                           "icon": "clipboard-list",
-                          "href": "/orders"
-                        }
-                      ],
-                      "children": [
-                        {
-                          "type": "loading-state",
-                          "title": "Refreshing token...",
-                          "message": "Obtaining a new access token."
+                          "label": "Orders"
                         }
                       ]
                     }
@@ -2931,39 +2931,15 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "href": "/products",
-                          "label": "Products",
-                          "icon": "package"
-                        },
-                        {
-                          "label": "Login",
-                          "href": "/login",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "label": "Checkout",
-                          "href": "/checkout",
-                          "icon": "credit-card"
-                        },
-                        {
-                          "label": "Orders",
-                          "icon": "clipboard-list",
-                          "href": "/orders"
-                        }
-                      ],
                       "type": "dashboard-layout",
-                      "appName": "ServiceMarketplace",
                       "children": [
                         {
+                          "gap": "lg",
                           "type": "stack",
-                          "align": "center",
                           "direction": "vertical",
+                          "align": "center",
                           "children": [
                             {
-                              "align": "center",
-                              "type": "stack",
                               "direction": "horizontal",
                               "gap": "md",
                               "children": [
@@ -2972,11 +2948,13 @@
                                   "name": "lock"
                                 },
                                 {
-                                  "type": "typography",
                                   "content": "Sign In",
-                                  "variant": "h2"
+                                  "variant": "h2",
+                                  "type": "typography"
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "align": "center"
                             },
                             {
                               "type": "divider"
@@ -2984,12 +2962,12 @@
                             {
                               "options": [
                                 {
-                                  "value": "google",
-                                  "label": "Google"
+                                  "label": "Google",
+                                  "value": "google"
                                 },
                                 {
-                                  "label": "GitHub",
-                                  "value": "github"
+                                  "value": "github",
+                                  "label": "GitHub"
                                 },
                                 {
                                   "label": "Microsoft",
@@ -2999,16 +2977,38 @@
                               "type": "select"
                             },
                             {
+                              "type": "button",
+                              "action": "LOGIN",
                               "variant": "primary",
                               "icon": "log-in",
-                              "label": "Login",
-                              "type": "button",
-                              "action": "LOGIN"
+                              "label": "Login"
                             }
-                          ],
-                          "gap": "lg"
+                          ]
                         }
-                      ]
+                      ],
+                      "navItems": [
+                        {
+                          "href": "/products",
+                          "label": "Products",
+                          "icon": "package"
+                        },
+                        {
+                          "href": "/login",
+                          "icon": "layout-list",
+                          "label": "Login"
+                        },
+                        {
+                          "href": "/checkout",
+                          "label": "Checkout",
+                          "icon": "credit-card"
+                        },
+                        {
+                          "href": "/orders",
+                          "icon": "clipboard-list",
+                          "label": "Orders"
+                        }
+                      ],
+                      "appName": "ServiceMarketplace"
                     }
                   ]
                 ]
@@ -3027,71 +3027,71 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "ServiceMarketplace",
-                      "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "label": "Products",
-                          "href": "/products",
-                          "icon": "package"
-                        },
-                        {
-                          "label": "Login",
-                          "icon": "layout-list",
-                          "href": "/login"
-                        },
-                        {
-                          "href": "/checkout",
-                          "icon": "credit-card",
-                          "label": "Checkout"
-                        },
-                        {
-                          "icon": "clipboard-list",
-                          "label": "Orders",
-                          "href": "/orders"
-                        }
-                      ],
                       "children": [
                         {
-                          "direction": "vertical",
-                          "gap": "lg",
-                          "align": "center",
-                          "type": "stack",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "check-circle"
+                              "name": "check-circle",
+                              "type": "icon"
                             },
                             {
-                              "variant": "success",
                               "type": "alert",
+                              "variant": "success",
                               "message": "Authenticated successfully"
                             },
                             {
-                              "direction": "horizontal",
                               "justify": "center",
                               "children": [
                                 {
                                   "type": "button",
-                                  "action": "REFRESH",
-                                  "variant": "ghost",
                                   "label": "Refresh Token",
-                                  "icon": "refresh-cw"
+                                  "icon": "refresh-cw",
+                                  "action": "REFRESH",
+                                  "variant": "ghost"
                                 },
                                 {
+                                  "action": "LOGOUT",
+                                  "type": "button",
                                   "variant": "ghost",
                                   "icon": "log-out",
-                                  "type": "button",
-                                  "action": "LOGOUT",
                                   "label": "Logout"
                                 }
                               ],
-                              "gap": "sm",
-                              "type": "stack"
+                              "type": "stack",
+                              "direction": "horizontal",
+                              "gap": "sm"
                             }
-                          ]
+                          ],
+                          "direction": "vertical",
+                          "align": "center",
+                          "type": "stack",
+                          "gap": "lg"
                         }
-                      ]
+                      ],
+                      "navItems": [
+                        {
+                          "icon": "package",
+                          "href": "/products",
+                          "label": "Products"
+                        },
+                        {
+                          "label": "Login",
+                          "href": "/login",
+                          "icon": "layout-list"
+                        },
+                        {
+                          "icon": "credit-card",
+                          "label": "Checkout",
+                          "href": "/checkout"
+                        },
+                        {
+                          "icon": "clipboard-list",
+                          "href": "/orders",
+                          "label": "Orders"
+                        }
+                      ],
+                      "appName": "ServiceMarketplace",
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -3112,29 +3112,6 @@
                     {
                       "type": "dashboard-layout",
                       "appName": "ServiceMarketplace",
-                      "children": [
-                        {
-                          "gap": "lg",
-                          "type": "stack",
-                          "direction": "vertical",
-                          "align": "center",
-                          "children": [
-                            {
-                              "message": "@entity.error",
-                              "title": "Authentication Failed",
-                              "type": "error-state",
-                              "onRetry": "RETRY"
-                            },
-                            {
-                              "type": "button",
-                              "label": "Try Again",
-                              "variant": "primary",
-                              "action": "RETRY",
-                              "icon": "rotate-ccw"
-                            }
-                          ]
-                        }
-                      ],
                       "navItems": [
                         {
                           "icon": "package",
@@ -3142,19 +3119,42 @@
                           "href": "/products"
                         },
                         {
-                          "label": "Login",
                           "icon": "layout-list",
-                          "href": "/login"
+                          "href": "/login",
+                          "label": "Login"
                         },
                         {
                           "href": "/checkout",
-                          "icon": "credit-card",
-                          "label": "Checkout"
+                          "label": "Checkout",
+                          "icon": "credit-card"
                         },
                         {
-                          "icon": "clipboard-list",
+                          "label": "Orders",
                           "href": "/orders",
-                          "label": "Orders"
+                          "icon": "clipboard-list"
+                        }
+                      ],
+                      "children": [
+                        {
+                          "gap": "lg",
+                          "direction": "vertical",
+                          "align": "center",
+                          "children": [
+                            {
+                              "type": "error-state",
+                              "title": "Authentication Failed",
+                              "message": "@entity.error",
+                              "onRetry": "RETRY"
+                            },
+                            {
+                              "variant": "primary",
+                              "action": "RETRY",
+                              "type": "button",
+                              "icon": "rotate-ccw",
+                              "label": "Try Again"
+                            }
+                          ],
+                          "type": "stack"
                         }
                       ]
                     }
@@ -3172,36 +3172,33 @@
                     {
                       "children": [
                         {
-                          "type": "stack",
-                          "gap": "lg",
                           "align": "center",
                           "children": [
                             {
-                              "gap": "md",
-                              "type": "stack",
-                              "direction": "horizontal",
                               "align": "center",
+                              "type": "stack",
+                              "gap": "md",
                               "children": [
                                 {
-                                  "type": "icon",
-                                  "name": "lock"
+                                  "name": "lock",
+                                  "type": "icon"
                                 },
                                 {
-                                  "variant": "h2",
                                   "type": "typography",
+                                  "variant": "h2",
                                   "content": "Sign In"
                                 }
-                              ]
+                              ],
+                              "direction": "horizontal"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "type": "select",
                               "options": [
                                 {
-                                  "label": "Google",
-                                  "value": "google"
+                                  "value": "google",
+                                  "label": "Google"
                                 },
                                 {
                                   "value": "github",
@@ -3211,43 +3208,46 @@
                                   "label": "Microsoft",
                                   "value": "microsoft"
                                 }
-                              ]
+                              ],
+                              "type": "select"
                             },
                             {
-                              "variant": "primary",
                               "icon": "log-in",
-                              "label": "Login",
                               "type": "button",
-                              "action": "LOGIN"
+                              "variant": "primary",
+                              "action": "LOGIN",
+                              "label": "Login"
                             }
                           ],
-                          "direction": "vertical"
+                          "direction": "vertical",
+                          "type": "stack",
+                          "gap": "lg"
                         }
                       ],
-                      "appName": "ServiceMarketplace",
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
+                          "label": "Products",
                           "icon": "package",
-                          "href": "/products",
-                          "label": "Products"
+                          "href": "/products"
                         },
                         {
-                          "icon": "layout-list",
                           "href": "/login",
-                          "label": "Login"
+                          "label": "Login",
+                          "icon": "layout-list"
                         },
                         {
+                          "href": "/checkout",
                           "label": "Checkout",
-                          "icon": "credit-card",
-                          "href": "/checkout"
+                          "icon": "credit-card"
                         },
                         {
                           "label": "Orders",
-                          "href": "/orders",
-                          "icon": "clipboard-list"
+                          "icon": "clipboard-list",
+                          "href": "/orders"
                         }
                       ],
-                      "type": "dashboard-layout"
+                      "appName": "ServiceMarketplace"
                     }
                   ]
                 ]
@@ -3335,7 +3335,7 @@
               "event": "OrderPaymentLoadFailed",
               "description": "Fired when OrderPayment fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -3350,7 +3350,7 @@
               "event": "OrderPaymentLoaded",
               "description": "Fired when OrderPayment finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[OrderPayment]"
@@ -3360,7 +3360,7 @@
             {
               "event": "ProductStripeCompleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "object"
@@ -3370,7 +3370,7 @@
             {
               "event": "ProductStripeFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -3422,7 +3422,7 @@
               {
                 "key": "PAYMENT_CREATED",
                 "name": "Payment Created",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -3436,7 +3436,7 @@
               {
                 "key": "FAILED",
                 "name": "Failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -3462,7 +3462,7 @@
               {
                 "key": "OrderPaymentLoadFailed",
                 "name": "OrderPayment load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -3476,7 +3476,7 @@
               {
                 "key": "OrderPaymentLoaded",
                 "name": "OrderPayment loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[OrderPayment]"
@@ -3486,7 +3486,7 @@
               {
                 "key": "ProductStripeCompleted",
                 "name": "Product stripe completed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "object"
@@ -3496,7 +3496,7 @@
               {
                 "key": "ProductStripeFailed",
                 "name": "Product stripe failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -3519,8 +3519,8 @@
                     "OrderPayment",
                     {
                       "emit": {
-                        "failure": "OrderPaymentLoadFailed",
-                        "success": "OrderPaymentLoaded"
+                        "success": "OrderPaymentLoaded",
+                        "failure": "OrderPaymentLoadFailed"
                       }
                     }
                   ],
@@ -3528,96 +3528,96 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "label": "Products",
-                          "href": "/products",
-                          "icon": "package"
-                        },
-                        {
-                          "label": "Login",
-                          "href": "/login",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "label": "Checkout",
-                          "href": "/checkout",
-                          "icon": "credit-card"
-                        },
-                        {
-                          "icon": "clipboard-list",
-                          "label": "Orders",
-                          "href": "/orders"
-                        }
-                      ],
+                      "type": "dashboard-layout",
                       "children": [
                         {
                           "type": "stack",
-                          "gap": "lg",
                           "children": [
                             {
+                              "align": "center",
                               "direction": "horizontal",
+                              "type": "stack",
+                              "gap": "md",
                               "children": [
                                 {
-                                  "type": "icon",
-                                  "name": "credit-card"
+                                  "name": "credit-card",
+                                  "type": "icon"
                                 },
                                 {
                                   "type": "typography",
-                                  "variant": "h2",
-                                  "content": "Payment"
+                                  "content": "Payment",
+                                  "variant": "h2"
                                 }
-                              ],
-                              "align": "center",
-                              "type": "stack",
-                              "gap": "md"
+                              ]
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "gap": "md",
                               "type": "stack",
                               "direction": "vertical",
+                              "gap": "md",
                               "children": [
                                 {
-                                  "placeholder": "0.00",
+                                  "type": "input",
                                   "inputType": "number",
-                                  "type": "input"
+                                  "placeholder": "0.00"
                                 },
                                 {
-                                  "type": "select",
                                   "options": [
                                     {
-                                      "value": "usd",
-                                      "label": "USD"
+                                      "label": "USD",
+                                      "value": "usd"
                                     },
                                     {
                                       "value": "eur",
                                       "label": "EUR"
                                     },
                                     {
-                                      "value": "gbp",
-                                      "label": "GBP"
+                                      "label": "GBP",
+                                      "value": "gbp"
                                     }
-                                  ]
+                                  ],
+                                  "type": "select"
                                 }
                               ]
                             },
                             {
+                              "label": "Pay",
                               "icon": "credit-card",
                               "action": "CREATE_PAYMENT",
                               "variant": "primary",
-                              "type": "button",
-                              "label": "Pay"
+                              "type": "button"
                             }
                           ],
                           "direction": "vertical",
+                          "gap": "lg",
                           "align": "center"
                         }
                       ],
-                      "type": "dashboard-layout",
-                      "appName": "ServiceMarketplace"
+                      "appName": "ServiceMarketplace",
+                      "navItems": [
+                        {
+                          "href": "/products",
+                          "icon": "package",
+                          "label": "Products"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "href": "/login",
+                          "label": "Login"
+                        },
+                        {
+                          "label": "Checkout",
+                          "href": "/checkout",
+                          "icon": "credit-card"
+                        },
+                        {
+                          "label": "Orders",
+                          "href": "/orders",
+                          "icon": "clipboard-list"
+                        }
+                      ]
                     }
                   ]
                 ]
@@ -3631,25 +3631,17 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "children": [
-                        {
-                          "title": "Creating payment...",
-                          "message": "Setting up your payment intent.",
-                          "type": "loading-state"
-                        }
-                      ],
                       "appName": "ServiceMarketplace",
                       "navItems": [
                         {
+                          "icon": "package",
                           "label": "Products",
-                          "href": "/products",
-                          "icon": "package"
+                          "href": "/products"
                         },
                         {
                           "href": "/login",
-                          "label": "Login",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "label": "Login"
                         },
                         {
                           "label": "Checkout",
@@ -3657,11 +3649,19 @@
                           "icon": "credit-card"
                         },
                         {
-                          "href": "/orders",
+                          "icon": "clipboard-list",
                           "label": "Orders",
-                          "icon": "clipboard-list"
+                          "href": "/orders"
                         }
-                      ]
+                      ],
+                      "children": [
+                        {
+                          "type": "loading-state",
+                          "title": "Creating payment...",
+                          "message": "Setting up your payment intent."
+                        }
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ],
                   [
@@ -3674,8 +3674,8 @@
                     },
                     {
                       "emit": {
-                        "failure": "ProductStripeFailed",
-                        "success": "ProductStripeCompleted"
+                        "success": "ProductStripeCompleted",
+                        "failure": "ProductStripeFailed"
                       }
                     }
                   ]
@@ -3700,13 +3700,13 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
                       "appName": "ServiceMarketplace",
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
+                          "icon": "package",
                           "label": "Products",
-                          "href": "/products",
-                          "icon": "package"
+                          "href": "/products"
                         },
                         {
                           "href": "/login",
@@ -3714,9 +3714,9 @@
                           "label": "Login"
                         },
                         {
+                          "label": "Checkout",
                           "href": "/checkout",
-                          "icon": "credit-card",
-                          "label": "Checkout"
+                          "icon": "credit-card"
                         },
                         {
                           "href": "/orders",
@@ -3726,9 +3726,9 @@
                       ],
                       "children": [
                         {
+                          "title": "Confirming payment...",
                           "type": "loading-state",
-                          "message": "Processing your payment.",
-                          "title": "Confirming payment..."
+                          "message": "Processing your payment."
                         }
                       ]
                     }
@@ -3742,8 +3742,8 @@
                     },
                     {
                       "emit": {
-                        "failure": "ProductStripeFailed",
-                        "success": "ProductStripeCompleted"
+                        "success": "ProductStripeCompleted",
+                        "failure": "ProductStripeFailed"
                       }
                     }
                   ]
@@ -3764,37 +3764,37 @@
                     "main",
                     {
                       "type": "dashboard-layout",
-                      "appName": "ServiceMarketplace",
                       "children": [
                         {
                           "type": "error-state",
                           "title": "Payment Failed",
-                          "message": "@entity.error",
-                          "onRetry": "RETRY"
+                          "onRetry": "RETRY",
+                          "message": "@entity.error"
                         }
                       ],
                       "navItems": [
                         {
-                          "icon": "package",
                           "href": "/products",
+                          "icon": "package",
                           "label": "Products"
                         },
                         {
-                          "icon": "layout-list",
                           "label": "Login",
-                          "href": "/login"
+                          "href": "/login",
+                          "icon": "layout-list"
                         },
                         {
-                          "href": "/checkout",
                           "label": "Checkout",
+                          "href": "/checkout",
                           "icon": "credit-card"
                         },
                         {
                           "label": "Orders",
-                          "href": "/orders",
-                          "icon": "clipboard-list"
+                          "icon": "clipboard-list",
+                          "href": "/orders"
                         }
-                      ]
+                      ],
+                      "appName": "ServiceMarketplace"
                     }
                   ]
                 ]
@@ -3820,59 +3820,59 @@
                       "navItems": [
                         {
                           "href": "/products",
-                          "icon": "package",
-                          "label": "Products"
+                          "label": "Products",
+                          "icon": "package"
                         },
                         {
+                          "icon": "layout-list",
                           "label": "Login",
-                          "href": "/login",
-                          "icon": "layout-list"
+                          "href": "/login"
                         },
                         {
                           "href": "/checkout",
-                          "label": "Checkout",
-                          "icon": "credit-card"
+                          "icon": "credit-card",
+                          "label": "Checkout"
                         },
                         {
-                          "label": "Orders",
                           "icon": "clipboard-list",
-                          "href": "/orders"
+                          "href": "/orders",
+                          "label": "Orders"
                         }
                       ],
-                      "appName": "ServiceMarketplace",
-                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "type": "stack",
-                          "gap": "lg",
                           "align": "center",
+                          "type": "stack",
+                          "direction": "vertical",
                           "children": [
                             {
                               "name": "check-circle",
                               "type": "icon"
                             },
                             {
-                              "message": "Payment successful! Sending receipt...",
+                              "type": "alert",
                               "variant": "success",
-                              "type": "alert"
+                              "message": "Payment successful! Sending receipt..."
                             },
                             {
-                              "type": "typography",
-                              "color": "muted",
                               "content": "@entity.paymentIntentId",
-                              "variant": "body"
+                              "type": "typography",
+                              "variant": "body",
+                              "color": "muted"
                             },
                             {
-                              "icon": "rotate-ccw",
-                              "action": "RESET",
-                              "type": "button",
                               "variant": "ghost",
-                              "label": "New Payment"
+                              "label": "New Payment",
+                              "type": "button",
+                              "icon": "rotate-ccw",
+                              "action": "RESET"
                             }
                           ],
-                          "direction": "vertical"
+                          "gap": "lg"
                         }
-                      ]
+                      ],
+                      "type": "dashboard-layout",
+                      "appName": "ServiceMarketplace"
                     }
                   ]
                 ]
@@ -3891,38 +3891,38 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "ServiceMarketplace",
                       "navItems": [
                         {
-                          "icon": "package",
+                          "href": "/products",
                           "label": "Products",
-                          "href": "/products"
+                          "icon": "package"
                         },
                         {
-                          "icon": "layout-list",
                           "href": "/login",
-                          "label": "Login"
+                          "label": "Login",
+                          "icon": "layout-list"
                         },
                         {
-                          "label": "Checkout",
+                          "href": "/checkout",
                           "icon": "credit-card",
-                          "href": "/checkout"
+                          "label": "Checkout"
                         },
                         {
-                          "href": "/orders",
                           "label": "Orders",
+                          "href": "/orders",
                           "icon": "clipboard-list"
                         }
                       ],
-                      "type": "dashboard-layout",
-                      "appName": "ServiceMarketplace",
                       "children": [
                         {
                           "title": "Payment Failed",
-                          "message": "@entity.error",
                           "onRetry": "RETRY",
-                          "type": "error-state"
+                          "type": "error-state",
+                          "message": "@entity.error"
                         }
-                      ]
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -3936,36 +3936,38 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
                       "appName": "ServiceMarketplace",
+                      "type": "dashboard-layout",
                       "children": [
                         {
                           "align": "center",
-                          "direction": "vertical",
                           "gap": "lg",
                           "type": "stack",
+                          "direction": "vertical",
                           "children": [
                             {
-                              "type": "stack",
-                              "direction": "horizontal",
                               "align": "center",
+                              "gap": "md",
+                              "type": "stack",
                               "children": [
                                 {
                                   "name": "credit-card",
                                   "type": "icon"
                                 },
                                 {
-                                  "variant": "h2",
                                   "content": "Payment",
+                                  "variant": "h2",
                                   "type": "typography"
                                 }
                               ],
-                              "gap": "md"
+                              "direction": "horizontal"
                             },
                             {
                               "type": "divider"
                             },
                             {
+                              "direction": "vertical",
+                              "gap": "md",
                               "type": "stack",
                               "children": [
                                 {
@@ -3976,8 +3978,8 @@
                                 {
                                   "options": [
                                     {
-                                      "value": "usd",
-                                      "label": "USD"
+                                      "label": "USD",
+                                      "value": "usd"
                                     },
                                     {
                                       "label": "EUR",
@@ -3990,16 +3992,14 @@
                                   ],
                                   "type": "select"
                                 }
-                              ],
-                              "direction": "vertical",
-                              "gap": "md"
+                              ]
                             },
                             {
                               "action": "CREATE_PAYMENT",
-                              "variant": "primary",
-                              "type": "button",
+                              "icon": "credit-card",
                               "label": "Pay",
-                              "icon": "credit-card"
+                              "type": "button",
+                              "variant": "primary"
                             }
                           ]
                         }
@@ -4011,18 +4011,18 @@
                           "icon": "package"
                         },
                         {
+                          "label": "Login",
                           "href": "/login",
-                          "icon": "layout-list",
-                          "label": "Login"
+                          "icon": "layout-list"
                         },
                         {
-                          "href": "/checkout",
                           "label": "Checkout",
-                          "icon": "credit-card"
+                          "icon": "credit-card",
+                          "href": "/checkout"
                         },
                         {
-                          "icon": "clipboard-list",
                           "label": "Orders",
+                          "icon": "clipboard-list",
                           "href": "/orders"
                         }
                       ]
@@ -4042,13 +4042,12 @@
                       "appName": "ServiceMarketplace",
                       "children": [
                         {
-                          "align": "center",
                           "type": "stack",
+                          "align": "center",
                           "gap": "lg",
                           "direction": "vertical",
                           "children": [
                             {
-                              "direction": "horizontal",
                               "type": "stack",
                               "children": [
                                 {
@@ -4057,51 +4056,52 @@
                                 },
                                 {
                                   "content": "Payment",
-                                  "variant": "h2",
-                                  "type": "typography"
+                                  "type": "typography",
+                                  "variant": "h2"
                                 }
                               ],
                               "align": "center",
+                              "direction": "horizontal",
                               "gap": "md"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "gap": "md",
-                              "direction": "vertical",
                               "type": "stack",
+                              "gap": "md",
                               "children": [
                                 {
                                   "inputType": "number",
-                                  "type": "input",
-                                  "placeholder": "0.00"
+                                  "placeholder": "0.00",
+                                  "type": "input"
                                 },
                                 {
+                                  "type": "select",
                                   "options": [
                                     {
-                                      "label": "USD",
-                                      "value": "usd"
+                                      "value": "usd",
+                                      "label": "USD"
                                     },
                                     {
                                       "label": "EUR",
                                       "value": "eur"
                                     },
                                     {
-                                      "label": "GBP",
-                                      "value": "gbp"
+                                      "value": "gbp",
+                                      "label": "GBP"
                                     }
-                                  ],
-                                  "type": "select"
+                                  ]
                                 }
-                              ]
+                              ],
+                              "direction": "vertical"
                             },
                             {
                               "icon": "credit-card",
-                              "variant": "primary",
-                              "type": "button",
+                              "action": "CREATE_PAYMENT",
                               "label": "Pay",
-                              "action": "CREATE_PAYMENT"
+                              "variant": "primary",
+                              "type": "button"
                             }
                           ]
                         }
@@ -4119,14 +4119,14 @@
                           "icon": "layout-list"
                         },
                         {
-                          "label": "Checkout",
                           "icon": "credit-card",
+                          "label": "Checkout",
                           "href": "/checkout"
                         },
                         {
                           "label": "Orders",
-                          "href": "/orders",
-                          "icon": "clipboard-list"
+                          "icon": "clipboard-list",
+                          "href": "/orders"
                         }
                       ]
                     }
@@ -4142,16 +4142,40 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "href": "/products",
+                          "icon": "package",
+                          "label": "Products"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "href": "/login",
+                          "label": "Login"
+                        },
+                        {
+                          "icon": "credit-card",
+                          "href": "/checkout",
+                          "label": "Checkout"
+                        },
+                        {
+                          "href": "/orders",
+                          "icon": "clipboard-list",
+                          "label": "Orders"
+                        }
+                      ],
                       "children": [
                         {
                           "type": "stack",
                           "direction": "vertical",
-                          "gap": "lg",
                           "align": "center",
+                          "gap": "lg",
                           "children": [
                             {
+                              "gap": "md",
+                              "type": "stack",
                               "direction": "horizontal",
+                              "align": "center",
                               "children": [
                                 {
                                   "type": "icon",
@@ -4162,22 +4186,17 @@
                                   "variant": "h2",
                                   "type": "typography"
                                 }
-                              ],
-                              "gap": "md",
-                              "align": "center",
-                              "type": "stack"
+                              ]
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "type": "stack",
-                              "gap": "md",
                               "children": [
                                 {
+                                  "inputType": "number",
                                   "placeholder": "0.00",
-                                  "type": "input",
-                                  "inputType": "number"
+                                  "type": "input"
                                 },
                                 {
                                   "options": [
@@ -4197,41 +4216,22 @@
                                   "type": "select"
                                 }
                               ],
-                              "direction": "vertical"
+                              "gap": "md",
+                              "direction": "vertical",
+                              "type": "stack"
                             },
                             {
-                              "icon": "credit-card",
+                              "action": "CREATE_PAYMENT",
                               "type": "button",
+                              "icon": "credit-card",
                               "label": "Pay",
-                              "action": "CREATE_PAYMENT",
                               "variant": "primary"
                             }
                           ]
                         }
                       ],
-                      "appName": "ServiceMarketplace",
-                      "navItems": [
-                        {
-                          "href": "/products",
-                          "icon": "package",
-                          "label": "Products"
-                        },
-                        {
-                          "href": "/login",
-                          "icon": "layout-list",
-                          "label": "Login"
-                        },
-                        {
-                          "label": "Checkout",
-                          "icon": "credit-card",
-                          "href": "/checkout"
-                        },
-                        {
-                          "href": "/orders",
-                          "icon": "clipboard-list",
-                          "label": "Orders"
-                        }
-                      ]
+                      "type": "dashboard-layout",
+                      "appName": "ServiceMarketplace"
                     }
                   ]
                 ]
@@ -4248,7 +4248,7 @@
             {
               "event": "ProductEmailCompleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "object"
@@ -4258,7 +4258,7 @@
             {
               "event": "ProductEmailFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -4320,7 +4320,7 @@
               {
                 "key": "ProductEmailCompleted",
                 "name": "Product email completed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "object"
@@ -4330,7 +4330,7 @@
               {
                 "key": "ProductEmailFailed",
                 "name": "Product email failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -4352,50 +4352,50 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "ServiceMarketplace",
-                      "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "label": "Products",
                           "icon": "package",
-                          "href": "/products"
+                          "href": "/products",
+                          "label": "Products"
                         },
                         {
-                          "href": "/login",
+                          "icon": "layout-list",
                           "label": "Login",
-                          "icon": "layout-list"
+                          "href": "/login"
                         },
                         {
-                          "icon": "credit-card",
+                          "label": "Checkout",
                           "href": "/checkout",
-                          "label": "Checkout"
+                          "icon": "credit-card"
                         },
                         {
-                          "icon": "clipboard-list",
                           "href": "/orders",
-                          "label": "Orders"
+                          "label": "Orders",
+                          "icon": "clipboard-list"
                         }
                       ],
+                      "type": "dashboard-layout",
                       "children": [
                         {
+                          "align": "center",
+                          "direction": "vertical",
                           "gap": "md",
                           "type": "stack",
-                          "direction": "vertical",
-                          "align": "center",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "mail"
+                              "name": "mail",
+                              "type": "icon"
                             },
                             {
-                              "variant": "body",
-                              "type": "typography",
                               "content": "Receipt will be sent after payment.",
-                              "color": "muted"
+                              "color": "muted",
+                              "type": "typography",
+                              "variant": "body"
                             }
                           ]
                         }
-                      ]
+                      ],
+                      "appName": "ServiceMarketplace"
                     }
                   ]
                 ]
@@ -4409,37 +4409,37 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "appName": "ServiceMarketplace",
-                      "children": [
-                        {
-                          "type": "loading-state",
-                          "title": "Sending receipt...",
-                          "message": "Delivering your payment receipt."
-                        }
-                      ],
                       "navItems": [
                         {
                           "icon": "package",
-                          "label": "Products",
-                          "href": "/products"
+                          "href": "/products",
+                          "label": "Products"
                         },
                         {
-                          "icon": "layout-list",
                           "label": "Login",
+                          "icon": "layout-list",
                           "href": "/login"
                         },
                         {
-                          "href": "/checkout",
                           "icon": "credit-card",
-                          "label": "Checkout"
+                          "label": "Checkout",
+                          "href": "/checkout"
                         },
                         {
-                          "label": "Orders",
                           "href": "/orders",
-                          "icon": "clipboard-list"
+                          "icon": "clipboard-list",
+                          "label": "Orders"
                         }
-                      ]
+                      ],
+                      "type": "dashboard-layout",
+                      "children": [
+                        {
+                          "title": "Sending receipt...",
+                          "message": "Delivering your payment receipt.",
+                          "type": "loading-state"
+                        }
+                      ],
+                      "appName": "ServiceMarketplace"
                     }
                   ],
                   [
@@ -4447,14 +4447,14 @@
                     "email",
                     "send",
                     {
+                      "body": "@entity.body",
                       "to": "@entity.to",
-                      "subject": "@entity.subject",
-                      "body": "@entity.body"
+                      "subject": "@entity.subject"
                     },
                     {
                       "emit": {
-                        "failure": "ProductEmailFailed",
-                        "success": "ProductEmailCompleted"
+                        "success": "ProductEmailCompleted",
+                        "failure": "ProductEmailFailed"
                       }
                     }
                   ]
@@ -4474,27 +4474,7 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "ServiceMarketplace",
                       "type": "dashboard-layout",
-                      "children": [
-                        {
-                          "align": "center",
-                          "gap": "md",
-                          "children": [
-                            {
-                              "type": "icon",
-                              "name": "check-circle"
-                            },
-                            {
-                              "message": "Receipt sent successfully",
-                              "type": "alert",
-                              "variant": "success"
-                            }
-                          ],
-                          "type": "stack",
-                          "direction": "vertical"
-                        }
-                      ],
                       "navItems": [
                         {
                           "icon": "package",
@@ -4502,19 +4482,39 @@
                           "href": "/products"
                         },
                         {
-                          "href": "/login",
                           "icon": "layout-list",
+                          "href": "/login",
                           "label": "Login"
                         },
                         {
-                          "icon": "credit-card",
+                          "label": "Checkout",
                           "href": "/checkout",
-                          "label": "Checkout"
+                          "icon": "credit-card"
                         },
                         {
+                          "href": "/orders",
                           "icon": "clipboard-list",
-                          "label": "Orders",
-                          "href": "/orders"
+                          "label": "Orders"
+                        }
+                      ],
+                      "appName": "ServiceMarketplace",
+                      "children": [
+                        {
+                          "align": "center",
+                          "direction": "vertical",
+                          "type": "stack",
+                          "children": [
+                            {
+                              "type": "icon",
+                              "name": "check-circle"
+                            },
+                            {
+                              "type": "alert",
+                              "message": "Receipt sent successfully",
+                              "variant": "success"
+                            }
+                          ],
+                          "gap": "md"
                         }
                       ]
                     }
@@ -4536,52 +4536,52 @@
                     "main",
                     {
                       "appName": "ServiceMarketplace",
+                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "type": "stack",
                           "gap": "md",
-                          "align": "center",
-                          "direction": "vertical",
+                          "type": "stack",
                           "children": [
                             {
                               "type": "error-state",
-                              "onRetry": "RETRY_RECEIPT",
+                              "title": "Receipt Failed",
                               "message": "Could not send receipt email.",
-                              "title": "Receipt Failed"
+                              "onRetry": "RETRY_RECEIPT"
                             },
                             {
-                              "icon": "refresh-cw",
-                              "action": "RETRY_RECEIPT",
                               "label": "Retry",
                               "variant": "primary",
-                              "type": "button"
+                              "type": "button",
+                              "icon": "refresh-cw",
+                              "action": "RETRY_RECEIPT"
                             }
-                          ]
+                          ],
+                          "align": "center",
+                          "direction": "vertical"
                         }
                       ],
                       "navItems": [
                         {
+                          "label": "Products",
                           "href": "/products",
-                          "icon": "package",
-                          "label": "Products"
+                          "icon": "package"
                         },
                         {
                           "label": "Login",
-                          "href": "/login",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "href": "/login"
                         },
                         {
                           "label": "Checkout",
-                          "href": "/checkout",
-                          "icon": "credit-card"
+                          "icon": "credit-card",
+                          "href": "/checkout"
                         },
                         {
+                          "label": "Orders",
                           "href": "/orders",
-                          "icon": "clipboard-list",
-                          "label": "Orders"
+                          "icon": "clipboard-list"
                         }
-                      ],
-                      "type": "dashboard-layout"
+                      ]
                     }
                   ]
                 ]
@@ -4604,9 +4604,9 @@
                     "email",
                     "send",
                     {
-                      "body": "@entity.body",
+                      "to": "@entity.to",
                       "subject": "@entity.subject",
-                      "to": "@entity.to"
+                      "body": "@entity.body"
                     },
                     {
                       "emit": {
@@ -4626,7 +4626,7 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
+                      "appName": "ServiceMarketplace",
                       "navItems": [
                         {
                           "href": "/products",
@@ -4634,27 +4634,27 @@
                           "label": "Products"
                         },
                         {
-                          "icon": "layout-list",
                           "label": "Login",
-                          "href": "/login"
+                          "href": "/login",
+                          "icon": "layout-list"
                         },
                         {
-                          "label": "Checkout",
                           "href": "/checkout",
-                          "icon": "credit-card"
+                          "icon": "credit-card",
+                          "label": "Checkout"
                         },
                         {
                           "href": "/orders",
-                          "icon": "clipboard-list",
-                          "label": "Orders"
+                          "label": "Orders",
+                          "icon": "clipboard-list"
                         }
                       ],
-                      "appName": "ServiceMarketplace",
+                      "type": "dashboard-layout",
                       "children": [
                         {
+                          "message": "Delivering your payment receipt.",
                           "type": "loading-state",
-                          "title": "Sending receipt...",
-                          "message": "Delivering your payment receipt."
+                          "title": "Sending receipt..."
                         }
                       ]
                     }
@@ -4744,7 +4744,7 @@
               "event": "OrderLoaded",
               "description": "Fired when Order finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Order]"
@@ -4755,7 +4755,7 @@
               "event": "OrderLoadFailed",
               "description": "Fired when Order fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -4808,7 +4808,7 @@
               {
                 "key": "OrderLoaded",
                 "name": "Order loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Order]"
@@ -4818,7 +4818,7 @@
               {
                 "key": "OrderLoadFailed",
                 "name": "Order load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -4850,7 +4850,7 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "stack",
+                      "direction": "vertical",
                       "align": "center",
                       "className": "py-12",
                       "children": [
@@ -4864,8 +4864,8 @@
                           "color": "muted"
                         }
                       ],
-                      "gap": "md",
-                      "direction": "vertical"
+                      "type": "stack",
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -4880,134 +4880,134 @@
                     "main",
                     {
                       "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "label": "Products",
-                          "href": "/products",
-                          "icon": "package"
-                        },
-                        {
-                          "label": "Login",
-                          "href": "/login",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "icon": "credit-card",
-                          "href": "/checkout",
-                          "label": "Checkout"
-                        },
-                        {
-                          "label": "Orders",
-                          "icon": "clipboard-list",
-                          "href": "/orders"
-                        }
-                      ],
                       "appName": "ServiceMarketplace",
                       "children": [
                         {
-                          "type": "stack",
                           "className": "max-w-5xl mx-auto w-full",
                           "children": [
                             {
                               "justify": "between",
-                              "gap": "md",
                               "direction": "horizontal",
-                              "type": "stack",
                               "align": "center",
                               "children": [
                                 {
-                                  "type": "stack",
                                   "gap": "sm",
                                   "align": "center",
-                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "name": "list",
-                                      "type": "icon"
+                                      "type": "icon",
+                                      "name": "list"
                                     },
                                     {
-                                      "variant": "h2",
                                       "content": "Orders",
+                                      "variant": "h2",
                                       "type": "typography"
                                     }
-                                  ]
+                                  ],
+                                  "type": "stack",
+                                  "direction": "horizontal"
                                 },
                                 {
+                                  "gap": "sm",
+                                  "type": "stack",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "icon": "plus",
                                       "action": "CREATE",
-                                      "variant": "primary",
                                       "label": "Create Order",
-                                      "type": "button"
-                                    }
-                                  ],
-                                  "gap": "sm",
-                                  "type": "stack",
-                                  "direction": "horizontal"
+                                      "type": "button",
+                                      "icon": "plus",
+                                      "variant": "primary"
+                                    }
+                                  ]
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "gap": "md"
                             },
                             {
                               "type": "divider"
                             },
                             {
                               "entity": "@payload.data",
-                              "fields": [],
-                              "itemActions": [
-                                {
-                                  "event": "VIEW",
-                                  "variant": "ghost",
-                                  "label": "View"
-                                },
-                                {
-                                  "variant": "ghost",
-                                  "event": "EDIT",
-                                  "label": "Edit"
-                                },
-                                {
-                                  "variant": "danger",
-                                  "event": "DELETE",
-                                  "label": "Delete"
-                                }
-                              ],
                               "columns": [
                                 {
-                                  "icon": "list",
                                   "variant": "h4",
+                                  "label": "Product Name",
                                   "name": "productName",
-                                  "label": "Product Name"
+                                  "icon": "list"
                                 },
                                 {
-                                  "variant": "badge",
-                                  "name": "amount",
-                                  "label": "Amount",
                                   "colorMap": {
-                                    "active": "success",
-                                    "draft": "warning",
-                                    "failed": "destructive",
-                                    "disabled": "neutral",
-                                    "cancelled": "destructive",
                                     "scheduled": "warning",
+                                    "active": "success",
                                     "archived": "neutral",
-                                    "done": "success",
-                                    "error": "destructive",
+                                    "cancelled": "destructive",
                                     "completed": "success",
+                                    "failed": "destructive",
+                                    "pending": "warning",
+                                    "done": "success",
                                     "inactive": "neutral",
-                                    "pending": "warning"
-                                  }
+                                    "draft": "warning",
+                                    "error": "destructive",
+                                    "disabled": "neutral"
+                                  },
+                                  "variant": "badge",
+                                  "name": "amount",
+                                  "label": "Amount"
                                 },
                                 {
+                                  "name": "paymentStatus",
                                   "variant": "caption",
-                                  "label": "Payment Status",
-                                  "name": "paymentStatus"
+                                  "label": "Payment Status"
                                 }
                               ],
-                              "type": "data-grid"
+                              "fields": [],
+                              "type": "data-grid",
+                              "itemActions": [
+                                {
+                                  "event": "VIEW",
+                                  "variant": "ghost",
+                                  "label": "View"
+                                },
+                                {
+                                  "label": "Edit",
+                                  "event": "EDIT",
+                                  "variant": "ghost"
+                                },
+                                {
+                                  "variant": "danger",
+                                  "label": "Delete",
+                                  "event": "DELETE"
+                                }
+                              ]
                             }
                           ],
                           "gap": "lg",
-                          "direction": "vertical"
+                          "direction": "vertical",
+                          "type": "stack"
+                        }
+                      ],
+                      "navItems": [
+                        {
+                          "label": "Products",
+                          "href": "/products",
+                          "icon": "package"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Login",
+                          "href": "/login"
+                        },
+                        {
+                          "label": "Checkout",
+                          "href": "/checkout",
+                          "icon": "credit-card"
+                        },
+                        {
+                          "label": "Orders",
+                          "icon": "clipboard-list",
+                          "href": "/orders"
                         }
                       ]
                     }
@@ -5023,36 +5023,36 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "stack",
-                      "align": "center",
-                      "className": "py-12",
-                      "gap": "md",
                       "children": [
                         {
+                          "color": "destructive",
                           "type": "icon",
-                          "name": "alert-triangle",
-                          "color": "destructive"
+                          "name": "alert-triangle"
                         },
                         {
-                          "variant": "h3",
+                          "type": "typography",
                           "content": "Failed to load order",
-                          "type": "typography"
+                          "variant": "h3"
                         },
                         {
-                          "color": "muted",
-                          "type": "typography",
                           "content": "@payload.error",
-                          "variant": "body"
+                          "variant": "body",
+                          "color": "muted",
+                          "type": "typography"
                         },
                         {
-                          "label": "Retry",
-                          "action": "INIT",
-                          "variant": "primary",
                           "icon": "rotate-ccw",
-                          "type": "button"
+                          "variant": "primary",
+                          "type": "button",
+                          "label": "Retry",
+                          "action": "INIT"
                         }
                       ],
-                      "direction": "vertical"
+                      "gap": "md",
+                      "type": "stack",
+                      "direction": "vertical",
+                      "align": "center",
+                      "className": "py-12"
                     }
                   ]
                 ]
@@ -5073,7 +5073,7 @@
               "event": "OrderLoadFailed",
               "description": "Fired when Order fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -5088,7 +5088,7 @@
               "event": "OrderLoaded",
               "description": "Fired when Order finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Order]"
@@ -5098,7 +5098,7 @@
             {
               "event": "OrderSaveFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -5112,7 +5112,7 @@
             {
               "event": "OrderSaved",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -5146,7 +5146,7 @@
               {
                 "key": "SAVE",
                 "name": "Save",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "string"
@@ -5160,7 +5160,7 @@
               {
                 "key": "OrderLoadFailed",
                 "name": "Order load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -5174,7 +5174,7 @@
               {
                 "key": "OrderLoaded",
                 "name": "Order loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Order]"
@@ -5184,7 +5184,7 @@
               {
                 "key": "OrderSaveFailed",
                 "name": "Order save failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -5198,7 +5198,7 @@
               {
                 "key": "OrderSaved",
                 "name": "Order saved",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -5238,38 +5238,38 @@
                     "modal",
                     {
                       "type": "stack",
-                      "gap": "md",
                       "direction": "vertical",
+                      "gap": "md",
                       "children": [
                         {
-                          "type": "stack",
                           "direction": "horizontal",
-                          "gap": "sm",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "plus-circle"
+                              "name": "plus-circle",
+                              "type": "icon"
                             },
                             {
-                              "variant": "h3",
                               "type": "typography",
+                              "variant": "h3",
                               "content": "Create Order"
                             }
-                          ]
+                          ],
+                          "gap": "sm",
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "mode": "create",
+                          "cancelEvent": "CLOSE",
+                          "submitEvent": "SAVE",
                           "fields": [
                             "productName",
                             "amount",
                             "paymentStatus",
                             "orderDate"
                           ],
-                          "submitEvent": "SAVE",
-                          "cancelEvent": "CLOSE",
                           "type": "form-section"
                         }
                       ]
@@ -5352,7 +5352,7 @@
               "event": "OrderLoadFailed",
               "description": "Fired when Order fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -5367,7 +5367,7 @@
               "event": "OrderLoaded",
               "description": "Fired when Order finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Order]"
@@ -5377,7 +5377,7 @@
             {
               "event": "OrderUpdateFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -5391,7 +5391,7 @@
             {
               "event": "OrderUpdated",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -5417,7 +5417,7 @@
               {
                 "key": "EDIT",
                 "name": "Edit",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -5435,7 +5435,7 @@
               {
                 "key": "SAVE",
                 "name": "Save",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "string"
@@ -5449,7 +5449,7 @@
               {
                 "key": "OrderLoadFailed",
                 "name": "Order load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -5463,7 +5463,7 @@
               {
                 "key": "OrderLoaded",
                 "name": "Order loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Order]"
@@ -5473,7 +5473,7 @@
               {
                 "key": "OrderUpdateFailed",
                 "name": "Order update failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -5487,7 +5487,7 @@
               {
                 "key": "OrderUpdated",
                 "name": "Order updated",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -5516,24 +5516,23 @@
                     "fetch",
                     "Order",
                     {
+                      "id": "@payload.id",
                       "emit": {
-                        "success": "OrderLoaded",
-                        "failure": "OrderLoadFailed"
-                      },
-                      "id": "@payload.id"
+                        "failure": "OrderLoadFailed",
+                        "success": "OrderLoaded"
+                      }
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "gap": "md",
                       "type": "stack",
+                      "gap": "md",
                       "direction": "vertical",
                       "children": [
                         {
                           "type": "stack",
-                          "gap": "sm",
                           "children": [
                             {
                               "type": "icon",
@@ -5541,27 +5540,28 @@
                             },
                             {
                               "type": "typography",
-                              "variant": "h3",
-                              "content": "Edit Order"
+                              "content": "Edit Order",
+                              "variant": "h3"
                             }
                           ],
+                          "gap": "sm",
                           "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "cancelEvent": "CLOSE",
+                          "mode": "edit",
+                          "type": "form-section",
                           "entity": "@payload.row",
+                          "submitEvent": "SAVE",
                           "fields": [
                             "productName",
                             "amount",
                             "paymentStatus",
                             "orderDate"
-                          ],
-                          "submitEvent": "SAVE",
-                          "type": "form-section",
-                          "mode": "edit",
-                          "cancelEvent": "CLOSE"
+                          ]
                         }
                       ]
                     }
@@ -5640,7 +5640,7 @@
               "event": "OrderLoaded",
               "description": "Fired when Order finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Order]"
@@ -5651,7 +5651,7 @@
               "event": "OrderLoadFailed",
               "description": "Fired when Order fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -5681,7 +5681,7 @@
               {
                 "key": "VIEW",
                 "name": "View",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -5699,7 +5699,7 @@
               {
                 "key": "OrderLoaded",
                 "name": "Order loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Order]"
@@ -5709,7 +5709,7 @@
               {
                 "key": "OrderLoadFailed",
                 "name": "Order load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -5744,8 +5744,8 @@
                     {
                       "id": "@payload.id",
                       "emit": {
-                        "failure": "OrderLoadFailed",
-                        "success": "OrderLoaded"
+                        "success": "OrderLoaded",
+                        "failure": "OrderLoadFailed"
                       }
                     }
                   ],
@@ -5754,11 +5754,10 @@
                     "modal",
                     {
                       "gap": "md",
+                      "type": "stack",
+                      "direction": "vertical",
                       "children": [
                         {
-                          "direction": "horizontal",
-                          "align": "center",
-                          "type": "stack",
                           "gap": "sm",
                           "children": [
                             {
@@ -5770,7 +5769,10 @@
                               "variant": "h3",
                               "content": "@entity.productName"
                             }
-                          ]
+                          ],
+                          "type": "stack",
+                          "direction": "horizontal",
+                          "align": "center"
                         },
                         {
                           "type": "divider"
@@ -5783,93 +5785,91 @@
                               "type": "typography"
                             },
                             {
-                              "type": "typography",
+                              "variant": "body",
                               "content": "@entity.productName",
-                              "variant": "body"
+                              "type": "typography"
                             }
                           ],
                           "direction": "horizontal",
-                          "type": "stack",
-                          "gap": "md"
+                          "gap": "md",
+                          "type": "stack"
                         },
                         {
-                          "direction": "horizontal",
-                          "gap": "md",
+                          "type": "stack",
                           "children": [
                             {
-                              "content": "Amount",
+                              "type": "typography",
                               "variant": "caption",
-                              "type": "typography"
+                              "content": "Amount"
                             },
                             {
-                              "variant": "body",
+                              "content": "@entity.amount",
                               "type": "typography",
-                              "content": "@entity.amount"
+                              "variant": "body"
                             }
                           ],
-                          "type": "stack"
+                          "gap": "md",
+                          "direction": "horizontal"
                         },
                         {
+                          "direction": "horizontal",
+                          "type": "stack",
                           "children": [
                             {
-                              "content": "Payment Status",
                               "type": "typography",
-                              "variant": "caption"
+                              "variant": "caption",
+                              "content": "Payment Status"
                             },
                             {
                               "type": "typography",
-                              "variant": "body",
-                              "content": "@entity.paymentStatus"
+                              "content": "@entity.paymentStatus",
+                              "variant": "body"
                             }
                           ],
-                          "gap": "md",
-                          "direction": "horizontal",
-                          "type": "stack"
+                          "gap": "md"
                         },
                         {
-                          "direction": "horizontal",
-                          "gap": "md",
-                          "type": "stack",
                           "children": [
                             {
+                              "content": "Order Date",
                               "type": "typography",
-                              "variant": "caption",
-                              "content": "Order Date"
+                              "variant": "caption"
                             },
                             {
+                              "type": "typography",
                               "variant": "body",
-                              "content": "@entity.orderDate",
-                              "type": "typography"
+                              "content": "@entity.orderDate"
                             }
-                          ]
+                          ],
+                          "gap": "md",
+                          "type": "stack",
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "justify": "end",
                           "children": [
                             {
+                              "icon": "edit",
+                              "action": "EDIT",
                               "label": "Edit",
                               "type": "button",
-                              "variant": "primary",
-                              "icon": "edit",
-                              "action": "EDIT"
+                              "variant": "primary"
                             },
                             {
-                              "type": "button",
                               "label": "Close",
+                              "type": "button",
                               "variant": "ghost",
                               "action": "CLOSE"
                             }
                           ],
-                          "type": "stack",
                           "gap": "sm",
+                          "justify": "end",
+                          "type": "stack",
                           "direction": "horizontal"
                         }
-                      ],
-                      "type": "stack",
-                      "direction": "vertical"
+                      ]
                     }
                   ]
                 ]
@@ -5932,7 +5932,7 @@
             {
               "event": "OrderDeleteFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -5946,7 +5946,7 @@
             {
               "event": "OrderDeleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -5957,7 +5957,7 @@
               "event": "OrderLoadFailed",
               "description": "Fired when Order fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -5972,7 +5972,7 @@
               "event": "OrderLoaded",
               "description": "Fired when Order finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Order]"
@@ -5998,7 +5998,7 @@
               {
                 "key": "DELETE",
                 "name": "Delete",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -6024,7 +6024,7 @@
               {
                 "key": "OrderDeleteFailed",
                 "name": "Order delete failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -6038,7 +6038,7 @@
               {
                 "key": "OrderDeleted",
                 "name": "Order deleted",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -6048,7 +6048,7 @@
               {
                 "key": "OrderLoadFailed",
                 "name": "Order load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -6062,7 +6062,7 @@
               {
                 "key": "OrderLoaded",
                 "name": "Order loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Order]"
@@ -6098,8 +6098,8 @@
                     {
                       "id": "@payload.id",
                       "emit": {
-                        "success": "OrderLoaded",
-                        "failure": "OrderLoadFailed"
+                        "failure": "OrderLoadFailed",
+                        "success": "OrderLoaded"
                       }
                     }
                   ],
@@ -6107,57 +6107,57 @@
                     "render-ui",
                     "modal",
                     {
-                      "gap": "md",
-                      "type": "stack",
                       "direction": "vertical",
                       "children": [
                         {
-                          "align": "center",
                           "children": [
                             {
-                              "name": "alert-triangle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "alert-triangle"
                             },
                             {
+                              "type": "typography",
                               "content": "Delete Order",
-                              "variant": "h3",
-                              "type": "typography"
+                              "variant": "h3"
                             }
                           ],
-                          "gap": "sm",
+                          "type": "stack",
                           "direction": "horizontal",
-                          "type": "stack"
+                          "gap": "sm",
+                          "align": "center"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "message": "This action cannot be undone.",
+                          "variant": "error",
                           "type": "alert",
-                          "variant": "error"
+                          "message": "This action cannot be undone."
                         },
                         {
-                          "direction": "horizontal",
-                          "justify": "end",
+                          "gap": "sm",
                           "children": [
                             {
-                              "action": "CANCEL",
-                              "variant": "ghost",
                               "label": "Cancel",
+                              "variant": "ghost",
+                              "action": "CANCEL",
                               "type": "button"
                             },
                             {
-                              "label": "Delete",
-                              "action": "CONFIRM_DELETE",
                               "variant": "danger",
+                              "icon": "check",
                               "type": "button",
-                              "icon": "check"
+                              "label": "Delete",
+                              "action": "CONFIRM_DELETE"
                             }
                           ],
+                          "direction": "horizontal",
                           "type": "stack",
-                          "gap": "sm"
+                          "justify": "end"
                         }
-                      ]
+                      ],
+                      "type": "stack",
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -6277,4 +6277,4 @@
       ]
     }
   ]
-}
+}