diff --git a/packages/fiori-elements-writer/test/__snapshots__/alp.test.ts.snap b/packages/fiori-elements-writer/test/__snapshots__/alp.test.ts.snap
index c54b4eec4a..c02a837102 100644
--- a/packages/fiori-elements-writer/test/__snapshots__/alp.test.ts.snap
+++ b/packages/fiori-elements-writer/test/__snapshots__/alp.test.ts.snap
@@ -5262,18 +5262,6 @@ xmlns:edmx=\\"http://docs.oasis-open.org/odata/ns/edmx\\">
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
-      \\"mainService\\": {
-        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_ALP_SO_ANA_SRV/\\",
-        \\"type\\": \\"OData\\",
-        \\"settings\\": {
-          \\"annotations\\": [
-            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
-            \\"annotation\\"
-          ],
-          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
-          \\"odataVersion\\": \\"2.0\\"
-        }
-      },
       \\"SEPMRA_PROD_MAN_ANNO_MDL\\": {
         \\"uri\\": \\"/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='SEPMRA_PROD_MAN_ANNO_MDL',Version='0001')/$value/\\",
         \\"type\\": \\"ODataAnnotation\\",
@@ -5287,6 +5275,18 @@ xmlns:edmx=\\"http://docs.oasis-open.org/odata/ns/edmx\\">
         \\"settings\\": {
           \\"localUri\\": \\"annotations/annotation.xml\\"
         }
+      },
+      \\"mainService\\": {
+        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_ALP_SO_ANA_SRV/\\",
+        \\"type\\": \\"OData\\",
+        \\"settings\\": {
+          \\"annotations\\": [
+            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
+            \\"annotation\\"
+          ],
+          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
+          \\"odataVersion\\": \\"2.0\\"
+        }
       }
     }
   },
@@ -11472,6 +11472,13 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/sap/c_salesordermanage_srv/srvd/sap/c_salesordermanage_sd_aggregate/0001/\\",
         \\"type\\": \\"OData\\",
@@ -11482,13 +11489,6 @@ appDescription=A Fiori application.",
           \\"localUri\\": \\"localService/mainService/metadata.xml\\",
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
diff --git a/packages/fiori-elements-writer/test/__snapshots__/feop.test.ts.snap b/packages/fiori-elements-writer/test/__snapshots__/feop.test.ts.snap
index ff31f4262b..5788574678 100644
--- a/packages/fiori-elements-writer/test/__snapshots__/feop.test.ts.snap
+++ b/packages/fiori-elements-writer/test/__snapshots__/feop.test.ts.snap
@@ -3199,6 +3199,13 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/dmo/sb_travel_mduu_o4/srvd/dmo/sd_travel_mduu/0001/\\",
         \\"type\\": \\"OData\\",
@@ -3209,13 +3216,6 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
           \\"localUri\\": \\"localService/mainService/metadata.xml\\",
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
@@ -6960,6 +6960,13 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/dmo/sb_travel_mduu_o4/srvd/dmo/sd_travel_mduu/0001/\\",
         \\"type\\": \\"OData\\",
@@ -6970,13 +6977,6 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
           \\"localUri\\": \\"localService/mainService/metadata.xml\\",
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
diff --git a/packages/fiori-elements-writer/test/__snapshots__/fpm.test.ts.snap b/packages/fiori-elements-writer/test/__snapshots__/fpm.test.ts.snap
index 2f421abf94..2138c390c7 100644
--- a/packages/fiori-elements-writer/test/__snapshots__/fpm.test.ts.snap
+++ b/packages/fiori-elements-writer/test/__snapshots__/fpm.test.ts.snap
@@ -3249,6 +3249,13 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/dmo/sb_travel_mduu_o4/srvd/dmo/sd_travel_mduu/0001/\\",
         \\"type\\": \\"OData\\",
@@ -3259,13 +3266,6 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
           \\"localUri\\": \\"localService/mainService/metadata.xml\\",
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
@@ -7080,6 +7080,13 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/dmo/sb_travel_mduu_o4/srvd/dmo/sd_travel_mduu/0001/\\",
         \\"type\\": \\"OData\\",
@@ -7090,13 +7097,6 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
           \\"localUri\\": \\"localService/mainService/metadata.xml\\",
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
diff --git a/packages/fiori-elements-writer/test/__snapshots__/lrop.test.ts.snap b/packages/fiori-elements-writer/test/__snapshots__/lrop.test.ts.snap
index 990df9bcc2..ae15da1a97 100644
--- a/packages/fiori-elements-writer/test/__snapshots__/lrop.test.ts.snap
+++ b/packages/fiori-elements-writer/test/__snapshots__/lrop.test.ts.snap
@@ -2902,18 +2902,6 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
-      \\"mainService\\": {
-        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
-        \\"type\\": \\"OData\\",
-        \\"settings\\": {
-          \\"annotations\\": [
-            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
-            \\"annotation\\"
-          ],
-          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
-          \\"odataVersion\\": \\"2.0\\"
-        }
-      },
       \\"SEPMRA_PROD_MAN_ANNO_MDL\\": {
         \\"uri\\": \\"/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='SEPMRA_PROD_MAN_ANNO_MDL',Version='0001')/$value/\\",
         \\"type\\": \\"ODataAnnotation\\",
@@ -2927,6 +2915,18 @@ appDescription=A Fiori application.",
         \\"settings\\": {
           \\"localUri\\": \\"annotations/annotation.xml\\"
         }
+      },
+      \\"mainService\\": {
+        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
+        \\"type\\": \\"OData\\",
+        \\"settings\\": {
+          \\"annotations\\": [
+            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
+            \\"annotation\\"
+          ],
+          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
+          \\"odataVersion\\": \\"2.0\\"
+        }
       }
     }
   },
@@ -6525,18 +6525,6 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
-      \\"mainService\\": {
-        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
-        \\"type\\": \\"OData\\",
-        \\"settings\\": {
-          \\"annotations\\": [
-            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
-            \\"annotation\\"
-          ],
-          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
-          \\"odataVersion\\": \\"2.0\\"
-        }
-      },
       \\"SEPMRA_PROD_MAN_ANNO_MDL\\": {
         \\"uri\\": \\"/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='SEPMRA_PROD_MAN_ANNO_MDL',Version='0001')/$value/\\",
         \\"type\\": \\"ODataAnnotation\\",
@@ -6550,6 +6538,18 @@ appDescription=A Fiori application.",
         \\"settings\\": {
           \\"localUri\\": \\"annotations/annotation.xml\\"
         }
+      },
+      \\"mainService\\": {
+        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
+        \\"type\\": \\"OData\\",
+        \\"settings\\": {
+          \\"annotations\\": [
+            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
+            \\"annotation\\"
+          ],
+          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
+          \\"odataVersion\\": \\"2.0\\"
+        }
       }
     }
   },
@@ -10251,18 +10251,6 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
-      \\"mainService\\": {
-        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
-        \\"type\\": \\"OData\\",
-        \\"settings\\": {
-          \\"annotations\\": [
-            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
-            \\"annotation\\"
-          ],
-          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
-          \\"odataVersion\\": \\"2.0\\"
-        }
-      },
       \\"SEPMRA_PROD_MAN_ANNO_MDL\\": {
         \\"uri\\": \\"/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='SEPMRA_PROD_MAN_ANNO_MDL',Version='0001')/$value/\\",
         \\"type\\": \\"ODataAnnotation\\",
@@ -10276,6 +10264,18 @@ appDescription=A Fiori application.",
         \\"settings\\": {
           \\"localUri\\": \\"annotations/annotation.xml\\"
         }
+      },
+      \\"mainService\\": {
+        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
+        \\"type\\": \\"OData\\",
+        \\"settings\\": {
+          \\"annotations\\": [
+            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
+            \\"annotation\\"
+          ],
+          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
+          \\"odataVersion\\": \\"2.0\\"
+        }
       }
     }
   },
@@ -13935,6 +13935,13 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/dmo/sb_travel_mduu_o4/srvd/dmo/sd_travel_mduu/0001/\\",
         \\"type\\": \\"OData\\",
@@ -13945,13 +13952,6 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
           \\"localUri\\": \\"localService/mainService/metadata.xml\\",
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
@@ -17615,6 +17615,13 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/dmo/sb_travel_mduu_o4/srvd/dmo/sd_travel_mduu/0001/\\",
         \\"type\\": \\"OData\\",
@@ -17625,13 +17632,6 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
           \\"localUri\\": \\"localService/mainService/metadata.xml\\",
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
@@ -21296,6 +21296,13 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/dmo/sb_travel_mduu_o4/srvd/dmo/sd_travel_mduu/0001/\\",
         \\"type\\": \\"OData\\",
@@ -21306,13 +21313,6 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
           \\"localUri\\": \\"localService/mainService/metadata.xml\\",
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
@@ -22114,6 +22114,13 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/dmo/sb_travel_mduu_o4/srvd/dmo/sd_travel_mduu/0001/\\",
         \\"type\\": \\"OData\\",
@@ -22123,13 +22130,6 @@ appDescription=A Fiori application.",
           ],
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
@@ -22998,6 +22998,13 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/dmo/sb_travel_mduu_o4/srvd/dmo/sd_travel_mduu/0001/\\",
         \\"type\\": \\"OData\\",
@@ -23007,13 +23014,6 @@ appDescription=A Fiori application.",
           ],
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
@@ -24340,6 +24340,13 @@ xmlns:edmx=\\"http://docs.oasis-open.org/odata/ns/edmx\\">
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/dmo/sb_travel_mduu_o4/srvd/dmo/sd_travel_mduu/0001/\\",
         \\"type\\": \\"OData\\",
@@ -24350,13 +24357,6 @@ xmlns:edmx=\\"http://docs.oasis-open.org/odata/ns/edmx\\">
           \\"localUri\\": \\"localService/mainService/metadata.xml\\",
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
@@ -28212,6 +28212,13 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/dmo/sb_travel_mduu_o4/srvd/dmo/sd_travel_mduu/0001/\\",
         \\"type\\": \\"OData\\",
@@ -28222,13 +28229,6 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
           \\"localUri\\": \\"localService/mainService/metadata.xml\\",
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
@@ -31892,6 +31892,13 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/dmo/sb_travel_mduu_o4/srvd/dmo/sd_travel_mduu/0001/\\",
         \\"type\\": \\"OData\\",
@@ -31902,13 +31909,6 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
           \\"localUri\\": \\"localService/mainService/metadata.xml\\",
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
@@ -35287,18 +35287,6 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
-      \\"mainService\\": {
-        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
-        \\"type\\": \\"OData\\",
-        \\"settings\\": {
-          \\"annotations\\": [
-            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
-            \\"annotation\\"
-          ],
-          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
-          \\"odataVersion\\": \\"2.0\\"
-        }
-      },
       \\"SEPMRA_PROD_MAN_ANNO_MDL\\": {
         \\"uri\\": \\"/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='SEPMRA_PROD_MAN_ANNO_MDL',Version='0001')/$value/\\",
         \\"type\\": \\"ODataAnnotation\\",
@@ -35312,6 +35300,18 @@ appDescription=A Fiori application.",
         \\"settings\\": {
           \\"localUri\\": \\"annotations/annotation.xml\\"
         }
+      },
+      \\"mainService\\": {
+        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
+        \\"type\\": \\"OData\\",
+        \\"settings\\": {
+          \\"annotations\\": [
+            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
+            \\"annotation\\"
+          ],
+          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
+          \\"odataVersion\\": \\"2.0\\"
+        }
       }
     }
   },
@@ -38912,18 +38912,6 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
-      \\"mainService\\": {
-        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
-        \\"type\\": \\"OData\\",
-        \\"settings\\": {
-          \\"annotations\\": [
-            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
-            \\"annotation\\"
-          ],
-          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
-          \\"odataVersion\\": \\"2.0\\"
-        }
-      },
       \\"SEPMRA_PROD_MAN_ANNO_MDL\\": {
         \\"uri\\": \\"/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='SEPMRA_PROD_MAN_ANNO_MDL',Version='0001')/$value/\\",
         \\"type\\": \\"ODataAnnotation\\",
@@ -38937,6 +38925,18 @@ appDescription=A Fiori application.",
         \\"settings\\": {
           \\"localUri\\": \\"annotations/annotation.xml\\"
         }
+      },
+      \\"mainService\\": {
+        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
+        \\"type\\": \\"OData\\",
+        \\"settings\\": {
+          \\"annotations\\": [
+            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
+            \\"annotation\\"
+          ],
+          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
+          \\"odataVersion\\": \\"2.0\\"
+        }
       }
     }
   },
@@ -42297,18 +42297,6 @@ appDescription=A Fiori application.",
       \\"toolsId\\": \\"toolsId:1234abcd\\"
     },
     \\"dataSources\\": {
-      \\"mainService\\": {
-        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
-        \\"type\\": \\"OData\\",
-        \\"settings\\": {
-          \\"annotations\\": [
-            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
-            \\"annotation\\"
-          ],
-          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
-          \\"odataVersion\\": \\"2.0\\"
-        }
-      },
       \\"SEPMRA_PROD_MAN_ANNO_MDL\\": {
         \\"uri\\": \\"/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='SEPMRA_PROD_MAN_ANNO_MDL',Version='0001')/$value/\\",
         \\"type\\": \\"ODataAnnotation\\",
@@ -42322,6 +42310,18 @@ appDescription=A Fiori application.",
         \\"settings\\": {
           \\"localUri\\": \\"annotations/annotation.xml\\"
         }
+      },
+      \\"mainService\\": {
+        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
+        \\"type\\": \\"OData\\",
+        \\"settings\\": {
+          \\"annotations\\": [
+            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
+            \\"annotation\\"
+          ],
+          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
+          \\"odataVersion\\": \\"2.0\\"
+        }
       }
     }
   },
@@ -45921,18 +45921,6 @@ appDescription=A Fiori application.",
       \\"toolsId\\": \\"toolsId:1234abcd\\"
     },
     \\"dataSources\\": {
-      \\"mainService\\": {
-        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
-        \\"type\\": \\"OData\\",
-        \\"settings\\": {
-          \\"annotations\\": [
-            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
-            \\"annotation\\"
-          ],
-          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
-          \\"odataVersion\\": \\"2.0\\"
-        }
-      },
       \\"SEPMRA_PROD_MAN_ANNO_MDL\\": {
         \\"uri\\": \\"/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='SEPMRA_PROD_MAN_ANNO_MDL',Version='0001')/$value/\\",
         \\"type\\": \\"ODataAnnotation\\",
@@ -45946,6 +45934,18 @@ appDescription=A Fiori application.",
         \\"settings\\": {
           \\"localUri\\": \\"annotations/annotation.xml\\"
         }
+      },
+      \\"mainService\\": {
+        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
+        \\"type\\": \\"OData\\",
+        \\"settings\\": {
+          \\"annotations\\": [
+            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
+            \\"annotation\\"
+          ],
+          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
+          \\"odataVersion\\": \\"2.0\\"
+        }
       }
     }
   },
@@ -49647,18 +49647,6 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
-      \\"mainService\\": {
-        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
-        \\"type\\": \\"OData\\",
-        \\"settings\\": {
-          \\"annotations\\": [
-            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
-            \\"annotation\\"
-          ],
-          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
-          \\"odataVersion\\": \\"2.0\\"
-        }
-      },
       \\"SEPMRA_PROD_MAN_ANNO_MDL\\": {
         \\"uri\\": \\"/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='SEPMRA_PROD_MAN_ANNO_MDL',Version='0001')/$value/\\",
         \\"type\\": \\"ODataAnnotation\\",
@@ -49672,6 +49660,18 @@ appDescription=A Fiori application.",
         \\"settings\\": {
           \\"localUri\\": \\"annotations/annotation.xml\\"
         }
+      },
+      \\"mainService\\": {
+        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
+        \\"type\\": \\"OData\\",
+        \\"settings\\": {
+          \\"annotations\\": [
+            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
+            \\"annotation\\"
+          ],
+          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
+          \\"odataVersion\\": \\"2.0\\"
+        }
       }
     }
   },
@@ -53137,18 +53137,6 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
-      \\"mainService\\": {
-        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
-        \\"type\\": \\"OData\\",
-        \\"settings\\": {
-          \\"annotations\\": [
-            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
-            \\"annotation\\"
-          ],
-          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
-          \\"odataVersion\\": \\"2.0\\"
-        }
-      },
       \\"SEPMRA_PROD_MAN_ANNO_MDL\\": {
         \\"uri\\": \\"/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='SEPMRA_PROD_MAN_ANNO_MDL',Version='0001')/$value/\\",
         \\"type\\": \\"ODataAnnotation\\",
@@ -53162,6 +53150,18 @@ appDescription=A Fiori application.",
         \\"settings\\": {
           \\"localUri\\": \\"annotations/annotation.xml\\"
         }
+      },
+      \\"mainService\\": {
+        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
+        \\"type\\": \\"OData\\",
+        \\"settings\\": {
+          \\"annotations\\": [
+            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
+            \\"annotation\\"
+          ],
+          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
+          \\"odataVersion\\": \\"2.0\\"
+        }
       }
     }
   },
@@ -56627,18 +56627,6 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
-      \\"mainService\\": {
-        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
-        \\"type\\": \\"OData\\",
-        \\"settings\\": {
-          \\"annotations\\": [
-            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
-            \\"annotation\\"
-          ],
-          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
-          \\"odataVersion\\": \\"2.0\\"
-        }
-      },
       \\"SEPMRA_PROD_MAN_ANNO_MDL\\": {
         \\"uri\\": \\"/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='SEPMRA_PROD_MAN_ANNO_MDL',Version='0001')/$value/\\",
         \\"type\\": \\"ODataAnnotation\\",
@@ -56652,6 +56640,18 @@ appDescription=A Fiori application.",
         \\"settings\\": {
           \\"localUri\\": \\"annotations/annotation.xml\\"
         }
+      },
+      \\"mainService\\": {
+        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
+        \\"type\\": \\"OData\\",
+        \\"settings\\": {
+          \\"annotations\\": [
+            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
+            \\"annotation\\"
+          ],
+          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
+          \\"odataVersion\\": \\"2.0\\"
+        }
       }
     }
   },
@@ -57314,6 +57314,13 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/dmo/sb_travel_mduu_o4/srvd/dmo/sd_travel_mduu/0001/\\",
         \\"type\\": \\"OData\\",
@@ -57323,13 +57330,6 @@ appDescription=A Fiori application.",
           ],
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
@@ -60427,18 +60427,6 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
-      \\"mainService\\": {
-        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
-        \\"type\\": \\"OData\\",
-        \\"settings\\": {
-          \\"annotations\\": [
-            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
-            \\"annotation\\"
-          ],
-          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
-          \\"odataVersion\\": \\"2.0\\"
-        }
-      },
       \\"SEPMRA_PROD_MAN_ANNO_MDL\\": {
         \\"uri\\": \\"/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='SEPMRA_PROD_MAN_ANNO_MDL',Version='0001')/$value/\\",
         \\"type\\": \\"ODataAnnotation\\",
@@ -60452,6 +60440,18 @@ appDescription=A Fiori application.",
         \\"settings\\": {
           \\"localUri\\": \\"annotations/annotation.xml\\"
         }
+      },
+      \\"mainService\\": {
+        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
+        \\"type\\": \\"OData\\",
+        \\"settings\\": {
+          \\"annotations\\": [
+            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
+            \\"annotation\\"
+          ],
+          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
+          \\"odataVersion\\": \\"2.0\\"
+        }
       }
     }
   },
diff --git a/packages/fiori-elements-writer/test/__snapshots__/ovp.test.ts.snap b/packages/fiori-elements-writer/test/__snapshots__/ovp.test.ts.snap
index 82802c5313..b3938ccdc9 100644
--- a/packages/fiori-elements-writer/test/__snapshots__/ovp.test.ts.snap
+++ b/packages/fiori-elements-writer/test/__snapshots__/ovp.test.ts.snap
@@ -1011,18 +1011,6 @@ xmlns:atom=\\"http://www.w3.org/2005/Atom\\"/>
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
-      \\"mainService\\": {
-        \\"uri\\": \\"/sap/opu/odata/sap/GWSAMPLE_BASIC/\\",
-        \\"type\\": \\"OData\\",
-        \\"settings\\": {
-          \\"annotations\\": [
-            \\"GWSAMPLE_BASIC\\",
-            \\"annotation\\"
-          ],
-          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
-          \\"odataVersion\\": \\"2.0\\"
-        }
-      },
       \\"GWSAMPLE_BASIC\\": {
         \\"uri\\": \\"/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='GWSAMPLE_BASIC',Version='0001')/$value/\\",
         \\"type\\": \\"ODataAnnotation\\",
@@ -1036,6 +1024,18 @@ xmlns:atom=\\"http://www.w3.org/2005/Atom\\"/>
         \\"settings\\": {
           \\"localUri\\": \\"annotations/annotation.xml\\"
         }
+      },
+      \\"mainService\\": {
+        \\"uri\\": \\"/sap/opu/odata/sap/GWSAMPLE_BASIC/\\",
+        \\"type\\": \\"OData\\",
+        \\"settings\\": {
+          \\"annotations\\": [
+            \\"GWSAMPLE_BASIC\\",
+            \\"annotation\\"
+          ],
+          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
+          \\"odataVersion\\": \\"2.0\\"
+        }
       }
     }
   },
@@ -2807,18 +2807,6 @@ xmlns:atom=\\"http://www.w3.org/2005/Atom\\"/>
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
-      \\"mainService\\": {
-        \\"uri\\": \\"/sap/opu/odata/sap/GWSAMPLE_BASIC/\\",
-        \\"type\\": \\"OData\\",
-        \\"settings\\": {
-          \\"annotations\\": [
-            \\"GWSAMPLE_BASIC\\",
-            \\"annotation\\"
-          ],
-          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
-          \\"odataVersion\\": \\"2.0\\"
-        }
-      },
       \\"GWSAMPLE_BASIC\\": {
         \\"uri\\": \\"/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='GWSAMPLE_BASIC',Version='0001')/$value/\\",
         \\"type\\": \\"ODataAnnotation\\",
@@ -2832,6 +2820,18 @@ xmlns:atom=\\"http://www.w3.org/2005/Atom\\"/>
         \\"settings\\": {
           \\"localUri\\": \\"annotations/annotation.xml\\"
         }
+      },
+      \\"mainService\\": {
+        \\"uri\\": \\"/sap/opu/odata/sap/GWSAMPLE_BASIC/\\",
+        \\"type\\": \\"OData\\",
+        \\"settings\\": {
+          \\"annotations\\": [
+            \\"GWSAMPLE_BASIC\\",
+            \\"annotation\\"
+          ],
+          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
+          \\"odataVersion\\": \\"2.0\\"
+        }
       }
     }
   },
@@ -8757,6 +8757,13 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/sap/c_salesordermanage_srv/srvd/sap/c_salesordermanage_sd_aggregate/0001/\\",
         \\"type\\": \\"OData\\",
@@ -8767,13 +8774,6 @@ appDescription=A Fiori application.",
           \\"localUri\\": \\"localService/mainService/metadata.xml\\",
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
@@ -14788,6 +14788,13 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/sap/c_salesordermanage_srv/srvd/sap/c_salesordermanage_sd_aggregate/0001/\\",
         \\"type\\": \\"OData\\",
@@ -14798,13 +14805,6 @@ appDescription=A Fiori application.",
           \\"localUri\\": \\"localService/mainService/metadata.xml\\",
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
diff --git a/packages/fiori-elements-writer/test/__snapshots__/worklist.test.ts.snap b/packages/fiori-elements-writer/test/__snapshots__/worklist.test.ts.snap
index cf559c1838..7a112407f7 100644
--- a/packages/fiori-elements-writer/test/__snapshots__/worklist.test.ts.snap
+++ b/packages/fiori-elements-writer/test/__snapshots__/worklist.test.ts.snap
@@ -2903,18 +2903,6 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
-      \\"mainService\\": {
-        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
-        \\"type\\": \\"OData\\",
-        \\"settings\\": {
-          \\"annotations\\": [
-            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
-            \\"annotation\\"
-          ],
-          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
-          \\"odataVersion\\": \\"2.0\\"
-        }
-      },
       \\"SEPMRA_PROD_MAN_ANNO_MDL\\": {
         \\"uri\\": \\"/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='SEPMRA_PROD_MAN_ANNO_MDL',Version='0001')/$value/\\",
         \\"type\\": \\"ODataAnnotation\\",
@@ -2928,6 +2916,18 @@ appDescription=A Fiori application.",
         \\"settings\\": {
           \\"localUri\\": \\"annotations/annotation.xml\\"
         }
+      },
+      \\"mainService\\": {
+        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
+        \\"type\\": \\"OData\\",
+        \\"settings\\": {
+          \\"annotations\\": [
+            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
+            \\"annotation\\"
+          ],
+          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
+          \\"odataVersion\\": \\"2.0\\"
+        }
       }
     }
   },
@@ -6534,18 +6534,6 @@ appDescription=A Fiori application.",
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
-      \\"mainService\\": {
-        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
-        \\"type\\": \\"OData\\",
-        \\"settings\\": {
-          \\"annotations\\": [
-            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
-            \\"annotation\\"
-          ],
-          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
-          \\"odataVersion\\": \\"2.0\\"
-        }
-      },
       \\"SEPMRA_PROD_MAN_ANNO_MDL\\": {
         \\"uri\\": \\"/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='SEPMRA_PROD_MAN_ANNO_MDL',Version='0001')/$value/\\",
         \\"type\\": \\"ODataAnnotation\\",
@@ -6559,6 +6547,18 @@ appDescription=A Fiori application.",
         \\"settings\\": {
           \\"localUri\\": \\"annotations/annotation.xml\\"
         }
+      },
+      \\"mainService\\": {
+        \\"uri\\": \\"/sap/opu/odata/sap/SEPMRA_PROD_MAN/\\",
+        \\"type\\": \\"OData\\",
+        \\"settings\\": {
+          \\"annotations\\": [
+            \\"SEPMRA_PROD_MAN_ANNO_MDL\\",
+            \\"annotation\\"
+          ],
+          \\"localUri\\": \\"localService/mainService/metadata.xml\\",
+          \\"odataVersion\\": \\"2.0\\"
+        }
       }
     }
   },
@@ -10450,6 +10450,13 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/dmo/sb_travel_mduu_o4/srvd/dmo/sd_travel_mduu/0001/\\",
         \\"type\\": \\"OData\\",
@@ -10460,13 +10467,6 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
           \\"localUri\\": \\"localService/mainService/metadata.xml\\",
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },
@@ -14132,6 +14132,13 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
       \\"version\\": \\"1.2.3-test\\"
     },
     \\"dataSources\\": {
+      \\"annotation\\": {
+        \\"type\\": \\"ODataAnnotation\\",
+        \\"uri\\": \\"annotations/annotation.xml\\",
+        \\"settings\\": {
+          \\"localUri\\": \\"annotations/annotation.xml\\"
+        }
+      },
       \\"mainService\\": {
         \\"uri\\": \\"/sap/opu/odata4/dmo/sb_travel_mduu_o4/srvd/dmo/sd_travel_mduu/0001/\\",
         \\"type\\": \\"OData\\",
@@ -14142,13 +14149,6 @@ EntityType=\\"com.sap.gateway.srvd.dmo.sd_travel_mduu.v0001.TravelAgencyType\\">
           \\"localUri\\": \\"localService/mainService/metadata.xml\\",
           \\"odataVersion\\": \\"4.0\\"
         }
-      },
-      \\"annotation\\": {
-        \\"type\\": \\"ODataAnnotation\\",
-        \\"uri\\": \\"annotations/annotation.xml\\",
-        \\"settings\\": {
-          \\"localUri\\": \\"annotations/annotation.xml\\"
-        }
       }
     }
   },