diff --git a/package-lock.json b/package-lock.json
index 5f90a3160..80ed76922 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13245,7 +13245,7 @@
     },
     "packages/abstractions": {
       "name": "@microsoft/kiota-abstractions",
-      "version": "1.0.0-preview.41",
+      "version": "1.0.0-preview.42",
       "license": "MIT",
       "dependencies": {
         "@opentelemetry/api": "^1.7.0",
@@ -13262,21 +13262,21 @@
     },
     "packages/authentication/azure": {
       "name": "@microsoft/kiota-authentication-azure",
-      "version": "1.0.0-preview.36",
+      "version": "1.0.0-preview.37",
       "license": "MIT",
       "dependencies": {
         "@azure/core-auth": "^1.5.0",
-        "@microsoft/kiota-abstractions": "^1.0.0-preview.41",
+        "@microsoft/kiota-abstractions": "^1.0.0-preview.42",
         "@opentelemetry/api": "^1.7.0",
         "tslib": "^2.6.2"
       }
     },
     "packages/authentication/spfx": {
       "name": "@microsoft/kiota-authentication-spfx",
-      "version": "1.0.0-preview.31",
+      "version": "1.0.0-preview.32",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/kiota-abstractions": "^1.0.0-preview.41",
+        "@microsoft/kiota-abstractions": "^1.0.0-preview.42",
         "@microsoft/sp-http": "^1.15.2",
         "@opentelemetry/api": "^1.7.0",
         "tslib": "^2.6.2"
@@ -13580,10 +13580,10 @@
     },
     "packages/http/fetch": {
       "name": "@microsoft/kiota-http-fetchlibrary",
-      "version": "1.0.0-preview.40",
+      "version": "1.0.0-preview.41",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/kiota-abstractions": "^1.0.0-preview.41",
+        "@microsoft/kiota-abstractions": "^1.0.0-preview.42",
         "@opentelemetry/api": "^1.7.0",
         "guid-typescript": "^1.0.9",
         "node-fetch": "^2.7.0",
@@ -13611,43 +13611,43 @@
     },
     "packages/serialization/form": {
       "name": "@microsoft/kiota-serialization-form",
-      "version": "1.0.0-preview.30",
+      "version": "1.0.0-preview.31",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/kiota-abstractions": "^1.0.0-preview.41",
+        "@microsoft/kiota-abstractions": "^1.0.0-preview.42",
         "guid-typescript": "^1.0.9",
         "tslib": "^2.6.2"
       }
     },
     "packages/serialization/json": {
       "name": "@microsoft/kiota-serialization-json",
-      "version": "1.0.0-preview.41",
+      "version": "1.0.0-preview.42",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/kiota-abstractions": "^1.0.0-preview.41",
+        "@microsoft/kiota-abstractions": "^1.0.0-preview.42",
         "guid-typescript": "^1.0.9",
         "tslib": "^2.6.2"
       }
     },
     "packages/serialization/multipart": {
       "name": "@microsoft/kiota-serialization-multipart",
-      "version": "1.0.0-preview.20",
+      "version": "1.0.0-preview.21",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/kiota-abstractions": "^1.0.0-preview.41",
+        "@microsoft/kiota-abstractions": "^1.0.0-preview.42",
         "guid-typescript": "^1.0.9",
         "tslib": "^2.6.2"
       },
       "devDependencies": {
-        "@microsoft/kiota-serialization-json": "^1.0.0-preview.41"
+        "@microsoft/kiota-serialization-json": "^1.0.0-preview.42"
       }
     },
     "packages/serialization/text": {
       "name": "@microsoft/kiota-serialization-text",
-      "version": "1.0.0-preview.38",
+      "version": "1.0.0-preview.39",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/kiota-abstractions": "^1.0.0-preview.41",
+        "@microsoft/kiota-abstractions": "^1.0.0-preview.42",
         "guid-typescript": "^1.0.9",
         "tslib": "^2.6.2"
       }
diff --git a/packages/abstractions/package.json b/packages/abstractions/package.json
index 6a221f82d..f58f934f4 100644
--- a/packages/abstractions/package.json
+++ b/packages/abstractions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/kiota-abstractions",
-  "version": "1.0.0-preview.41",
+  "version": "1.0.0-preview.42",
   "description": "Core abstractions for kiota generated libraries in TypeScript and JavaScript",
   "main": "dist/cjs/src/index.js",
   "module": "dist/es/src/index.js",
diff --git a/packages/abstractions/src/apiClientProxifier.ts b/packages/abstractions/src/apiClientProxifier.ts
index 3d96c5003..b40d931da 100644
--- a/packages/abstractions/src/apiClientProxifier.ts
+++ b/packages/abstractions/src/apiClientProxifier.ts
@@ -182,13 +182,11 @@ function sendAsync(
 export function apiClientProxifier<T extends object>(
   requestAdapter: RequestAdapter,
   pathParameters: Record<string, unknown>,
-  urlTemplate: string,
   navigationMetadata?: Record<string, NavigationMetadata>,
   requestsMetadata?: RequestsMetadata,
 ): T {
   if (!requestAdapter) throw new Error("requestAdapter cannot be undefined");
   if (!pathParameters) throw new Error("pathParameters cannot be undefined");
-  if (!urlTemplate) throw new Error("urlTemplate cannot be undefined");
   return new Proxy({} as T, {
     get(target, property) {
       const name = String(property);
@@ -198,7 +196,6 @@ export function apiClientProxifier<T extends object>(
           return apiClientProxifier(
             requestAdapter,
             getPathParameters(rawUrl),
-            urlTemplate,
             navigationMetadata,
             requestsMetadata,
           );
@@ -212,10 +209,12 @@ export function apiClientProxifier<T extends object>(
             switch (name) {
               case "get":
                 return (
-                  requestConfiguration?: RequestConfiguration<object> | undefined,
+                  requestConfiguration?:
+                    | RequestConfiguration<object>
+                    | undefined,
                 ) => {
                   const requestInfo = toRequestInformation(
-                    urlTemplate,
+                    metadata.uriTemplate,
                     pathParameters,
                     metadata,
                     requestAdapter,
@@ -229,7 +228,7 @@ export function apiClientProxifier<T extends object>(
               case "patch":
                 return (...args: any[]) => {
                   const requestInfo = toRequestInformation(
-                    urlTemplate,
+                    metadata.uriTemplate,
                     pathParameters,
                     metadata,
                     requestAdapter,
@@ -243,7 +242,7 @@ export function apiClientProxifier<T extends object>(
               case "put":
                 return (...args: any[]) => {
                   const requestInfo = toRequestInformation(
-                    urlTemplate,
+                    metadata.uriTemplate,
                     pathParameters,
                     metadata,
                     requestAdapter,
@@ -257,7 +256,7 @@ export function apiClientProxifier<T extends object>(
               case "delete":
                 return (...args: any[]) => {
                   const requestInfo = toRequestInformation(
-                    urlTemplate,
+                    metadata.uriTemplate,
                     pathParameters,
                     metadata,
                     requestAdapter,
@@ -271,7 +270,7 @@ export function apiClientProxifier<T extends object>(
               case "post":
                 return (...args: any[]) => {
                   const requestInfo = toRequestInformation(
-                    urlTemplate,
+                    metadata.uriTemplate,
                     pathParameters,
                     metadata,
                     requestAdapter,
@@ -283,9 +282,11 @@ export function apiClientProxifier<T extends object>(
                   return sendAsync(requestAdapter, requestInfo, metadata);
                 };
               case "toGetRequestInformation":
-                return (requestConfiguration?: RequestConfiguration<object>) => {
+                return (
+                  requestConfiguration?: RequestConfiguration<object>,
+                ) => {
                   return toRequestInformation(
-                    urlTemplate,
+                    metadata.uriTemplate,
                     pathParameters,
                     metadata,
                     requestAdapter,
@@ -298,7 +299,7 @@ export function apiClientProxifier<T extends object>(
               case "toPatchRequestInformation":
                 return (...args: any[]) => {
                   return toRequestInformation(
-                    urlTemplate,
+                    metadata.uriTemplate,
                     pathParameters,
                     metadata,
                     requestAdapter,
@@ -311,7 +312,7 @@ export function apiClientProxifier<T extends object>(
               case "toPutRequestInformation":
                 return (...args: any[]) => {
                   return toRequestInformation(
-                    urlTemplate,
+                    metadata.uriTemplate,
                     pathParameters,
                     metadata,
                     requestAdapter,
@@ -324,7 +325,7 @@ export function apiClientProxifier<T extends object>(
               case "toDeleteRequestInformation":
                 return (...args: any[]) => {
                   return toRequestInformation(
-                    urlTemplate,
+                    metadata.uriTemplate,
                     pathParameters,
                     metadata,
                     requestAdapter,
@@ -337,7 +338,7 @@ export function apiClientProxifier<T extends object>(
               case "toPostRequestInformation":
                 return (...args: any[]) => {
                   return toRequestInformation(
-                    urlTemplate,
+                    metadata.uriTemplate,
                     pathParameters,
                     metadata,
                     requestAdapter,
@@ -364,7 +365,6 @@ export function apiClientProxifier<T extends object>(
             return apiClientProxifier(
               requestAdapter,
               getPathParameters(pathParameters),
-              navigationCandidate.uriTemplate,
               navigationCandidate.navigationMetadata,
               navigationCandidate.requestsMetadata,
             );
@@ -386,7 +386,6 @@ export function apiClientProxifier<T extends object>(
             return apiClientProxifier(
               requestAdapter,
               downWardPathParameters,
-              navigationCandidate.uriTemplate,
               navigationCandidate.navigationMetadata,
               navigationCandidate.requestsMetadata,
             );
@@ -415,6 +414,7 @@ export interface RequestMetadata {
     | PrimitiveTypesForDeserialization;
   requestInformationContentSetMethod?: keyof RequestInformationSetContent;
   queryParametersMapper?: Record<string, string>;
+  uriTemplate: string;
 }
 export interface RequestsMetadata {
   delete?: RequestMetadata;
@@ -429,7 +429,6 @@ export interface RequestsMetadata {
 type KeysOfRequestsMetadata = keyof RequestsMetadata;
 
 export interface NavigationMetadata {
-  uriTemplate: string;
   requestsMetadata?: RequestsMetadata;
   navigationMetadata?: Record<string, NavigationMetadata>;
   pathParametersMappings?: string[];
diff --git a/packages/authentication/azure/package.json b/packages/authentication/azure/package.json
index 84de6832c..3338b7948 100644
--- a/packages/authentication/azure/package.json
+++ b/packages/authentication/azure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/kiota-authentication-azure",
-  "version": "1.0.0-preview.36",
+  "version": "1.0.0-preview.37",
   "description": "Authentication provider for Kiota using Azure Identity",
   "main": "dist/cjs/src/index.js",
   "module": "dist/es/src/index.js",
@@ -30,7 +30,7 @@
   "homepage": "https://github.com/microsoft/kiota-typescript#readme",
   "dependencies": {
     "@azure/core-auth": "^1.5.0",
-    "@microsoft/kiota-abstractions": "^1.0.0-preview.41",
+    "@microsoft/kiota-abstractions": "^1.0.0-preview.42",
     "@opentelemetry/api": "^1.7.0",
     "tslib": "^2.6.2"
   },
diff --git a/packages/authentication/spfx/package.json b/packages/authentication/spfx/package.json
index f71ecf548..01fd6a311 100644
--- a/packages/authentication/spfx/package.json
+++ b/packages/authentication/spfx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/kiota-authentication-spfx",
-  "version": "1.0.0-preview.31",
+  "version": "1.0.0-preview.32",
   "description": "Authentication provider for using Kiota in SPFx solutions",
   "main": "dist/cjs/src/index.js",
   "module": "dist/es/src/index.js",
@@ -39,7 +39,7 @@
   },
   "homepage": "https://github.com/microsoft/kiota-typescript#readme",
   "dependencies": {
-    "@microsoft/kiota-abstractions": "^1.0.0-preview.41",
+    "@microsoft/kiota-abstractions": "^1.0.0-preview.42",
     "@microsoft/sp-http": "^1.15.2",
     "@opentelemetry/api": "^1.7.0",
     "tslib": "^2.6.2"
diff --git a/packages/http/fetch/package.json b/packages/http/fetch/package.json
index 0f99a151d..42c93b493 100644
--- a/packages/http/fetch/package.json
+++ b/packages/http/fetch/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@microsoft/kiota-http-fetchlibrary",
-	"version": "1.0.0-preview.40",
+	"version": "1.0.0-preview.41",
 	"description": "Kiota request adapter implementation with fetch",
 	"keywords": [
 		"Kiota",
@@ -38,7 +38,7 @@
 		"test:cjs": "mocha 'dist/cjs/test/common/**/*.js' && mocha  'dist/cjs/test/node/**/*.js'"
 	},
 	"dependencies": {
-		"@microsoft/kiota-abstractions": "^1.0.0-preview.41",
+		"@microsoft/kiota-abstractions": "^1.0.0-preview.42",
 		"@opentelemetry/api": "^1.7.0",
 		"guid-typescript": "^1.0.9",
 		"node-fetch": "^2.7.0",
diff --git a/packages/serialization/form/package.json b/packages/serialization/form/package.json
index 7f7e3f2fc..cf8bd2865 100644
--- a/packages/serialization/form/package.json
+++ b/packages/serialization/form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/kiota-serialization-form",
-  "version": "1.0.0-preview.30",
+  "version": "1.0.0-preview.31",
   "description": "Implementation of Kiota Serialization interfaces for URI from encoded",
   "main": "dist/cjs/src/index.js",
   "browser": {
@@ -39,7 +39,7 @@
   },
   "homepage": "https://github.com/microsoft/kiota-typescript#readme",
   "dependencies": {
-    "@microsoft/kiota-abstractions": "^1.0.0-preview.41",
+    "@microsoft/kiota-abstractions": "^1.0.0-preview.42",
     "guid-typescript": "^1.0.9",
     "tslib": "^2.6.2"
   },
diff --git a/packages/serialization/json/package.json b/packages/serialization/json/package.json
index f8402bf3b..c45fdee15 100644
--- a/packages/serialization/json/package.json
+++ b/packages/serialization/json/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/kiota-serialization-json",
-  "version": "1.0.0-preview.41",
+  "version": "1.0.0-preview.42",
   "description": "Implementation of Kiota Serialization interfaces for JSON",
   "main": "dist/cjs/src/index.js",
   "browser": {
@@ -39,7 +39,7 @@
   },
   "homepage": "https://github.com/microsoft/kiota-typescript#readme",
   "dependencies": {
-    "@microsoft/kiota-abstractions": "^1.0.0-preview.41",
+    "@microsoft/kiota-abstractions": "^1.0.0-preview.42",
     "guid-typescript": "^1.0.9",
     "tslib": "^2.6.2"
   },
diff --git a/packages/serialization/multipart/package.json b/packages/serialization/multipart/package.json
index 4706b1256..bb54d81d1 100644
--- a/packages/serialization/multipart/package.json
+++ b/packages/serialization/multipart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/kiota-serialization-multipart",
-  "version": "1.0.0-preview.20",
+  "version": "1.0.0-preview.21",
   "description": "Implementation of Kiota Serialization interfaces for multipart form data",
   "main": "dist/cjs/src/index.js",
   "module": "dist/es/src/index.js",
@@ -35,12 +35,12 @@
   },
   "homepage": "https://github.com/microsoft/kiota-typescript#readme",
   "dependencies": {
-    "@microsoft/kiota-abstractions": "^1.0.0-preview.41",
+    "@microsoft/kiota-abstractions": "^1.0.0-preview.42",
     "guid-typescript": "^1.0.9",
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@microsoft/kiota-serialization-json": "^1.0.0-preview.41"
+    "@microsoft/kiota-serialization-json": "^1.0.0-preview.42"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/serialization/text/package.json b/packages/serialization/text/package.json
index ea371d27c..83dbc7a58 100644
--- a/packages/serialization/text/package.json
+++ b/packages/serialization/text/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/kiota-serialization-text",
-  "version": "1.0.0-preview.38",
+  "version": "1.0.0-preview.39",
   "description": "Implementation of Kiota Serialization interfaces for text",
   "main": "dist/cjs/src/index.js",
   "browser": {
@@ -39,7 +39,7 @@
   },
   "homepage": "https://github.com/microsoft/kiota-typescript#readme",
   "dependencies": {
-    "@microsoft/kiota-abstractions": "^1.0.0-preview.41",
+    "@microsoft/kiota-abstractions": "^1.0.0-preview.42",
     "guid-typescript": "^1.0.9",
     "tslib": "^2.6.2"
   },
diff --git a/packages/test/generatedCode/apiClient.ts b/packages/test/generatedCode/apiClient.ts
index 6dbf04f6a..b7c7406aa 100644
--- a/packages/test/generatedCode/apiClient.ts
+++ b/packages/test/generatedCode/apiClient.ts
@@ -1,7 +1,7 @@
 /* tslint:disable */
 /* eslint-disable */
 // Generated by Microsoft Kiota
-import { type UsersRequestBuilder, UsersRequestBuilderNavigationMetadata, UsersRequestBuilderUriTemplate } from './users/';
+import { type UsersRequestBuilder, UsersRequestBuilderNavigationMetadata } from './users/';
 import { apiClientProxifier, registerDefaultDeserializer, registerDefaultSerializer, type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type RequestAdapter } from '@microsoft/kiota-abstractions';
 import { FormParseNodeFactory, FormSerializationWriterFactory } from '@microsoft/kiota-serialization-form';
 import { JsonParseNodeFactory, JsonSerializationWriterFactory } from '@microsoft/kiota-serialization-json';
@@ -18,7 +18,7 @@ export interface ApiClient extends BaseRequestBuilder<ApiClient> {
     get users(): UsersRequestBuilder;
 }
 /**
- * Instantiates a new ApiClient and sets the default values.
+ * Instantiates a new {@link ApiClient} and sets the default values.
  * @param requestAdapter The request adapter to use to execute the requests.
  */
 export function createApiClient(requestAdapter: RequestAdapter) {
@@ -35,20 +35,19 @@ export function createApiClient(requestAdapter: RequestAdapter) {
     const pathParameters: Record<string, unknown> = {
         "baseurl": requestAdapter.baseUrl,
     };
-    return apiClientProxifier<ApiClient>(requestAdapter, pathParameters, ApiClientUriTemplate, ApiClientNavigationMetadata, undefined);
+    return apiClientProxifier<ApiClient>(requestAdapter, pathParameters, ApiClientNavigationMetadata, undefined);
 }
+/**
+ * Uri template for the request builder.
+ */
+export const ApiClientUriTemplate = "{+baseurl}";
 /**
  * Metadata for all the navigation properties in the request builder.
  */
 export const ApiClientNavigationMetadata: Record<Exclude<keyof ApiClient, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     users: {
-        uriTemplate: UsersRequestBuilderUriTemplate,
         navigationMetadata: UsersRequestBuilderNavigationMetadata,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const ApiClientUriTemplate = "{+baseurl}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/kiota-lock.json b/packages/test/generatedCode/kiota-lock.json
index 9d9e2bd55..777ee0689 100644
--- a/packages/test/generatedCode/kiota-lock.json
+++ b/packages/test/generatedCode/kiota-lock.json
@@ -2,7 +2,7 @@
   "descriptionHash": "880607FEC08E088EFB64EA3C15BAC2221BCF7C9AAD42A7DF5939AB8D6F14D90AB52FDA7BF7B28235D6FF87CF2D9A7B45B697BCC79DA574D955A39132B7C04DA2",
   "descriptionLocation": "https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-powershell/dev/openApiDocs/v1.0/Mail.yml",
   "lockFileVersion": "1.0.0",
-  "kiotaVersion": "1.11.0",
+  "kiotaVersion": "1.11.1",
   "clientClassName": "ApiClient",
   "clientNamespaceName": "ApiSdk",
   "language": "TypeScript",
diff --git a/packages/test/generatedCode/models/index.ts b/packages/test/generatedCode/models/index.ts
index aa3e73bf2..b8a9bae1b 100644
--- a/packages/test/generatedCode/models/index.ts
+++ b/packages/test/generatedCode/models/index.ts
@@ -43,7 +43,7 @@ export type BodyType = (typeof BodyTypeObject)[keyof typeof BodyTypeObject];
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a attachmentCollectionResponse
+ * @returns {AttachmentCollectionResponse}
  */
 export function createAttachmentCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoAttachmentCollectionResponse;
@@ -51,7 +51,7 @@ export function createAttachmentCollectionResponseFromDiscriminatorValue(parseNo
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a attachment
+ * @returns {Attachment}
  */
 export function createAttachmentFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoAttachment;
@@ -59,7 +59,7 @@ export function createAttachmentFromDiscriminatorValue(parseNode: ParseNode | un
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a dateTimeTimeZone
+ * @returns {DateTimeTimeZone}
  */
 export function createDateTimeTimeZoneFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoDateTimeTimeZone;
@@ -67,7 +67,7 @@ export function createDateTimeTimeZoneFromDiscriminatorValue(parseNode: ParseNod
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a emailAddress
+ * @returns {EmailAddress}
  */
 export function createEmailAddressFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoEmailAddress;
@@ -75,7 +75,7 @@ export function createEmailAddressFromDiscriminatorValue(parseNode: ParseNode |
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a entity
+ * @returns {Entity}
  */
 export function createEntityFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoEntity;
@@ -83,7 +83,7 @@ export function createEntityFromDiscriminatorValue(parseNode: ParseNode | undefi
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a extensionCollectionResponse
+ * @returns {ExtensionCollectionResponse}
  */
 export function createExtensionCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoExtensionCollectionResponse;
@@ -91,7 +91,7 @@ export function createExtensionCollectionResponseFromDiscriminatorValue(parseNod
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a extension
+ * @returns {Extension}
  */
 export function createExtensionFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoExtension;
@@ -99,7 +99,7 @@ export function createExtensionFromDiscriminatorValue(parseNode: ParseNode | und
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a followupFlag
+ * @returns {FollowupFlag}
  */
 export function createFollowupFlagFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoFollowupFlag;
@@ -107,7 +107,7 @@ export function createFollowupFlagFromDiscriminatorValue(parseNode: ParseNode |
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a inferenceClassification
+ * @returns {InferenceClassification}
  */
 export function createInferenceClassificationFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoInferenceClassification;
@@ -115,7 +115,7 @@ export function createInferenceClassificationFromDiscriminatorValue(parseNode: P
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a inferenceClassificationOverrideCollectionResponse
+ * @returns {InferenceClassificationOverrideCollectionResponse}
  */
 export function createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoInferenceClassificationOverrideCollectionResponse;
@@ -123,7 +123,7 @@ export function createInferenceClassificationOverrideCollectionResponseFromDiscr
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a inferenceClassificationOverride
+ * @returns {InferenceClassificationOverride}
  */
 export function createInferenceClassificationOverrideFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoInferenceClassificationOverride;
@@ -131,7 +131,7 @@ export function createInferenceClassificationOverrideFromDiscriminatorValue(pars
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a internetMessageHeader
+ * @returns {InternetMessageHeader}
  */
 export function createInternetMessageHeaderFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoInternetMessageHeader;
@@ -139,7 +139,7 @@ export function createInternetMessageHeaderFromDiscriminatorValue(parseNode: Par
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a itemBody
+ * @returns {ItemBody}
  */
 export function createItemBodyFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoItemBody;
@@ -147,7 +147,7 @@ export function createItemBodyFromDiscriminatorValue(parseNode: ParseNode | unde
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a mailFolderCollectionResponse
+ * @returns {MailFolderCollectionResponse}
  */
 export function createMailFolderCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoMailFolderCollectionResponse;
@@ -155,7 +155,7 @@ export function createMailFolderCollectionResponseFromDiscriminatorValue(parseNo
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a mailFolder
+ * @returns {MailFolder}
  */
 export function createMailFolderFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoMailFolder;
@@ -163,7 +163,7 @@ export function createMailFolderFromDiscriminatorValue(parseNode: ParseNode | un
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a messageCollectionResponse
+ * @returns {MessageCollectionResponse}
  */
 export function createMessageCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoMessageCollectionResponse;
@@ -171,7 +171,7 @@ export function createMessageCollectionResponseFromDiscriminatorValue(parseNode:
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a message
+ * @returns {Message}
  */
 export function createMessageFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoMessage;
@@ -179,7 +179,7 @@ export function createMessageFromDiscriminatorValue(parseNode: ParseNode | undef
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a messageRuleActions
+ * @returns {MessageRuleActions}
  */
 export function createMessageRuleActionsFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoMessageRuleActions;
@@ -187,7 +187,7 @@ export function createMessageRuleActionsFromDiscriminatorValue(parseNode: ParseN
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a messageRuleCollectionResponse
+ * @returns {MessageRuleCollectionResponse}
  */
 export function createMessageRuleCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoMessageRuleCollectionResponse;
@@ -195,7 +195,7 @@ export function createMessageRuleCollectionResponseFromDiscriminatorValue(parseN
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a messageRule
+ * @returns {MessageRule}
  */
 export function createMessageRuleFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoMessageRule;
@@ -203,7 +203,7 @@ export function createMessageRuleFromDiscriminatorValue(parseNode: ParseNode | u
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a messageRulePredicates
+ * @returns {MessageRulePredicates}
  */
 export function createMessageRulePredicatesFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoMessageRulePredicates;
@@ -211,7 +211,7 @@ export function createMessageRulePredicatesFromDiscriminatorValue(parseNode: Par
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a multiValueLegacyExtendedProperty
+ * @returns {MultiValueLegacyExtendedProperty}
  */
 export function createMultiValueLegacyExtendedPropertyFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoMultiValueLegacyExtendedProperty;
@@ -219,7 +219,7 @@ export function createMultiValueLegacyExtendedPropertyFromDiscriminatorValue(par
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a outlookItem
+ * @returns {OutlookItem}
  */
 export function createOutlookItemFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoOutlookItem;
@@ -227,7 +227,7 @@ export function createOutlookItemFromDiscriminatorValue(parseNode: ParseNode | u
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a recipient
+ * @returns {Recipient}
  */
 export function createRecipientFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoRecipient;
@@ -235,7 +235,7 @@ export function createRecipientFromDiscriminatorValue(parseNode: ParseNode | und
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a singleValueLegacyExtendedProperty
+ * @returns {SingleValueLegacyExtendedProperty}
  */
 export function createSingleValueLegacyExtendedPropertyFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoSingleValueLegacyExtendedProperty;
@@ -243,7 +243,7 @@ export function createSingleValueLegacyExtendedPropertyFromDiscriminatorValue(pa
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a sizeRange
+ * @returns {SizeRange}
  */
 export function createSizeRangeFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoSizeRange;
@@ -264,7 +264,7 @@ export interface DateTimeTimeZone extends AdditionalDataHolder, Parsable {
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoAttachment(attachment: Partial<Attachment> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -278,7 +278,7 @@ export function deserializeIntoAttachment(attachment: Partial<Attachment> | unde
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoAttachmentCollectionResponse(attachmentCollectionResponse: Partial<AttachmentCollectionResponse> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -288,7 +288,7 @@ export function deserializeIntoAttachmentCollectionResponse(attachmentCollection
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoDateTimeTimeZone(dateTimeTimeZone: Partial<DateTimeTimeZone> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -298,7 +298,7 @@ export function deserializeIntoDateTimeTimeZone(dateTimeTimeZone: Partial<DateTi
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoEmailAddress(emailAddress: Partial<EmailAddress> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -308,7 +308,7 @@ export function deserializeIntoEmailAddress(emailAddress: Partial<EmailAddress>
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoEntity(entity: Partial<Entity> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -317,7 +317,7 @@ export function deserializeIntoEntity(entity: Partial<Entity> | undefined = {})
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoExtension(extension: Partial<Extension> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -326,7 +326,7 @@ export function deserializeIntoExtension(extension: Partial<Extension> | undefin
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoExtensionCollectionResponse(extensionCollectionResponse: Partial<ExtensionCollectionResponse> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -336,7 +336,7 @@ export function deserializeIntoExtensionCollectionResponse(extensionCollectionRe
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoFollowupFlag(followupFlag: Partial<FollowupFlag> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -348,7 +348,7 @@ export function deserializeIntoFollowupFlag(followupFlag: Partial<FollowupFlag>
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoInferenceClassification(inferenceClassification: Partial<InferenceClassification> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -358,7 +358,7 @@ export function deserializeIntoInferenceClassification(inferenceClassification:
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoInferenceClassificationOverride(inferenceClassificationOverride: Partial<InferenceClassificationOverride> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -369,7 +369,7 @@ export function deserializeIntoInferenceClassificationOverride(inferenceClassifi
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoInferenceClassificationOverrideCollectionResponse(inferenceClassificationOverrideCollectionResponse: Partial<InferenceClassificationOverrideCollectionResponse> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -379,7 +379,7 @@ export function deserializeIntoInferenceClassificationOverrideCollectionResponse
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoInternetMessageHeader(internetMessageHeader: Partial<InternetMessageHeader> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -389,7 +389,7 @@ export function deserializeIntoInternetMessageHeader(internetMessageHeader: Part
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoItemBody(itemBody: Partial<ItemBody> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -399,7 +399,7 @@ export function deserializeIntoItemBody(itemBody: Partial<ItemBody> | undefined
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoMailFolder(mailFolder: Partial<MailFolder> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -419,7 +419,7 @@ export function deserializeIntoMailFolder(mailFolder: Partial<MailFolder> | unde
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoMailFolderCollectionResponse(mailFolderCollectionResponse: Partial<MailFolderCollectionResponse> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -429,7 +429,7 @@ export function deserializeIntoMailFolderCollectionResponse(mailFolderCollection
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoMessage(message: Partial<Message> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -468,7 +468,7 @@ export function deserializeIntoMessage(message: Partial<Message> | undefined = {
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoMessageCollectionResponse(messageCollectionResponse: Partial<MessageCollectionResponse> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -478,7 +478,7 @@ export function deserializeIntoMessageCollectionResponse(messageCollectionRespon
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoMessageRule(messageRule: Partial<MessageRule> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -495,7 +495,7 @@ export function deserializeIntoMessageRule(messageRule: Partial<MessageRule> | u
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoMessageRuleActions(messageRuleActions: Partial<MessageRuleActions> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -514,7 +514,7 @@ export function deserializeIntoMessageRuleActions(messageRuleActions: Partial<Me
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoMessageRuleCollectionResponse(messageRuleCollectionResponse: Partial<MessageRuleCollectionResponse> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -524,7 +524,7 @@ export function deserializeIntoMessageRuleCollectionResponse(messageRuleCollecti
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoMessageRulePredicates(messageRulePredicates: Partial<MessageRulePredicates> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -562,7 +562,7 @@ export function deserializeIntoMessageRulePredicates(messageRulePredicates: Part
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoMultiValueLegacyExtendedProperty(multiValueLegacyExtendedProperty: Partial<MultiValueLegacyExtendedProperty> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -572,7 +572,7 @@ export function deserializeIntoMultiValueLegacyExtendedProperty(multiValueLegacy
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoOutlookItem(outlookItem: Partial<OutlookItem> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -585,7 +585,7 @@ export function deserializeIntoOutlookItem(outlookItem: Partial<OutlookItem> | u
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoRecipient(recipient: Partial<Recipient> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -594,7 +594,7 @@ export function deserializeIntoRecipient(recipient: Partial<Recipient> | undefin
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoSingleValueLegacyExtendedProperty(singleValueLegacyExtendedProperty: Partial<SingleValueLegacyExtendedProperty> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -604,7 +604,7 @@ export function deserializeIntoSingleValueLegacyExtendedProperty(singleValueLega
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoSizeRange(sizeRange: Partial<SizeRange> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/oDataErrors/index.ts b/packages/test/generatedCode/models/oDataErrors/index.ts
index d564cd796..2f883cef4 100644
--- a/packages/test/generatedCode/models/oDataErrors/index.ts
+++ b/packages/test/generatedCode/models/oDataErrors/index.ts
@@ -6,7 +6,7 @@ import { type AdditionalDataHolder, type ApiError, type Parsable, type ParseNode
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a ErrorDetails
+ * @returns {ErrorDetails}
  */
 export function createErrorDetailsFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoErrorDetails;
@@ -14,7 +14,7 @@ export function createErrorDetailsFromDiscriminatorValue(parseNode: ParseNode |
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a InnerError
+ * @returns {InnerError}
  */
 export function createInnerErrorFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoInnerError;
@@ -22,7 +22,7 @@ export function createInnerErrorFromDiscriminatorValue(parseNode: ParseNode | un
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a MainError
+ * @returns {MainError}
  */
 export function createMainErrorFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoMainError;
@@ -30,14 +30,14 @@ export function createMainErrorFromDiscriminatorValue(parseNode: ParseNode | und
 /**
  * Creates a new instance of the appropriate class based on discriminator value
  * @param parseNode The parse node to use to read the discriminator value and create the object
- * @returns a ODataError
+ * @returns {ODataError}
  */
 export function createODataErrorFromDiscriminatorValue(parseNode: ParseNode | undefined) : ((instance?: Parsable) => Record<string, (node: ParseNode) => void>) {
     return deserializeIntoODataError;
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoErrorDetails(errorDetails: Partial<ErrorDetails> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -48,7 +48,7 @@ export function deserializeIntoErrorDetails(errorDetails: Partial<ErrorDetails>
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoInnerError(innerError: Partial<InnerError> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -56,7 +56,7 @@ export function deserializeIntoInnerError(innerError: Partial<InnerError> | unde
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoMainError(mainError: Partial<MainError> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
@@ -69,7 +69,7 @@ export function deserializeIntoMainError(mainError: Partial<MainError> | undefin
 }
 /**
  * The deserialization information for the current model
- * @returns a Record<string, (node: ParseNode) => void>
+ * @returns {Record<string, (node: ParseNode) => void>}
  */
 export function deserializeIntoODataError(oDataError: Partial<ODataError> | undefined = {}) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/users/index.ts b/packages/test/generatedCode/users/index.ts
index aa3073b09..07ecaa69a 100644
--- a/packages/test/generatedCode/users/index.ts
+++ b/packages/test/generatedCode/users/index.ts
@@ -1,7 +1,7 @@
 /* tslint:disable */
 /* eslint-disable */
 // Generated by Microsoft Kiota
-import { type UserItemRequestBuilder, UserItemRequestBuilderNavigationMetadata, UserItemRequestBuilderUriTemplate } from './item/';
+import { type UserItemRequestBuilder, UserItemRequestBuilderNavigationMetadata } from './item/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -11,23 +11,22 @@ export interface UsersRequestBuilder extends BaseRequestBuilder<UsersRequestBuil
     /**
      * Gets an item from the ApiSdk.users.item collection
      * @param userId The unique identifier of user
-     * @returns a UserItemRequestBuilder
+     * @returns {UserItemRequestBuilder}
      */
      byUserId(userId: string) : UserItemRequestBuilder;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const UsersRequestBuilderUriTemplate = "{+baseurl}/users";
 /**
  * Metadata for all the navigation properties in the request builder.
  */
 export const UsersRequestBuilderNavigationMetadata: Record<Exclude<keyof UsersRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     byUserId: {
-        uriTemplate: UserItemRequestBuilderUriTemplate,
         navigationMetadata: UserItemRequestBuilderNavigationMetadata,
         pathParametersMappings: ["user%2Did"],
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const UsersRequestBuilderUriTemplate = "{+baseurl}/users";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/index.ts b/packages/test/generatedCode/users/item/index.ts
index e088ce609..646c97115 100644
--- a/packages/test/generatedCode/users/item/index.ts
+++ b/packages/test/generatedCode/users/item/index.ts
@@ -1,9 +1,9 @@
 /* tslint:disable */
 /* eslint-disable */
 // Generated by Microsoft Kiota
-import { InferenceClassificationRequestBuilderNavigationMetadata, InferenceClassificationRequestBuilderRequestsMetadata, InferenceClassificationRequestBuilderUriTemplate, type InferenceClassificationRequestBuilder } from './inferenceClassification/';
-import { MailFoldersRequestBuilderNavigationMetadata, MailFoldersRequestBuilderRequestsMetadata, MailFoldersRequestBuilderUriTemplate, type MailFoldersRequestBuilder } from './mailFolders/';
-import { MessagesRequestBuilderNavigationMetadata, MessagesRequestBuilderRequestsMetadata, MessagesRequestBuilderUriTemplate, type MessagesRequestBuilder } from './messages/';
+import { InferenceClassificationRequestBuilderNavigationMetadata, InferenceClassificationRequestBuilderRequestsMetadata, type InferenceClassificationRequestBuilder } from './inferenceClassification/';
+import { MailFoldersRequestBuilderNavigationMetadata, MailFoldersRequestBuilderRequestsMetadata, type MailFoldersRequestBuilder } from './mailFolders/';
+import { MessagesRequestBuilderNavigationMetadata, MessagesRequestBuilderRequestsMetadata, type MessagesRequestBuilder } from './messages/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -23,29 +23,26 @@ export interface UserItemRequestBuilder extends BaseRequestBuilder<UserItemReque
      */
     get messages(): MessagesRequestBuilder;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const UserItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}";
 /**
  * Metadata for all the navigation properties in the request builder.
  */
 export const UserItemRequestBuilderNavigationMetadata: Record<Exclude<keyof UserItemRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     inferenceClassification: {
-        uriTemplate: InferenceClassificationRequestBuilderUriTemplate,
         requestsMetadata: InferenceClassificationRequestBuilderRequestsMetadata,
         navigationMetadata: InferenceClassificationRequestBuilderNavigationMetadata,
     },
     mailFolders: {
-        uriTemplate: MailFoldersRequestBuilderUriTemplate,
         requestsMetadata: MailFoldersRequestBuilderRequestsMetadata,
         navigationMetadata: MailFoldersRequestBuilderNavigationMetadata,
     },
     messages: {
-        uriTemplate: MessagesRequestBuilderUriTemplate,
         requestsMetadata: MessagesRequestBuilderRequestsMetadata,
         navigationMetadata: MessagesRequestBuilderNavigationMetadata,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const UserItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/index.ts b/packages/test/generatedCode/users/item/inferenceClassification/index.ts
index 059afd424..8ae715406 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/index.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/index.ts
@@ -3,7 +3,7 @@
 // Generated by Microsoft Kiota
 import { createInferenceClassificationFromDiscriminatorValue, serializeInferenceClassification, type InferenceClassification } from '../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../models/oDataErrors/';
-import { OverridesRequestBuilderNavigationMetadata, OverridesRequestBuilderRequestsMetadata, OverridesRequestBuilderUriTemplate, type OverridesRequestBuilder } from './overrides/';
+import { OverridesRequestBuilderNavigationMetadata, OverridesRequestBuilderRequestsMetadata, type OverridesRequestBuilder } from './overrides/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -17,27 +17,29 @@ export interface InferenceClassificationRequestBuilder extends BaseRequestBuilde
     /**
      * Relevance classification of the user's messages based on explicit designations that override inferred relevance or importance.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of InferenceClassification
+     * @returns {Promise<InferenceClassification>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<InferenceClassificationRequestBuilderGetQueryParameters> | undefined) : Promise<InferenceClassification | undefined>;
     /**
      * Update the navigation property inferenceClassification in users
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of InferenceClassification
+     * @returns {Promise<InferenceClassification>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      patch(body: InferenceClassification, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<InferenceClassification | undefined>;
     /**
      * Relevance classification of the user's messages based on explicit designations that override inferred relevance or importance.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<InferenceClassificationRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Update the navigation property inferenceClassification in users
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPatchRequestInformation(body: InferenceClassification, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -50,6 +52,10 @@ export interface InferenceClassificationRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const InferenceClassificationRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/inferenceClassification{?%24select}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -61,7 +67,6 @@ const InferenceClassificationRequestBuilderGetQueryParametersMapper: Record<stri
  */
 export const InferenceClassificationRequestBuilderNavigationMetadata: Record<Exclude<keyof InferenceClassificationRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     overrides: {
-        uriTemplate: OverridesRequestBuilderUriTemplate,
         requestsMetadata: OverridesRequestBuilderRequestsMetadata,
         navigationMetadata: OverridesRequestBuilderNavigationMetadata,
     },
@@ -71,20 +76,20 @@ export const InferenceClassificationRequestBuilderNavigationMetadata: Record<Exc
  */
 export const InferenceClassificationRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: InferenceClassificationRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createInferenceClassificationFromDiscriminatorValue,
         queryParametersMapper: InferenceClassificationRequestBuilderGetQueryParametersMapper,
     },
     patch: {
+        uriTemplate: InferenceClassificationRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createInferenceClassificationFromDiscriminatorValue,
@@ -93,9 +98,5 @@ export const InferenceClassificationRequestBuilderRequestsMetadata: RequestsMeta
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const InferenceClassificationRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/inferenceClassification{?%24select}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/index.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/index.ts
index 26b3008af..0667f182e 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/index.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/index.ts
@@ -11,13 +11,14 @@ export interface CountRequestBuilder extends BaseRequestBuilder<CountRequestBuil
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Integer
+     * @returns {Promise<number>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : Promise<number | undefined>;
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -30,6 +31,10 @@ export interface CountRequestBuilderGetQueryParameters {
      */
     filter?: string;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/inferenceClassification/overrides/$count{?%24filter}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -41,19 +46,15 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: CountRequestBuilderUriTemplate,
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "number",
         queryParametersMapper: CountRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/inferenceClassification/overrides/$count{?%24filter}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/index.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/index.ts
index 707e2f1c7..cc1fddacd 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/index.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/index.ts
@@ -3,8 +3,8 @@
 // Generated by Microsoft Kiota
 import { createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue, createInferenceClassificationOverrideFromDiscriminatorValue, serializeInferenceClassificationOverride, type InferenceClassificationOverride, type InferenceClassificationOverrideCollectionResponse } from '../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../models/oDataErrors/';
-import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
-import { InferenceClassificationOverrideItemRequestBuilderRequestsMetadata, InferenceClassificationOverrideItemRequestBuilderUriTemplate, type InferenceClassificationOverrideItemRequestBuilder } from './item/';
+import { CountRequestBuilderRequestsMetadata, type CountRequestBuilder } from './count/';
+import { InferenceClassificationOverrideItemRequestBuilderRequestsMetadata, type InferenceClassificationOverrideItemRequestBuilder } from './item/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -18,13 +18,14 @@ export interface OverridesRequestBuilder extends BaseRequestBuilder<OverridesReq
     /**
      * Gets an item from the ApiSdk.users.item.inferenceClassification.overrides.item collection
      * @param inferenceClassificationOverrideId The unique identifier of inferenceClassificationOverride
-     * @returns a InferenceClassificationOverrideItemRequestBuilder
+     * @returns {InferenceClassificationOverrideItemRequestBuilder}
      */
      byInferenceClassificationOverrideId(inferenceClassificationOverrideId: string) : InferenceClassificationOverrideItemRequestBuilder;
     /**
      * Get the overrides that a user has set up to always classify messages from certain senders in specific ways. Each override corresponds to an SMTP address of a sender. Initially, a user does not have any overrides.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of InferenceClassificationOverrideCollectionResponse
+     * @returns {Promise<InferenceClassificationOverrideCollectionResponse>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/inferenceclassification-list-overrides?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<OverridesRequestBuilderGetQueryParameters> | undefined) : Promise<InferenceClassificationOverrideCollectionResponse | undefined>;
@@ -32,21 +33,22 @@ export interface OverridesRequestBuilder extends BaseRequestBuilder<OverridesReq
      * Create an override for a sender identified by an SMTP address. Future messages from that SMTP address will be consistently classifiedas specified in the override. Note
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of InferenceClassificationOverride
+     * @returns {Promise<InferenceClassificationOverride>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/inferenceclassification-post-overrides?view=graph-rest-1.0|Find more info here}
      */
      post(body: InferenceClassificationOverride, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<InferenceClassificationOverride | undefined>;
     /**
      * Get the overrides that a user has set up to always classify messages from certain senders in specific ways. Each override corresponds to an SMTP address of a sender. Initially, a user does not have any overrides.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<OverridesRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Create an override for a sender identified by an SMTP address. Future messages from that SMTP address will be consistently classifiedas specified in the override. Note
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPostRequestInformation(body: InferenceClassificationOverride, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -79,6 +81,10 @@ export interface OverridesRequestBuilderGetQueryParameters {
      */
     top?: number;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const OverridesRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/inferenceClassification/overrides{?%24count,%24filter,%24orderby,%24select,%24skip,%24top}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -95,12 +101,10 @@ const OverridesRequestBuilderGetQueryParametersMapper: Record<string, string> =
  */
 export const OverridesRequestBuilderNavigationMetadata: Record<Exclude<keyof OverridesRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     byInferenceClassificationOverrideId: {
-        uriTemplate: InferenceClassificationOverrideItemRequestBuilderUriTemplate,
         requestsMetadata: InferenceClassificationOverrideItemRequestBuilderRequestsMetadata,
         pathParametersMappings: ["inferenceClassificationOverride%2Did"],
     },
     count: {
-        uriTemplate: CountRequestBuilderUriTemplate,
         requestsMetadata: CountRequestBuilderRequestsMetadata,
     },
 };
@@ -109,20 +113,20 @@ export const OverridesRequestBuilderNavigationMetadata: Record<Exclude<keyof Ove
  */
 export const OverridesRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: OverridesRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: OverridesRequestBuilderGetQueryParametersMapper,
     },
     post: {
+        uriTemplate: OverridesRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createInferenceClassificationOverrideFromDiscriminatorValue,
@@ -131,9 +135,5 @@ export const OverridesRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const OverridesRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/inferenceClassification/overrides{?%24count,%24filter,%24orderby,%24select,%24skip,%24top}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/index.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/index.ts
index b9943cbe1..99ce8b36c 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/index.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/index.ts
@@ -12,41 +12,44 @@ export interface InferenceClassificationOverrideItemRequestBuilder extends BaseR
     /**
      * Delete an override specified by its ID.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/inferenceclassificationoverride-delete?view=graph-rest-1.0|Find more info here}
      */
      delete(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * A set of overrides for a user to always classify messages from specific senders in certain ways: focused, or other. Read-only. Nullable.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of InferenceClassificationOverride
+     * @returns {Promise<InferenceClassificationOverride>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<InferenceClassificationOverrideItemRequestBuilderGetQueryParameters> | undefined) : Promise<InferenceClassificationOverride | undefined>;
     /**
      * Change the classifyAs field of an override as specified. You cannot use PATCH to change any other fields in an inferenceClassificationOverride instance. If an override exists for a sender and the sender changes his/her display name, you can use POST to force an update to the name field in the existing override. If an override exists for a sender and the sender changes his/her SMTP address, deleting the existing override and creating a new one withthe new SMTP address is the only way to 'update' the override for this sender.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of InferenceClassificationOverride
+     * @returns {Promise<InferenceClassificationOverride>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/inferenceclassificationoverride-update?view=graph-rest-1.0|Find more info here}
      */
      patch(body: InferenceClassificationOverride, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<InferenceClassificationOverride | undefined>;
     /**
      * Delete an override specified by its ID.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toDeleteRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * A set of overrides for a user to always classify messages from specific senders in certain ways: focused, or other. Read-only. Nullable.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<InferenceClassificationOverrideItemRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Change the classifyAs field of an override as specified. You cannot use PATCH to change any other fields in an inferenceClassificationOverride instance. If an override exists for a sender and the sender changes his/her display name, you can use POST to force an update to the name field in the existing override. If an override exists for a sender and the sender changes his/her SMTP address, deleting the existing override and creating a new one withthe new SMTP address is the only way to 'update' the override for this sender.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPatchRequestInformation(body: InferenceClassificationOverride, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -59,6 +62,10 @@ export interface InferenceClassificationOverrideItemRequestBuilderGetQueryParame
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const InferenceClassificationOverrideItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/inferenceClassification/overrides/{inferenceClassificationOverride%2Did}{?%24select}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -70,29 +77,29 @@ const InferenceClassificationOverrideItemRequestBuilderGetQueryParametersMapper:
  */
 export const InferenceClassificationOverrideItemRequestBuilderRequestsMetadata: RequestsMetadata = {
     delete: {
+        uriTemplate: InferenceClassificationOverrideItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     get: {
+        uriTemplate: InferenceClassificationOverrideItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createInferenceClassificationOverrideFromDiscriminatorValue,
         queryParametersMapper: InferenceClassificationOverrideItemRequestBuilderGetQueryParametersMapper,
     },
     patch: {
+        uriTemplate: InferenceClassificationOverrideItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createInferenceClassificationOverrideFromDiscriminatorValue,
@@ -101,9 +108,5 @@ export const InferenceClassificationOverrideItemRequestBuilderRequestsMetadata:
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const InferenceClassificationOverrideItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/inferenceClassification/overrides/{inferenceClassificationOverride%2Did}{?%24select}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/count/index.ts
index 1c91fc355..f63b9f22c 100644
--- a/packages/test/generatedCode/users/item/mailFolders/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/count/index.ts
@@ -11,13 +11,14 @@ export interface CountRequestBuilder extends BaseRequestBuilder<CountRequestBuil
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Integer
+     * @returns {Promise<number>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : Promise<number | undefined>;
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -30,6 +31,10 @@ export interface CountRequestBuilderGetQueryParameters {
      */
     filter?: string;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/$count{?%24filter}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -41,19 +46,15 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: CountRequestBuilderUriTemplate,
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "number",
         queryParametersMapper: CountRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/$count{?%24filter}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/index.ts b/packages/test/generatedCode/users/item/mailFolders/index.ts
index 7d4709629..c549bcc2d 100644
--- a/packages/test/generatedCode/users/item/mailFolders/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/index.ts
@@ -3,8 +3,8 @@
 // Generated by Microsoft Kiota
 import { createMailFolderCollectionResponseFromDiscriminatorValue, createMailFolderFromDiscriminatorValue, serializeMailFolder, type MailFolder, type MailFolderCollectionResponse } from '../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../models/oDataErrors/';
-import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
-import { MailFolderItemRequestBuilderNavigationMetadata, MailFolderItemRequestBuilderRequestsMetadata, MailFolderItemRequestBuilderUriTemplate, type MailFolderItemRequestBuilder } from './item/';
+import { CountRequestBuilderRequestsMetadata, type CountRequestBuilder } from './count/';
+import { MailFolderItemRequestBuilderNavigationMetadata, MailFolderItemRequestBuilderRequestsMetadata, type MailFolderItemRequestBuilder } from './item/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -18,13 +18,14 @@ export interface MailFoldersRequestBuilder extends BaseRequestBuilder<MailFolder
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item collection
      * @param mailFolderId The unique identifier of mailFolder
-     * @returns a MailFolderItemRequestBuilder
+     * @returns {MailFolderItemRequestBuilder}
      */
      byMailFolderId(mailFolderId: string) : MailFolderItemRequestBuilder;
     /**
      * The user's mail folders. Read-only. Nullable.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MailFolderCollectionResponse
+     * @returns {Promise<MailFolderCollectionResponse>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/user-list-mailfolders?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<MailFoldersRequestBuilderGetQueryParameters> | undefined) : Promise<MailFolderCollectionResponse | undefined>;
@@ -32,21 +33,22 @@ export interface MailFoldersRequestBuilder extends BaseRequestBuilder<MailFolder
      * Use this API to create a new mail folder in the root folder of the user's mailbox. If you intend a new folder to be hidden, you must set the isHidden property to true on creation.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MailFolder
+     * @returns {Promise<MailFolder>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/user-post-mailfolders?view=graph-rest-1.0|Find more info here}
      */
      post(body: MailFolder, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<MailFolder | undefined>;
     /**
      * The user's mail folders. Read-only. Nullable.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<MailFoldersRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Use this API to create a new mail folder in the root folder of the user's mailbox. If you intend a new folder to be hidden, you must set the isHidden property to true on creation.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPostRequestInformation(body: MailFolder, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -87,6 +89,10 @@ export interface MailFoldersRequestBuilderGetQueryParameters {
      */
     top?: number;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const MailFoldersRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders{?%24count,%24expand,%24filter,%24orderby,%24select,%24skip,%24top,includeHiddenFolders}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -104,13 +110,11 @@ const MailFoldersRequestBuilderGetQueryParametersMapper: Record<string, string>
  */
 export const MailFoldersRequestBuilderNavigationMetadata: Record<Exclude<keyof MailFoldersRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     byMailFolderId: {
-        uriTemplate: MailFolderItemRequestBuilderUriTemplate,
         requestsMetadata: MailFolderItemRequestBuilderRequestsMetadata,
         navigationMetadata: MailFolderItemRequestBuilderNavigationMetadata,
         pathParametersMappings: ["mailFolder%2Did"],
     },
     count: {
-        uriTemplate: CountRequestBuilderUriTemplate,
         requestsMetadata: CountRequestBuilderRequestsMetadata,
     },
 };
@@ -119,20 +123,20 @@ export const MailFoldersRequestBuilderNavigationMetadata: Record<Exclude<keyof M
  */
 export const MailFoldersRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: MailFoldersRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMailFolderCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: MailFoldersRequestBuilderGetQueryParametersMapper,
     },
     post: {
+        uriTemplate: MailFoldersRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMailFolderFromDiscriminatorValue,
@@ -141,9 +145,5 @@ export const MailFoldersRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const MailFoldersRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders{?%24count,%24expand,%24filter,%24orderby,%24select,%24skip,%24top,includeHiddenFolders}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/index.ts
index e4371f3c9..863b11823 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/index.ts
@@ -11,13 +11,14 @@ export interface CountRequestBuilder extends BaseRequestBuilder<CountRequestBuil
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Integer
+     * @returns {Promise<number>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : Promise<number | undefined>;
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -30,6 +31,10 @@ export interface CountRequestBuilderGetQueryParameters {
      */
     filter?: string;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/$count{?%24filter}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -41,19 +46,15 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: CountRequestBuilderUriTemplate,
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "number",
         queryParametersMapper: CountRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/$count{?%24filter}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/index.ts
index 9a46edd67..474c1777f 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/index.ts
@@ -3,8 +3,8 @@
 // Generated by Microsoft Kiota
 import { createMailFolderCollectionResponseFromDiscriminatorValue, createMailFolderFromDiscriminatorValue, serializeMailFolder, type MailFolder, type MailFolderCollectionResponse } from '../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../models/oDataErrors/';
-import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
-import { MailFolderItemRequestBuilderNavigationMetadata, MailFolderItemRequestBuilderRequestsMetadata, MailFolderItemRequestBuilderUriTemplate, type MailFolderItemRequestBuilder } from './item/';
+import { CountRequestBuilderRequestsMetadata, type CountRequestBuilder } from './count/';
+import { MailFolderItemRequestBuilderNavigationMetadata, MailFolderItemRequestBuilderRequestsMetadata, type MailFolderItemRequestBuilder } from './item/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -18,13 +18,14 @@ export interface ChildFoldersRequestBuilder extends BaseRequestBuilder<ChildFold
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.childFolders.item collection
      * @param mailFolderId1 The unique identifier of mailFolder
-     * @returns a MailFolderItemRequestBuilder
+     * @returns {MailFolderItemRequestBuilder}
      */
      byMailFolderId1(mailFolderId1: string) : MailFolderItemRequestBuilder;
     /**
      * The collection of child folders in the mailFolder.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MailFolderCollectionResponse
+     * @returns {Promise<MailFolderCollectionResponse>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/mailfolder-list-childfolders?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<ChildFoldersRequestBuilderGetQueryParameters> | undefined) : Promise<MailFolderCollectionResponse | undefined>;
@@ -32,21 +33,22 @@ export interface ChildFoldersRequestBuilder extends BaseRequestBuilder<ChildFold
      * Create a new mailSearchFolder in the specified user's mailbox.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MailFolder
+     * @returns {Promise<MailFolder>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/mailsearchfolder-post?view=graph-rest-1.0|Find more info here}
      */
      post(body: MailFolder, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<MailFolder | undefined>;
     /**
      * The collection of child folders in the mailFolder.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<ChildFoldersRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Create a new mailSearchFolder in the specified user's mailbox.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPostRequestInformation(body: MailFolder, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -87,6 +89,10 @@ export interface ChildFoldersRequestBuilderGetQueryParameters {
      */
     top?: number;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const ChildFoldersRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders{?%24count,%24expand,%24filter,%24orderby,%24select,%24skip,%24top,includeHiddenFolders}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -104,13 +110,11 @@ const ChildFoldersRequestBuilderGetQueryParametersMapper: Record<string, string>
  */
 export const ChildFoldersRequestBuilderNavigationMetadata: Record<Exclude<keyof ChildFoldersRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     byMailFolderId1: {
-        uriTemplate: MailFolderItemRequestBuilderUriTemplate,
         requestsMetadata: MailFolderItemRequestBuilderRequestsMetadata,
         navigationMetadata: MailFolderItemRequestBuilderNavigationMetadata,
         pathParametersMappings: ["mailFolder%2Did1"],
     },
     count: {
-        uriTemplate: CountRequestBuilderUriTemplate,
         requestsMetadata: CountRequestBuilderRequestsMetadata,
     },
 };
@@ -119,20 +123,20 @@ export const ChildFoldersRequestBuilderNavigationMetadata: Record<Exclude<keyof
  */
 export const ChildFoldersRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: ChildFoldersRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMailFolderCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: ChildFoldersRequestBuilderGetQueryParametersMapper,
     },
     post: {
+        uriTemplate: ChildFoldersRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMailFolderFromDiscriminatorValue,
@@ -141,9 +145,5 @@ export const ChildFoldersRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const ChildFoldersRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders{?%24count,%24expand,%24filter,%24orderby,%24select,%24skip,%24top,includeHiddenFolders}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/index.ts
index 1ecfd6d38..c11bba032 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/index.ts
@@ -3,8 +3,8 @@
 // Generated by Microsoft Kiota
 import { createMailFolderFromDiscriminatorValue, serializeMailFolder, type MailFolder } from '../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../models/oDataErrors/';
-import { MessageRulesRequestBuilderNavigationMetadata, MessageRulesRequestBuilderRequestsMetadata, MessageRulesRequestBuilderUriTemplate, type MessageRulesRequestBuilder } from './messageRules/';
-import { MessagesRequestBuilderNavigationMetadata, MessagesRequestBuilderRequestsMetadata, MessagesRequestBuilderUriTemplate, type MessagesRequestBuilder } from './messages/';
+import { MessageRulesRequestBuilderNavigationMetadata, MessageRulesRequestBuilderRequestsMetadata, type MessageRulesRequestBuilder } from './messageRules/';
+import { MessagesRequestBuilderNavigationMetadata, MessagesRequestBuilderRequestsMetadata, type MessagesRequestBuilder } from './messages/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -22,39 +22,42 @@ export interface MailFolderItemRequestBuilder extends BaseRequestBuilder<MailFol
     /**
      * Delete navigation property childFolders for users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      delete(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * The collection of child folders in the mailFolder.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MailFolder
+     * @returns {Promise<MailFolder>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<MailFolderItemRequestBuilderGetQueryParameters> | undefined) : Promise<MailFolder | undefined>;
     /**
      * Update the navigation property childFolders in users
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MailFolder
+     * @returns {Promise<MailFolder>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      patch(body: MailFolder, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<MailFolder | undefined>;
     /**
      * Delete navigation property childFolders for users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toDeleteRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * The collection of child folders in the mailFolder.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<MailFolderItemRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Update the navigation property childFolders in users
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPatchRequestInformation(body: MailFolder, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -75,6 +78,10 @@ export interface MailFolderItemRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const MailFolderItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}{?%24expand,%24select,includeHiddenFolders}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -87,12 +94,10 @@ const MailFolderItemRequestBuilderGetQueryParametersMapper: Record<string, strin
  */
 export const MailFolderItemRequestBuilderNavigationMetadata: Record<Exclude<keyof MailFolderItemRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     messageRules: {
-        uriTemplate: MessageRulesRequestBuilderUriTemplate,
         requestsMetadata: MessageRulesRequestBuilderRequestsMetadata,
         navigationMetadata: MessageRulesRequestBuilderNavigationMetadata,
     },
     messages: {
-        uriTemplate: MessagesRequestBuilderUriTemplate,
         requestsMetadata: MessagesRequestBuilderRequestsMetadata,
         navigationMetadata: MessagesRequestBuilderNavigationMetadata,
     },
@@ -102,29 +107,29 @@ export const MailFolderItemRequestBuilderNavigationMetadata: Record<Exclude<keyo
  */
 export const MailFolderItemRequestBuilderRequestsMetadata: RequestsMetadata = {
     delete: {
+        uriTemplate: MailFolderItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     get: {
+        uriTemplate: MailFolderItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMailFolderFromDiscriminatorValue,
         queryParametersMapper: MailFolderItemRequestBuilderGetQueryParametersMapper,
     },
     patch: {
+        uriTemplate: MailFolderItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMailFolderFromDiscriminatorValue,
@@ -133,9 +138,5 @@ export const MailFolderItemRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const MailFolderItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}{?%24expand,%24select,includeHiddenFolders}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/index.ts
index fb4065a6d..9bb0f4914 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/index.ts
@@ -11,13 +11,14 @@ export interface CountRequestBuilder extends BaseRequestBuilder<CountRequestBuil
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Integer
+     * @returns {Promise<number>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : Promise<number | undefined>;
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -30,6 +31,10 @@ export interface CountRequestBuilderGetQueryParameters {
      */
     filter?: string;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messageRules/$count{?%24filter}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -41,19 +46,15 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: CountRequestBuilderUriTemplate,
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "number",
         queryParametersMapper: CountRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messageRules/$count{?%24filter}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/index.ts
index bcc948224..34f477b07 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/index.ts
@@ -3,8 +3,8 @@
 // Generated by Microsoft Kiota
 import { createMessageRuleCollectionResponseFromDiscriminatorValue, createMessageRuleFromDiscriminatorValue, serializeMessageRule, type MessageRule, type MessageRuleCollectionResponse } from '../../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../models/oDataErrors/';
-import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
-import { MessageRuleItemRequestBuilderRequestsMetadata, MessageRuleItemRequestBuilderUriTemplate, type MessageRuleItemRequestBuilder } from './item/';
+import { CountRequestBuilderRequestsMetadata, type CountRequestBuilder } from './count/';
+import { MessageRuleItemRequestBuilderRequestsMetadata, type MessageRuleItemRequestBuilder } from './item/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -18,13 +18,14 @@ export interface MessageRulesRequestBuilder extends BaseRequestBuilder<MessageRu
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.childFolders.item.messageRules.item collection
      * @param messageRuleId The unique identifier of messageRule
-     * @returns a MessageRuleItemRequestBuilder
+     * @returns {MessageRuleItemRequestBuilder}
      */
      byMessageRuleId(messageRuleId: string) : MessageRuleItemRequestBuilder;
     /**
      * Get all the messageRule objects defined for the user's inbox.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MessageRuleCollectionResponse
+     * @returns {Promise<MessageRuleCollectionResponse>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/mailfolder-list-messagerules?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<MessageRulesRequestBuilderGetQueryParameters> | undefined) : Promise<MessageRuleCollectionResponse | undefined>;
@@ -32,21 +33,22 @@ export interface MessageRulesRequestBuilder extends BaseRequestBuilder<MessageRu
      * Create a messageRule object by specifying a set of conditions and actions. Outlook carries out those actions if an incoming message in the user's Inbox meets the specified conditions.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MessageRule
+     * @returns {Promise<MessageRule>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/mailfolder-post-messagerules?view=graph-rest-1.0|Find more info here}
      */
      post(body: MessageRule, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<MessageRule | undefined>;
     /**
      * Get all the messageRule objects defined for the user's inbox.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<MessageRulesRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Create a messageRule object by specifying a set of conditions and actions. Outlook carries out those actions if an incoming message in the user's Inbox meets the specified conditions.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPostRequestInformation(body: MessageRule, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -79,6 +81,10 @@ export interface MessageRulesRequestBuilderGetQueryParameters {
      */
     top?: number;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const MessageRulesRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messageRules{?%24count,%24filter,%24orderby,%24select,%24skip,%24top}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -95,12 +101,10 @@ const MessageRulesRequestBuilderGetQueryParametersMapper: Record<string, string>
  */
 export const MessageRulesRequestBuilderNavigationMetadata: Record<Exclude<keyof MessageRulesRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     byMessageRuleId: {
-        uriTemplate: MessageRuleItemRequestBuilderUriTemplate,
         requestsMetadata: MessageRuleItemRequestBuilderRequestsMetadata,
         pathParametersMappings: ["messageRule%2Did"],
     },
     count: {
-        uriTemplate: CountRequestBuilderUriTemplate,
         requestsMetadata: CountRequestBuilderRequestsMetadata,
     },
 };
@@ -109,20 +113,20 @@ export const MessageRulesRequestBuilderNavigationMetadata: Record<Exclude<keyof
  */
 export const MessageRulesRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: MessageRulesRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageRuleCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: MessageRulesRequestBuilderGetQueryParametersMapper,
     },
     post: {
+        uriTemplate: MessageRulesRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageRuleFromDiscriminatorValue,
@@ -131,9 +135,5 @@ export const MessageRulesRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const MessageRulesRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messageRules{?%24count,%24filter,%24orderby,%24select,%24skip,%24top}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/index.ts
index f3982906f..c56001199 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/index.ts
@@ -12,14 +12,16 @@ export interface MessageRuleItemRequestBuilder extends BaseRequestBuilder<Messag
     /**
      * Delete the specified messageRule object.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/messagerule-delete?view=graph-rest-1.0|Find more info here}
      */
      delete(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * Get the properties and relationships of a messageRule object.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MessageRule
+     * @returns {Promise<MessageRule>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/messagerule-get?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<MessageRuleItemRequestBuilderGetQueryParameters> | undefined) : Promise<MessageRule | undefined>;
@@ -27,27 +29,28 @@ export interface MessageRuleItemRequestBuilder extends BaseRequestBuilder<Messag
      * Change writable properties on a messageRule object and save the changes.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MessageRule
+     * @returns {Promise<MessageRule>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/messagerule-update?view=graph-rest-1.0|Find more info here}
      */
      patch(body: MessageRule, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<MessageRule | undefined>;
     /**
      * Delete the specified messageRule object.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toDeleteRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * Get the properties and relationships of a messageRule object.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<MessageRuleItemRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Change writable properties on a messageRule object and save the changes.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPatchRequestInformation(body: MessageRule, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -60,6 +63,10 @@ export interface MessageRuleItemRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const MessageRuleItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messageRules/{messageRule%2Did}{?%24select}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -71,29 +78,29 @@ const MessageRuleItemRequestBuilderGetQueryParametersMapper: Record<string, stri
  */
 export const MessageRuleItemRequestBuilderRequestsMetadata: RequestsMetadata = {
     delete: {
+        uriTemplate: MessageRuleItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     get: {
+        uriTemplate: MessageRuleItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageRuleFromDiscriminatorValue,
         queryParametersMapper: MessageRuleItemRequestBuilderGetQueryParametersMapper,
     },
     patch: {
+        uriTemplate: MessageRuleItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageRuleFromDiscriminatorValue,
@@ -102,9 +109,5 @@ export const MessageRuleItemRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const MessageRuleItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messageRules/{messageRule%2Did}{?%24select}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/index.ts
index d5d4b5d88..7ee8b9d25 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/index.ts
@@ -11,13 +11,14 @@ export interface CountRequestBuilder extends BaseRequestBuilder<CountRequestBuil
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Integer
+     * @returns {Promise<number>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : Promise<number | undefined>;
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -34,6 +35,10 @@ export interface CountRequestBuilderGetQueryParameters {
      */
     search?: string;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/$count{?%24filter,%24search}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -46,19 +51,15 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: CountRequestBuilderUriTemplate,
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "number",
         queryParametersMapper: CountRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/$count{?%24filter,%24search}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/index.ts
index 3fc0adc93..b08fb438c 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/index.ts
@@ -3,8 +3,8 @@
 // Generated by Microsoft Kiota
 import { createMessageCollectionResponseFromDiscriminatorValue, createMessageFromDiscriminatorValue, serializeMessage, type Message, type MessageCollectionResponse } from '../../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../models/oDataErrors/';
-import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
-import { MessageItemRequestBuilderNavigationMetadata, MessageItemRequestBuilderRequestsMetadata, MessageItemRequestBuilderUriTemplate, type MessageItemRequestBuilder } from './item/';
+import { CountRequestBuilderRequestsMetadata, type CountRequestBuilder } from './count/';
+import { MessageItemRequestBuilderNavigationMetadata, MessageItemRequestBuilderRequestsMetadata, type MessageItemRequestBuilder } from './item/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -18,13 +18,14 @@ export interface MessagesRequestBuilder extends BaseRequestBuilder<MessagesReque
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.childFolders.item.messages.item collection
      * @param messageId The unique identifier of message
-     * @returns a MessageItemRequestBuilder
+     * @returns {MessageItemRequestBuilder}
      */
      byMessageId(messageId: string) : MessageItemRequestBuilder;
     /**
      * Get all the messages in the specified user's mailbox, or those messages in a specified folder in the mailbox.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MessageCollectionResponse
+     * @returns {Promise<MessageCollectionResponse>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/mailfolder-list-messages?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<MessagesRequestBuilderGetQueryParameters> | undefined) : Promise<MessageCollectionResponse | undefined>;
@@ -32,21 +33,22 @@ export interface MessagesRequestBuilder extends BaseRequestBuilder<MessagesReque
      * Use this API to create a new Message in a mailfolder.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Message
+     * @returns {Promise<Message>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/mailfolder-post-messages?view=graph-rest-1.0|Find more info here}
      */
      post(body: Message, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<Message | undefined>;
     /**
      * Get all the messages in the specified user's mailbox, or those messages in a specified folder in the mailbox.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<MessagesRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Use this API to create a new Message in a mailfolder.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPostRequestInformation(body: Message, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -87,6 +89,10 @@ export interface MessagesRequestBuilderGetQueryParameters {
      */
     top?: number;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const MessagesRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages{?%24count,%24expand,%24filter,%24orderby,%24search,%24select,%24skip,%24top}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -105,13 +111,11 @@ const MessagesRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const MessagesRequestBuilderNavigationMetadata: Record<Exclude<keyof MessagesRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     byMessageId: {
-        uriTemplate: MessageItemRequestBuilderUriTemplate,
         requestsMetadata: MessageItemRequestBuilderRequestsMetadata,
         navigationMetadata: MessageItemRequestBuilderNavigationMetadata,
         pathParametersMappings: ["message%2Did"],
     },
     count: {
-        uriTemplate: CountRequestBuilderUriTemplate,
         requestsMetadata: CountRequestBuilderRequestsMetadata,
     },
 };
@@ -120,20 +124,20 @@ export const MessagesRequestBuilderNavigationMetadata: Record<Exclude<keyof Mess
  */
 export const MessagesRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: MessagesRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: MessagesRequestBuilderGetQueryParametersMapper,
     },
     post: {
+        uriTemplate: MessagesRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageFromDiscriminatorValue,
@@ -142,9 +146,5 @@ export const MessagesRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const MessagesRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages{?%24count,%24expand,%24filter,%24orderby,%24search,%24select,%24skip,%24top}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/index.ts
index bbbd260af..46c4beabe 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/index.ts
@@ -11,13 +11,14 @@ export interface CountRequestBuilder extends BaseRequestBuilder<CountRequestBuil
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Integer
+     * @returns {Promise<number>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : Promise<number | undefined>;
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -30,6 +31,10 @@ export interface CountRequestBuilderGetQueryParameters {
      */
     filter?: string;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}/attachments/$count{?%24filter}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -41,19 +46,15 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: CountRequestBuilderUriTemplate,
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "number",
         queryParametersMapper: CountRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}/attachments/$count{?%24filter}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/index.ts
index eca23b5e1..fc527f63b 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/index.ts
@@ -3,8 +3,8 @@
 // Generated by Microsoft Kiota
 import { createAttachmentCollectionResponseFromDiscriminatorValue, createAttachmentFromDiscriminatorValue, serializeAttachment, type Attachment, type AttachmentCollectionResponse } from '../../../../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../../models/oDataErrors/';
-import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
-import { AttachmentItemRequestBuilderRequestsMetadata, AttachmentItemRequestBuilderUriTemplate, type AttachmentItemRequestBuilder } from './item/';
+import { CountRequestBuilderRequestsMetadata, type CountRequestBuilder } from './count/';
+import { AttachmentItemRequestBuilderRequestsMetadata, type AttachmentItemRequestBuilder } from './item/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -18,13 +18,14 @@ export interface AttachmentsRequestBuilder extends BaseRequestBuilder<Attachment
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.childFolders.item.messages.item.attachments.item collection
      * @param attachmentId The unique identifier of attachment
-     * @returns a AttachmentItemRequestBuilder
+     * @returns {AttachmentItemRequestBuilder}
      */
      byAttachmentId(attachmentId: string) : AttachmentItemRequestBuilder;
     /**
      * Retrieve a list of attachment objects attached to a message.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of AttachmentCollectionResponse
+     * @returns {Promise<AttachmentCollectionResponse>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/message-list-attachments?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<AttachmentsRequestBuilderGetQueryParameters> | undefined) : Promise<AttachmentCollectionResponse | undefined>;
@@ -32,21 +33,22 @@ export interface AttachmentsRequestBuilder extends BaseRequestBuilder<Attachment
      * Use this API to create a new Attachment. An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Attachment
+     * @returns {Promise<Attachment>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/eventmessage-post-attachments?view=graph-rest-1.0|Find more info here}
      */
      post(body: Attachment, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<Attachment | undefined>;
     /**
      * Retrieve a list of attachment objects attached to a message.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<AttachmentsRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Use this API to create a new Attachment. An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPostRequestInformation(body: Attachment, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -75,6 +77,10 @@ export interface AttachmentsRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const AttachmentsRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}/attachments{?%24count,%24expand,%24filter,%24orderby,%24select}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -90,12 +96,10 @@ const AttachmentsRequestBuilderGetQueryParametersMapper: Record<string, string>
  */
 export const AttachmentsRequestBuilderNavigationMetadata: Record<Exclude<keyof AttachmentsRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     byAttachmentId: {
-        uriTemplate: AttachmentItemRequestBuilderUriTemplate,
         requestsMetadata: AttachmentItemRequestBuilderRequestsMetadata,
         pathParametersMappings: ["attachment%2Did"],
     },
     count: {
-        uriTemplate: CountRequestBuilderUriTemplate,
         requestsMetadata: CountRequestBuilderRequestsMetadata,
     },
 };
@@ -104,20 +108,20 @@ export const AttachmentsRequestBuilderNavigationMetadata: Record<Exclude<keyof A
  */
 export const AttachmentsRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: AttachmentsRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createAttachmentCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: AttachmentsRequestBuilderGetQueryParametersMapper,
     },
     post: {
+        uriTemplate: AttachmentsRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createAttachmentFromDiscriminatorValue,
@@ -126,9 +130,5 @@ export const AttachmentsRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const AttachmentsRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}/attachments{?%24count,%24expand,%24filter,%24orderby,%24select}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/index.ts
index edebb7df4..e16ad661b 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/index.ts
@@ -12,26 +12,28 @@ export interface AttachmentItemRequestBuilder extends BaseRequestBuilder<Attachm
     /**
      * Delete navigation property attachments for users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      delete(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * Read the properties, relationships, or raw contents of an attachment that is attached to a user event, message, or group post. An attachment can be one of the following types: All these types of attachments are derived from the attachment resource.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Attachment
+     * @returns {Promise<Attachment>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/attachment-get?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<AttachmentItemRequestBuilderGetQueryParameters> | undefined) : Promise<Attachment | undefined>;
     /**
      * Delete navigation property attachments for users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toDeleteRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * Read the properties, relationships, or raw contents of an attachment that is attached to a user event, message, or group post. An attachment can be one of the following types: All these types of attachments are derived from the attachment resource.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<AttachmentItemRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -48,6 +50,10 @@ export interface AttachmentItemRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const AttachmentItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}/attachments/{attachment%2Did}{?%24expand,%24select}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -60,28 +66,24 @@ const AttachmentItemRequestBuilderGetQueryParametersMapper: Record<string, strin
  */
 export const AttachmentItemRequestBuilderRequestsMetadata: RequestsMetadata = {
     delete: {
+        uriTemplate: AttachmentItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     get: {
+        uriTemplate: AttachmentItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createAttachmentFromDiscriminatorValue,
         queryParametersMapper: AttachmentItemRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const AttachmentItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}/attachments/{attachment%2Did}{?%24expand,%24select}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/index.ts
index bd25162ec..407ad058d 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/index.ts
@@ -11,13 +11,14 @@ export interface CountRequestBuilder extends BaseRequestBuilder<CountRequestBuil
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Integer
+     * @returns {Promise<number>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : Promise<number | undefined>;
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -30,6 +31,10 @@ export interface CountRequestBuilderGetQueryParameters {
      */
     filter?: string;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}/extensions/$count{?%24filter}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -41,19 +46,15 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: CountRequestBuilderUriTemplate,
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "number",
         queryParametersMapper: CountRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}/extensions/$count{?%24filter}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/index.ts
index d3a9fc09c..2da7c0b25 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/index.ts
@@ -3,8 +3,8 @@
 // Generated by Microsoft Kiota
 import { createExtensionCollectionResponseFromDiscriminatorValue, createExtensionFromDiscriminatorValue, serializeExtension, type Extension, type ExtensionCollectionResponse } from '../../../../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../../models/oDataErrors/';
-import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
-import { ExtensionItemRequestBuilderRequestsMetadata, ExtensionItemRequestBuilderUriTemplate, type ExtensionItemRequestBuilder } from './item/';
+import { CountRequestBuilderRequestsMetadata, type CountRequestBuilder } from './count/';
+import { ExtensionItemRequestBuilderRequestsMetadata, type ExtensionItemRequestBuilder } from './item/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -18,34 +18,36 @@ export interface ExtensionsRequestBuilder extends BaseRequestBuilder<ExtensionsR
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.childFolders.item.messages.item.extensions.item collection
      * @param extensionId The unique identifier of extension
-     * @returns a ExtensionItemRequestBuilder
+     * @returns {ExtensionItemRequestBuilder}
      */
      byExtensionId(extensionId: string) : ExtensionItemRequestBuilder;
     /**
      * Get an open extension (openTypeExtension object) identified by name or fully qualified name. The table in the Permissions section lists the resources that support open extensions. The following table lists the three scenarios where you can get an open extension from a supported resource instance.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ExtensionCollectionResponse
+     * @returns {Promise<ExtensionCollectionResponse>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<ExtensionsRequestBuilderGetQueryParameters> | undefined) : Promise<ExtensionCollectionResponse | undefined>;
     /**
      * Create an open extension (openTypeExtension object) and add custom properties in a new or existing instance of a resource. You can create an open extension in a resource instance and store custom data to it all in the same operation, except for specific resources. The table in the Permissions section lists the resources that support open extensions.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Extension
+     * @returns {Promise<Extension>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-post-opentypeextension?view=graph-rest-1.0|Find more info here}
      */
      post(body: Extension, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<Extension | undefined>;
     /**
      * Get an open extension (openTypeExtension object) identified by name or fully qualified name. The table in the Permissions section lists the resources that support open extensions. The following table lists the three scenarios where you can get an open extension from a supported resource instance.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<ExtensionsRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Create an open extension (openTypeExtension object) and add custom properties in a new or existing instance of a resource. You can create an open extension in a resource instance and store custom data to it all in the same operation, except for specific resources. The table in the Permissions section lists the resources that support open extensions.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPostRequestInformation(body: Extension, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -82,6 +84,10 @@ export interface ExtensionsRequestBuilderGetQueryParameters {
      */
     top?: number;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const ExtensionsRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}/extensions{?%24count,%24expand,%24filter,%24orderby,%24select,%24skip,%24top}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -99,12 +105,10 @@ const ExtensionsRequestBuilderGetQueryParametersMapper: Record<string, string> =
  */
 export const ExtensionsRequestBuilderNavigationMetadata: Record<Exclude<keyof ExtensionsRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     byExtensionId: {
-        uriTemplate: ExtensionItemRequestBuilderUriTemplate,
         requestsMetadata: ExtensionItemRequestBuilderRequestsMetadata,
         pathParametersMappings: ["extension%2Did"],
     },
     count: {
-        uriTemplate: CountRequestBuilderUriTemplate,
         requestsMetadata: CountRequestBuilderRequestsMetadata,
     },
 };
@@ -113,20 +117,20 @@ export const ExtensionsRequestBuilderNavigationMetadata: Record<Exclude<keyof Ex
  */
 export const ExtensionsRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: ExtensionsRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createExtensionCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: ExtensionsRequestBuilderGetQueryParametersMapper,
     },
     post: {
+        uriTemplate: ExtensionsRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createExtensionFromDiscriminatorValue,
@@ -135,9 +139,5 @@ export const ExtensionsRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const ExtensionsRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}/extensions{?%24count,%24expand,%24filter,%24orderby,%24select,%24skip,%24top}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/index.ts
index 47eb964df..1c8c5d54a 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/index.ts
@@ -12,14 +12,16 @@ export interface ExtensionItemRequestBuilder extends BaseRequestBuilder<Extensio
     /**
      * Delete an open extension (openTypeExtension object) from the specified instance of a resource.  For the list of resources that support open extensions, see the table in the Permissions section.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-delete?view=graph-rest-1.0|Find more info here}
      */
      delete(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * Get an open extension (openTypeExtension object) identified by name or fully qualified name. The table in the Permissions section lists the resources that support open extensions. The following table lists the three scenarios where you can get an open extension from a supported resource instance.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Extension
+     * @returns {Promise<Extension>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-get?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<ExtensionItemRequestBuilderGetQueryParameters> | undefined) : Promise<Extension | undefined>;
@@ -27,26 +29,27 @@ export interface ExtensionItemRequestBuilder extends BaseRequestBuilder<Extensio
      * Update the navigation property extensions in users
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Extension
+     * @returns {Promise<Extension>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      patch(body: Extension, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<Extension | undefined>;
     /**
      * Delete an open extension (openTypeExtension object) from the specified instance of a resource.  For the list of resources that support open extensions, see the table in the Permissions section.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toDeleteRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * Get an open extension (openTypeExtension object) identified by name or fully qualified name. The table in the Permissions section lists the resources that support open extensions. The following table lists the three scenarios where you can get an open extension from a supported resource instance.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<ExtensionItemRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Update the navigation property extensions in users
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPatchRequestInformation(body: Extension, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -63,6 +66,10 @@ export interface ExtensionItemRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const ExtensionItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}/extensions/{extension%2Did}{?%24expand,%24select}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -75,29 +82,29 @@ const ExtensionItemRequestBuilderGetQueryParametersMapper: Record<string, string
  */
 export const ExtensionItemRequestBuilderRequestsMetadata: RequestsMetadata = {
     delete: {
+        uriTemplate: ExtensionItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     get: {
+        uriTemplate: ExtensionItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createExtensionFromDiscriminatorValue,
         queryParametersMapper: ExtensionItemRequestBuilderGetQueryParametersMapper,
     },
     patch: {
+        uriTemplate: ExtensionItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createExtensionFromDiscriminatorValue,
@@ -106,9 +113,5 @@ export const ExtensionItemRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const ExtensionItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}/extensions/{extension%2Did}{?%24expand,%24select}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/index.ts
index b0710f121..353df04d5 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/index.ts
@@ -3,9 +3,9 @@
 // Generated by Microsoft Kiota
 import { createMessageFromDiscriminatorValue, serializeMessage, type Message } from '../../../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../models/oDataErrors/';
-import { AttachmentsRequestBuilderNavigationMetadata, AttachmentsRequestBuilderRequestsMetadata, AttachmentsRequestBuilderUriTemplate, type AttachmentsRequestBuilder } from './attachments/';
-import { ExtensionsRequestBuilderNavigationMetadata, ExtensionsRequestBuilderRequestsMetadata, ExtensionsRequestBuilderUriTemplate, type ExtensionsRequestBuilder } from './extensions/';
-import { ContentRequestBuilderRequestsMetadata, ContentRequestBuilderUriTemplate, type ContentRequestBuilder } from './value/';
+import { AttachmentsRequestBuilderNavigationMetadata, AttachmentsRequestBuilderRequestsMetadata, type AttachmentsRequestBuilder } from './attachments/';
+import { ExtensionsRequestBuilderNavigationMetadata, ExtensionsRequestBuilderRequestsMetadata, type ExtensionsRequestBuilder } from './extensions/';
+import { ContentRequestBuilderRequestsMetadata, type ContentRequestBuilder } from './value/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -27,39 +27,42 @@ export interface MessageItemRequestBuilder extends BaseRequestBuilder<MessageIte
     /**
      * Delete navigation property messages for users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      delete(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * The collection of messages in the mailFolder.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Message
+     * @returns {Promise<Message>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<MessageItemRequestBuilderGetQueryParameters> | undefined) : Promise<Message | undefined>;
     /**
      * Update the navigation property messages in users
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Message
+     * @returns {Promise<Message>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      patch(body: Message, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<Message | undefined>;
     /**
      * Delete navigation property messages for users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toDeleteRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * The collection of messages in the mailFolder.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<MessageItemRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Update the navigation property messages in users
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPatchRequestInformation(body: Message, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -76,6 +79,10 @@ export interface MessageItemRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const MessageItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}{?%24expand,%24select}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -88,16 +95,13 @@ const MessageItemRequestBuilderGetQueryParametersMapper: Record<string, string>
  */
 export const MessageItemRequestBuilderNavigationMetadata: Record<Exclude<keyof MessageItemRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     attachments: {
-        uriTemplate: AttachmentsRequestBuilderUriTemplate,
         requestsMetadata: AttachmentsRequestBuilderRequestsMetadata,
         navigationMetadata: AttachmentsRequestBuilderNavigationMetadata,
     },
     content: {
-        uriTemplate: ContentRequestBuilderUriTemplate,
         requestsMetadata: ContentRequestBuilderRequestsMetadata,
     },
     extensions: {
-        uriTemplate: ExtensionsRequestBuilderUriTemplate,
         requestsMetadata: ExtensionsRequestBuilderRequestsMetadata,
         navigationMetadata: ExtensionsRequestBuilderNavigationMetadata,
     },
@@ -107,29 +111,29 @@ export const MessageItemRequestBuilderNavigationMetadata: Record<Exclude<keyof M
  */
 export const MessageItemRequestBuilderRequestsMetadata: RequestsMetadata = {
     delete: {
+        uriTemplate: MessageItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     get: {
+        uriTemplate: MessageItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageFromDiscriminatorValue,
         queryParametersMapper: MessageItemRequestBuilderGetQueryParametersMapper,
     },
     patch: {
+        uriTemplate: MessageItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageFromDiscriminatorValue,
@@ -138,9 +142,5 @@ export const MessageItemRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const MessageItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}{?%24expand,%24select}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/index.ts
index 2b035f992..30619a803 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/index.ts
@@ -11,7 +11,8 @@ export interface ContentRequestBuilder extends BaseRequestBuilder<ContentRequest
     /**
      * Get media content for the navigation property messages from users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/mailfolder-list-messages?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
@@ -19,41 +20,46 @@ export interface ContentRequestBuilder extends BaseRequestBuilder<ContentRequest
      * Update media content for the navigation property messages in users
      * @param body Binary request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      put(body: ArrayBuffer | undefined, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * Get media content for the navigation property messages from users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * Update media content for the navigation property messages in users
      * @param body Binary request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPutRequestInformation(body: ArrayBuffer | undefined, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const ContentRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}/$value";
 /**
  * Metadata for all the requests in the request builder.
  */
 export const ContentRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: ContentRequestBuilderUriTemplate,
         responseBodyContentType: "application/octet-stream, application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     put: {
+        uriTemplate: ContentRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
@@ -61,9 +67,5 @@ export const ContentRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setStreamContent",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const ContentRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}/$value";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/index.ts
index b5a5cde1f..e13927b64 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/index.ts
@@ -3,9 +3,9 @@
 // Generated by Microsoft Kiota
 import { createMailFolderFromDiscriminatorValue, serializeMailFolder, type MailFolder } from '../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../models/oDataErrors/';
-import { ChildFoldersRequestBuilderNavigationMetadata, ChildFoldersRequestBuilderRequestsMetadata, ChildFoldersRequestBuilderUriTemplate, type ChildFoldersRequestBuilder } from './childFolders/';
-import { MessageRulesRequestBuilderNavigationMetadata, MessageRulesRequestBuilderRequestsMetadata, MessageRulesRequestBuilderUriTemplate, type MessageRulesRequestBuilder } from './messageRules/';
-import { MessagesRequestBuilderNavigationMetadata, MessagesRequestBuilderRequestsMetadata, MessagesRequestBuilderUriTemplate, type MessagesRequestBuilder } from './messages/';
+import { ChildFoldersRequestBuilderNavigationMetadata, ChildFoldersRequestBuilderRequestsMetadata, type ChildFoldersRequestBuilder } from './childFolders/';
+import { MessageRulesRequestBuilderNavigationMetadata, MessageRulesRequestBuilderRequestsMetadata, type MessageRulesRequestBuilder } from './messageRules/';
+import { MessagesRequestBuilderNavigationMetadata, MessagesRequestBuilderRequestsMetadata, type MessagesRequestBuilder } from './messages/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -27,14 +27,16 @@ export interface MailFolderItemRequestBuilder extends BaseRequestBuilder<MailFol
     /**
      * Delete the specified mailFolder. The folder can be a mailSearchFolder. You can specify a mail folder by its folder ID, or by its well-known folder name, if one exists.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/mailfolder-delete?view=graph-rest-1.0|Find more info here}
      */
      delete(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * The user's mail folders. Read-only. Nullable.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MailFolder
+     * @returns {Promise<MailFolder>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/mailfolder-get?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<MailFolderItemRequestBuilderGetQueryParameters> | undefined) : Promise<MailFolder | undefined>;
@@ -42,27 +44,28 @@ export interface MailFolderItemRequestBuilder extends BaseRequestBuilder<MailFol
      * Update the writable properties of a mailSearchFolder object.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MailFolder
+     * @returns {Promise<MailFolder>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/mailsearchfolder-update?view=graph-rest-1.0|Find more info here}
      */
      patch(body: MailFolder, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<MailFolder | undefined>;
     /**
      * Delete the specified mailFolder. The folder can be a mailSearchFolder. You can specify a mail folder by its folder ID, or by its well-known folder name, if one exists.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toDeleteRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * The user's mail folders. Read-only. Nullable.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<MailFolderItemRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Update the writable properties of a mailSearchFolder object.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPatchRequestInformation(body: MailFolder, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -83,6 +86,10 @@ export interface MailFolderItemRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const MailFolderItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}{?%24expand,%24select,includeHiddenFolders}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -95,17 +102,14 @@ const MailFolderItemRequestBuilderGetQueryParametersMapper: Record<string, strin
  */
 export const MailFolderItemRequestBuilderNavigationMetadata: Record<Exclude<keyof MailFolderItemRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     childFolders: {
-        uriTemplate: ChildFoldersRequestBuilderUriTemplate,
         requestsMetadata: ChildFoldersRequestBuilderRequestsMetadata,
         navigationMetadata: ChildFoldersRequestBuilderNavigationMetadata,
     },
     messageRules: {
-        uriTemplate: MessageRulesRequestBuilderUriTemplate,
         requestsMetadata: MessageRulesRequestBuilderRequestsMetadata,
         navigationMetadata: MessageRulesRequestBuilderNavigationMetadata,
     },
     messages: {
-        uriTemplate: MessagesRequestBuilderUriTemplate,
         requestsMetadata: MessagesRequestBuilderRequestsMetadata,
         navigationMetadata: MessagesRequestBuilderNavigationMetadata,
     },
@@ -115,29 +119,29 @@ export const MailFolderItemRequestBuilderNavigationMetadata: Record<Exclude<keyo
  */
 export const MailFolderItemRequestBuilderRequestsMetadata: RequestsMetadata = {
     delete: {
+        uriTemplate: MailFolderItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     get: {
+        uriTemplate: MailFolderItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMailFolderFromDiscriminatorValue,
         queryParametersMapper: MailFolderItemRequestBuilderGetQueryParametersMapper,
     },
     patch: {
+        uriTemplate: MailFolderItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMailFolderFromDiscriminatorValue,
@@ -146,9 +150,5 @@ export const MailFolderItemRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const MailFolderItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}{?%24expand,%24select,includeHiddenFolders}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/index.ts
index e260eb9eb..ef63b1d77 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/index.ts
@@ -11,13 +11,14 @@ export interface CountRequestBuilder extends BaseRequestBuilder<CountRequestBuil
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Integer
+     * @returns {Promise<number>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : Promise<number | undefined>;
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -30,6 +31,10 @@ export interface CountRequestBuilderGetQueryParameters {
      */
     filter?: string;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messageRules/$count{?%24filter}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -41,19 +46,15 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: CountRequestBuilderUriTemplate,
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "number",
         queryParametersMapper: CountRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messageRules/$count{?%24filter}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/index.ts
index 35ffaf734..b7aa0174c 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/index.ts
@@ -3,8 +3,8 @@
 // Generated by Microsoft Kiota
 import { createMessageRuleCollectionResponseFromDiscriminatorValue, createMessageRuleFromDiscriminatorValue, serializeMessageRule, type MessageRule, type MessageRuleCollectionResponse } from '../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../models/oDataErrors/';
-import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
-import { MessageRuleItemRequestBuilderRequestsMetadata, MessageRuleItemRequestBuilderUriTemplate, type MessageRuleItemRequestBuilder } from './item/';
+import { CountRequestBuilderRequestsMetadata, type CountRequestBuilder } from './count/';
+import { MessageRuleItemRequestBuilderRequestsMetadata, type MessageRuleItemRequestBuilder } from './item/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -18,13 +18,14 @@ export interface MessageRulesRequestBuilder extends BaseRequestBuilder<MessageRu
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.messageRules.item collection
      * @param messageRuleId The unique identifier of messageRule
-     * @returns a MessageRuleItemRequestBuilder
+     * @returns {MessageRuleItemRequestBuilder}
      */
      byMessageRuleId(messageRuleId: string) : MessageRuleItemRequestBuilder;
     /**
      * Get all the messageRule objects defined for the user's inbox.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MessageRuleCollectionResponse
+     * @returns {Promise<MessageRuleCollectionResponse>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/mailfolder-list-messagerules?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<MessageRulesRequestBuilderGetQueryParameters> | undefined) : Promise<MessageRuleCollectionResponse | undefined>;
@@ -32,21 +33,22 @@ export interface MessageRulesRequestBuilder extends BaseRequestBuilder<MessageRu
      * Create a messageRule object by specifying a set of conditions and actions. Outlook carries out those actions if an incoming message in the user's Inbox meets the specified conditions.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MessageRule
+     * @returns {Promise<MessageRule>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/mailfolder-post-messagerules?view=graph-rest-1.0|Find more info here}
      */
      post(body: MessageRule, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<MessageRule | undefined>;
     /**
      * Get all the messageRule objects defined for the user's inbox.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<MessageRulesRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Create a messageRule object by specifying a set of conditions and actions. Outlook carries out those actions if an incoming message in the user's Inbox meets the specified conditions.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPostRequestInformation(body: MessageRule, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -79,6 +81,10 @@ export interface MessageRulesRequestBuilderGetQueryParameters {
      */
     top?: number;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const MessageRulesRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messageRules{?%24count,%24filter,%24orderby,%24select,%24skip,%24top}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -95,12 +101,10 @@ const MessageRulesRequestBuilderGetQueryParametersMapper: Record<string, string>
  */
 export const MessageRulesRequestBuilderNavigationMetadata: Record<Exclude<keyof MessageRulesRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     byMessageRuleId: {
-        uriTemplate: MessageRuleItemRequestBuilderUriTemplate,
         requestsMetadata: MessageRuleItemRequestBuilderRequestsMetadata,
         pathParametersMappings: ["messageRule%2Did"],
     },
     count: {
-        uriTemplate: CountRequestBuilderUriTemplate,
         requestsMetadata: CountRequestBuilderRequestsMetadata,
     },
 };
@@ -109,20 +113,20 @@ export const MessageRulesRequestBuilderNavigationMetadata: Record<Exclude<keyof
  */
 export const MessageRulesRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: MessageRulesRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageRuleCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: MessageRulesRequestBuilderGetQueryParametersMapper,
     },
     post: {
+        uriTemplate: MessageRulesRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageRuleFromDiscriminatorValue,
@@ -131,9 +135,5 @@ export const MessageRulesRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const MessageRulesRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messageRules{?%24count,%24filter,%24orderby,%24select,%24skip,%24top}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/index.ts
index 81309a708..44794c21c 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/index.ts
@@ -12,14 +12,16 @@ export interface MessageRuleItemRequestBuilder extends BaseRequestBuilder<Messag
     /**
      * Delete the specified messageRule object.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/messagerule-delete?view=graph-rest-1.0|Find more info here}
      */
      delete(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * Get the properties and relationships of a messageRule object.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MessageRule
+     * @returns {Promise<MessageRule>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/messagerule-get?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<MessageRuleItemRequestBuilderGetQueryParameters> | undefined) : Promise<MessageRule | undefined>;
@@ -27,27 +29,28 @@ export interface MessageRuleItemRequestBuilder extends BaseRequestBuilder<Messag
      * Change writable properties on a messageRule object and save the changes.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MessageRule
+     * @returns {Promise<MessageRule>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/messagerule-update?view=graph-rest-1.0|Find more info here}
      */
      patch(body: MessageRule, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<MessageRule | undefined>;
     /**
      * Delete the specified messageRule object.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toDeleteRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * Get the properties and relationships of a messageRule object.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<MessageRuleItemRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Change writable properties on a messageRule object and save the changes.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPatchRequestInformation(body: MessageRule, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -60,6 +63,10 @@ export interface MessageRuleItemRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const MessageRuleItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messageRules/{messageRule%2Did}{?%24select}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -71,29 +78,29 @@ const MessageRuleItemRequestBuilderGetQueryParametersMapper: Record<string, stri
  */
 export const MessageRuleItemRequestBuilderRequestsMetadata: RequestsMetadata = {
     delete: {
+        uriTemplate: MessageRuleItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     get: {
+        uriTemplate: MessageRuleItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageRuleFromDiscriminatorValue,
         queryParametersMapper: MessageRuleItemRequestBuilderGetQueryParametersMapper,
     },
     patch: {
+        uriTemplate: MessageRuleItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageRuleFromDiscriminatorValue,
@@ -102,9 +109,5 @@ export const MessageRuleItemRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const MessageRuleItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messageRules/{messageRule%2Did}{?%24select}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/count/index.ts
index 82bb13083..6538c1a13 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/count/index.ts
@@ -11,13 +11,14 @@ export interface CountRequestBuilder extends BaseRequestBuilder<CountRequestBuil
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Integer
+     * @returns {Promise<number>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : Promise<number | undefined>;
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -34,6 +35,10 @@ export interface CountRequestBuilderGetQueryParameters {
      */
     search?: string;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/$count{?%24filter,%24search}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -46,19 +51,15 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: CountRequestBuilderUriTemplate,
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "number",
         queryParametersMapper: CountRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/$count{?%24filter,%24search}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/index.ts
index 57255b666..44fe75130 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/index.ts
@@ -3,8 +3,8 @@
 // Generated by Microsoft Kiota
 import { createMessageCollectionResponseFromDiscriminatorValue, createMessageFromDiscriminatorValue, serializeMessage, type Message, type MessageCollectionResponse } from '../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../models/oDataErrors/';
-import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
-import { MessageItemRequestBuilderNavigationMetadata, MessageItemRequestBuilderRequestsMetadata, MessageItemRequestBuilderUriTemplate, type MessageItemRequestBuilder } from './item/';
+import { CountRequestBuilderRequestsMetadata, type CountRequestBuilder } from './count/';
+import { MessageItemRequestBuilderNavigationMetadata, MessageItemRequestBuilderRequestsMetadata, type MessageItemRequestBuilder } from './item/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -18,13 +18,14 @@ export interface MessagesRequestBuilder extends BaseRequestBuilder<MessagesReque
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.messages.item collection
      * @param messageId The unique identifier of message
-     * @returns a MessageItemRequestBuilder
+     * @returns {MessageItemRequestBuilder}
      */
      byMessageId(messageId: string) : MessageItemRequestBuilder;
     /**
      * Get all the messages in the specified user's mailbox, or those messages in a specified folder in the mailbox.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MessageCollectionResponse
+     * @returns {Promise<MessageCollectionResponse>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/mailfolder-list-messages?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<MessagesRequestBuilderGetQueryParameters> | undefined) : Promise<MessageCollectionResponse | undefined>;
@@ -32,21 +33,22 @@ export interface MessagesRequestBuilder extends BaseRequestBuilder<MessagesReque
      * Use this API to create a new Message in a mailfolder.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Message
+     * @returns {Promise<Message>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/mailfolder-post-messages?view=graph-rest-1.0|Find more info here}
      */
      post(body: Message, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<Message | undefined>;
     /**
      * Get all the messages in the specified user's mailbox, or those messages in a specified folder in the mailbox.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<MessagesRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Use this API to create a new Message in a mailfolder.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPostRequestInformation(body: Message, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -87,6 +89,10 @@ export interface MessagesRequestBuilderGetQueryParameters {
      */
     top?: number;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const MessagesRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages{?%24count,%24expand,%24filter,%24orderby,%24search,%24select,%24skip,%24top}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -105,13 +111,11 @@ const MessagesRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const MessagesRequestBuilderNavigationMetadata: Record<Exclude<keyof MessagesRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     byMessageId: {
-        uriTemplate: MessageItemRequestBuilderUriTemplate,
         requestsMetadata: MessageItemRequestBuilderRequestsMetadata,
         navigationMetadata: MessageItemRequestBuilderNavigationMetadata,
         pathParametersMappings: ["message%2Did"],
     },
     count: {
-        uriTemplate: CountRequestBuilderUriTemplate,
         requestsMetadata: CountRequestBuilderRequestsMetadata,
     },
 };
@@ -120,20 +124,20 @@ export const MessagesRequestBuilderNavigationMetadata: Record<Exclude<keyof Mess
  */
 export const MessagesRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: MessagesRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: MessagesRequestBuilderGetQueryParametersMapper,
     },
     post: {
+        uriTemplate: MessagesRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageFromDiscriminatorValue,
@@ -142,9 +146,5 @@ export const MessagesRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const MessagesRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages{?%24count,%24expand,%24filter,%24orderby,%24search,%24select,%24skip,%24top}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/index.ts
index cebc8de71..97fdcb306 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/index.ts
@@ -11,13 +11,14 @@ export interface CountRequestBuilder extends BaseRequestBuilder<CountRequestBuil
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Integer
+     * @returns {Promise<number>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : Promise<number | undefined>;
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -30,6 +31,10 @@ export interface CountRequestBuilderGetQueryParameters {
      */
     filter?: string;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}/attachments/$count{?%24filter}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -41,19 +46,15 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: CountRequestBuilderUriTemplate,
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "number",
         queryParametersMapper: CountRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}/attachments/$count{?%24filter}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/index.ts
index 87e073a45..ad5f45efc 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/index.ts
@@ -3,8 +3,8 @@
 // Generated by Microsoft Kiota
 import { createAttachmentCollectionResponseFromDiscriminatorValue, createAttachmentFromDiscriminatorValue, serializeAttachment, type Attachment, type AttachmentCollectionResponse } from '../../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../models/oDataErrors/';
-import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
-import { AttachmentItemRequestBuilderRequestsMetadata, AttachmentItemRequestBuilderUriTemplate, type AttachmentItemRequestBuilder } from './item/';
+import { CountRequestBuilderRequestsMetadata, type CountRequestBuilder } from './count/';
+import { AttachmentItemRequestBuilderRequestsMetadata, type AttachmentItemRequestBuilder } from './item/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -18,13 +18,14 @@ export interface AttachmentsRequestBuilder extends BaseRequestBuilder<Attachment
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.messages.item.attachments.item collection
      * @param attachmentId The unique identifier of attachment
-     * @returns a AttachmentItemRequestBuilder
+     * @returns {AttachmentItemRequestBuilder}
      */
      byAttachmentId(attachmentId: string) : AttachmentItemRequestBuilder;
     /**
      * Retrieve a list of attachment objects attached to a message.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of AttachmentCollectionResponse
+     * @returns {Promise<AttachmentCollectionResponse>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/message-list-attachments?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<AttachmentsRequestBuilderGetQueryParameters> | undefined) : Promise<AttachmentCollectionResponse | undefined>;
@@ -32,21 +33,22 @@ export interface AttachmentsRequestBuilder extends BaseRequestBuilder<Attachment
      * Use this API to create a new Attachment. An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Attachment
+     * @returns {Promise<Attachment>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/eventmessage-post-attachments?view=graph-rest-1.0|Find more info here}
      */
      post(body: Attachment, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<Attachment | undefined>;
     /**
      * Retrieve a list of attachment objects attached to a message.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<AttachmentsRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Use this API to create a new Attachment. An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPostRequestInformation(body: Attachment, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -75,6 +77,10 @@ export interface AttachmentsRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const AttachmentsRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}/attachments{?%24count,%24expand,%24filter,%24orderby,%24select}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -90,12 +96,10 @@ const AttachmentsRequestBuilderGetQueryParametersMapper: Record<string, string>
  */
 export const AttachmentsRequestBuilderNavigationMetadata: Record<Exclude<keyof AttachmentsRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     byAttachmentId: {
-        uriTemplate: AttachmentItemRequestBuilderUriTemplate,
         requestsMetadata: AttachmentItemRequestBuilderRequestsMetadata,
         pathParametersMappings: ["attachment%2Did"],
     },
     count: {
-        uriTemplate: CountRequestBuilderUriTemplate,
         requestsMetadata: CountRequestBuilderRequestsMetadata,
     },
 };
@@ -104,20 +108,20 @@ export const AttachmentsRequestBuilderNavigationMetadata: Record<Exclude<keyof A
  */
 export const AttachmentsRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: AttachmentsRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createAttachmentCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: AttachmentsRequestBuilderGetQueryParametersMapper,
     },
     post: {
+        uriTemplate: AttachmentsRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createAttachmentFromDiscriminatorValue,
@@ -126,9 +130,5 @@ export const AttachmentsRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const AttachmentsRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}/attachments{?%24count,%24expand,%24filter,%24orderby,%24select}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/index.ts
index cd7486d11..5c7a05403 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/index.ts
@@ -12,26 +12,28 @@ export interface AttachmentItemRequestBuilder extends BaseRequestBuilder<Attachm
     /**
      * Delete navigation property attachments for users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      delete(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * Read the properties, relationships, or raw contents of an attachment that is attached to a user event, message, or group post. An attachment can be one of the following types: All these types of attachments are derived from the attachment resource.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Attachment
+     * @returns {Promise<Attachment>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/attachment-get?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<AttachmentItemRequestBuilderGetQueryParameters> | undefined) : Promise<Attachment | undefined>;
     /**
      * Delete navigation property attachments for users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toDeleteRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * Read the properties, relationships, or raw contents of an attachment that is attached to a user event, message, or group post. An attachment can be one of the following types: All these types of attachments are derived from the attachment resource.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<AttachmentItemRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -48,6 +50,10 @@ export interface AttachmentItemRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const AttachmentItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}/attachments/{attachment%2Did}{?%24expand,%24select}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -60,28 +66,24 @@ const AttachmentItemRequestBuilderGetQueryParametersMapper: Record<string, strin
  */
 export const AttachmentItemRequestBuilderRequestsMetadata: RequestsMetadata = {
     delete: {
+        uriTemplate: AttachmentItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     get: {
+        uriTemplate: AttachmentItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createAttachmentFromDiscriminatorValue,
         queryParametersMapper: AttachmentItemRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const AttachmentItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}/attachments/{attachment%2Did}{?%24expand,%24select}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/index.ts
index 462411eb8..5f5130725 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/index.ts
@@ -11,13 +11,14 @@ export interface CountRequestBuilder extends BaseRequestBuilder<CountRequestBuil
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Integer
+     * @returns {Promise<number>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : Promise<number | undefined>;
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -30,6 +31,10 @@ export interface CountRequestBuilderGetQueryParameters {
      */
     filter?: string;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}/extensions/$count{?%24filter}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -41,19 +46,15 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: CountRequestBuilderUriTemplate,
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "number",
         queryParametersMapper: CountRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}/extensions/$count{?%24filter}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/index.ts
index a6770a260..a0356b9cd 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/index.ts
@@ -3,8 +3,8 @@
 // Generated by Microsoft Kiota
 import { createExtensionCollectionResponseFromDiscriminatorValue, createExtensionFromDiscriminatorValue, serializeExtension, type Extension, type ExtensionCollectionResponse } from '../../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../models/oDataErrors/';
-import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
-import { ExtensionItemRequestBuilderRequestsMetadata, ExtensionItemRequestBuilderUriTemplate, type ExtensionItemRequestBuilder } from './item/';
+import { CountRequestBuilderRequestsMetadata, type CountRequestBuilder } from './count/';
+import { ExtensionItemRequestBuilderRequestsMetadata, type ExtensionItemRequestBuilder } from './item/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -18,34 +18,36 @@ export interface ExtensionsRequestBuilder extends BaseRequestBuilder<ExtensionsR
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.messages.item.extensions.item collection
      * @param extensionId The unique identifier of extension
-     * @returns a ExtensionItemRequestBuilder
+     * @returns {ExtensionItemRequestBuilder}
      */
      byExtensionId(extensionId: string) : ExtensionItemRequestBuilder;
     /**
      * Get an open extension (openTypeExtension object) identified by name or fully qualified name. The table in the Permissions section lists the resources that support open extensions. The following table lists the three scenarios where you can get an open extension from a supported resource instance.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ExtensionCollectionResponse
+     * @returns {Promise<ExtensionCollectionResponse>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<ExtensionsRequestBuilderGetQueryParameters> | undefined) : Promise<ExtensionCollectionResponse | undefined>;
     /**
      * Create an open extension (openTypeExtension object) and add custom properties in a new or existing instance of a resource. You can create an open extension in a resource instance and store custom data to it all in the same operation, except for specific resources. The table in the Permissions section lists the resources that support open extensions.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Extension
+     * @returns {Promise<Extension>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-post-opentypeextension?view=graph-rest-1.0|Find more info here}
      */
      post(body: Extension, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<Extension | undefined>;
     /**
      * Get an open extension (openTypeExtension object) identified by name or fully qualified name. The table in the Permissions section lists the resources that support open extensions. The following table lists the three scenarios where you can get an open extension from a supported resource instance.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<ExtensionsRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Create an open extension (openTypeExtension object) and add custom properties in a new or existing instance of a resource. You can create an open extension in a resource instance and store custom data to it all in the same operation, except for specific resources. The table in the Permissions section lists the resources that support open extensions.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPostRequestInformation(body: Extension, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -82,6 +84,10 @@ export interface ExtensionsRequestBuilderGetQueryParameters {
      */
     top?: number;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const ExtensionsRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}/extensions{?%24count,%24expand,%24filter,%24orderby,%24select,%24skip,%24top}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -99,12 +105,10 @@ const ExtensionsRequestBuilderGetQueryParametersMapper: Record<string, string> =
  */
 export const ExtensionsRequestBuilderNavigationMetadata: Record<Exclude<keyof ExtensionsRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     byExtensionId: {
-        uriTemplate: ExtensionItemRequestBuilderUriTemplate,
         requestsMetadata: ExtensionItemRequestBuilderRequestsMetadata,
         pathParametersMappings: ["extension%2Did"],
     },
     count: {
-        uriTemplate: CountRequestBuilderUriTemplate,
         requestsMetadata: CountRequestBuilderRequestsMetadata,
     },
 };
@@ -113,20 +117,20 @@ export const ExtensionsRequestBuilderNavigationMetadata: Record<Exclude<keyof Ex
  */
 export const ExtensionsRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: ExtensionsRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createExtensionCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: ExtensionsRequestBuilderGetQueryParametersMapper,
     },
     post: {
+        uriTemplate: ExtensionsRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createExtensionFromDiscriminatorValue,
@@ -135,9 +139,5 @@ export const ExtensionsRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const ExtensionsRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}/extensions{?%24count,%24expand,%24filter,%24orderby,%24select,%24skip,%24top}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/index.ts
index 06ecd0061..ffa6f9a28 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/index.ts
@@ -12,14 +12,16 @@ export interface ExtensionItemRequestBuilder extends BaseRequestBuilder<Extensio
     /**
      * Delete an open extension (openTypeExtension object) from the specified instance of a resource.  For the list of resources that support open extensions, see the table in the Permissions section.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-delete?view=graph-rest-1.0|Find more info here}
      */
      delete(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * Get an open extension (openTypeExtension object) identified by name or fully qualified name. The table in the Permissions section lists the resources that support open extensions. The following table lists the three scenarios where you can get an open extension from a supported resource instance.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Extension
+     * @returns {Promise<Extension>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-get?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<ExtensionItemRequestBuilderGetQueryParameters> | undefined) : Promise<Extension | undefined>;
@@ -27,26 +29,27 @@ export interface ExtensionItemRequestBuilder extends BaseRequestBuilder<Extensio
      * Update the navigation property extensions in users
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Extension
+     * @returns {Promise<Extension>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      patch(body: Extension, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<Extension | undefined>;
     /**
      * Delete an open extension (openTypeExtension object) from the specified instance of a resource.  For the list of resources that support open extensions, see the table in the Permissions section.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toDeleteRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * Get an open extension (openTypeExtension object) identified by name or fully qualified name. The table in the Permissions section lists the resources that support open extensions. The following table lists the three scenarios where you can get an open extension from a supported resource instance.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<ExtensionItemRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Update the navigation property extensions in users
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPatchRequestInformation(body: Extension, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -63,6 +66,10 @@ export interface ExtensionItemRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const ExtensionItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}/extensions/{extension%2Did}{?%24expand,%24select}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -75,29 +82,29 @@ const ExtensionItemRequestBuilderGetQueryParametersMapper: Record<string, string
  */
 export const ExtensionItemRequestBuilderRequestsMetadata: RequestsMetadata = {
     delete: {
+        uriTemplate: ExtensionItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     get: {
+        uriTemplate: ExtensionItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createExtensionFromDiscriminatorValue,
         queryParametersMapper: ExtensionItemRequestBuilderGetQueryParametersMapper,
     },
     patch: {
+        uriTemplate: ExtensionItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createExtensionFromDiscriminatorValue,
@@ -106,9 +113,5 @@ export const ExtensionItemRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const ExtensionItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}/extensions/{extension%2Did}{?%24expand,%24select}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/index.ts
index e29ab71f4..74cd2e8e5 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/index.ts
@@ -3,9 +3,9 @@
 // Generated by Microsoft Kiota
 import { createMessageFromDiscriminatorValue, serializeMessage, type Message } from '../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../models/oDataErrors/';
-import { AttachmentsRequestBuilderNavigationMetadata, AttachmentsRequestBuilderRequestsMetadata, AttachmentsRequestBuilderUriTemplate, type AttachmentsRequestBuilder } from './attachments/';
-import { ExtensionsRequestBuilderNavigationMetadata, ExtensionsRequestBuilderRequestsMetadata, ExtensionsRequestBuilderUriTemplate, type ExtensionsRequestBuilder } from './extensions/';
-import { ContentRequestBuilderRequestsMetadata, ContentRequestBuilderUriTemplate, type ContentRequestBuilder } from './value/';
+import { AttachmentsRequestBuilderNavigationMetadata, AttachmentsRequestBuilderRequestsMetadata, type AttachmentsRequestBuilder } from './attachments/';
+import { ExtensionsRequestBuilderNavigationMetadata, ExtensionsRequestBuilderRequestsMetadata, type ExtensionsRequestBuilder } from './extensions/';
+import { ContentRequestBuilderRequestsMetadata, type ContentRequestBuilder } from './value/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -27,39 +27,42 @@ export interface MessageItemRequestBuilder extends BaseRequestBuilder<MessageIte
     /**
      * Delete navigation property messages for users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      delete(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * The collection of messages in the mailFolder.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Message
+     * @returns {Promise<Message>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<MessageItemRequestBuilderGetQueryParameters> | undefined) : Promise<Message | undefined>;
     /**
      * Update the navigation property messages in users
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Message
+     * @returns {Promise<Message>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      patch(body: Message, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<Message | undefined>;
     /**
      * Delete navigation property messages for users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toDeleteRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * The collection of messages in the mailFolder.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<MessageItemRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Update the navigation property messages in users
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPatchRequestInformation(body: Message, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -76,6 +79,10 @@ export interface MessageItemRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const MessageItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}{?%24expand,%24select}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -88,16 +95,13 @@ const MessageItemRequestBuilderGetQueryParametersMapper: Record<string, string>
  */
 export const MessageItemRequestBuilderNavigationMetadata: Record<Exclude<keyof MessageItemRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     attachments: {
-        uriTemplate: AttachmentsRequestBuilderUriTemplate,
         requestsMetadata: AttachmentsRequestBuilderRequestsMetadata,
         navigationMetadata: AttachmentsRequestBuilderNavigationMetadata,
     },
     content: {
-        uriTemplate: ContentRequestBuilderUriTemplate,
         requestsMetadata: ContentRequestBuilderRequestsMetadata,
     },
     extensions: {
-        uriTemplate: ExtensionsRequestBuilderUriTemplate,
         requestsMetadata: ExtensionsRequestBuilderRequestsMetadata,
         navigationMetadata: ExtensionsRequestBuilderNavigationMetadata,
     },
@@ -107,29 +111,29 @@ export const MessageItemRequestBuilderNavigationMetadata: Record<Exclude<keyof M
  */
 export const MessageItemRequestBuilderRequestsMetadata: RequestsMetadata = {
     delete: {
+        uriTemplate: MessageItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     get: {
+        uriTemplate: MessageItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageFromDiscriminatorValue,
         queryParametersMapper: MessageItemRequestBuilderGetQueryParametersMapper,
     },
     patch: {
+        uriTemplate: MessageItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageFromDiscriminatorValue,
@@ -138,9 +142,5 @@ export const MessageItemRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const MessageItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}{?%24expand,%24select}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/index.ts
index ed9890f28..ffb3b4a44 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/index.ts
@@ -11,7 +11,8 @@ export interface ContentRequestBuilder extends BaseRequestBuilder<ContentRequest
     /**
      * Get media content for the navigation property messages from users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/mailfolder-list-messages?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
@@ -19,41 +20,46 @@ export interface ContentRequestBuilder extends BaseRequestBuilder<ContentRequest
      * Update media content for the navigation property messages in users
      * @param body Binary request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      put(body: ArrayBuffer | undefined, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * Get media content for the navigation property messages from users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * Update media content for the navigation property messages in users
      * @param body Binary request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPutRequestInformation(body: ArrayBuffer | undefined, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const ContentRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}/$value";
 /**
  * Metadata for all the requests in the request builder.
  */
 export const ContentRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: ContentRequestBuilderUriTemplate,
         responseBodyContentType: "application/octet-stream, application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     put: {
+        uriTemplate: ContentRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
@@ -61,9 +67,5 @@ export const ContentRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setStreamContent",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const ContentRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}/$value";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/messages/count/index.ts b/packages/test/generatedCode/users/item/messages/count/index.ts
index 56ed91b31..575889f4d 100644
--- a/packages/test/generatedCode/users/item/messages/count/index.ts
+++ b/packages/test/generatedCode/users/item/messages/count/index.ts
@@ -11,13 +11,14 @@ export interface CountRequestBuilder extends BaseRequestBuilder<CountRequestBuil
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Integer
+     * @returns {Promise<number>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : Promise<number | undefined>;
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -34,6 +35,10 @@ export interface CountRequestBuilderGetQueryParameters {
      */
     search?: string;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/$count{?%24filter,%24search}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -46,19 +51,15 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: CountRequestBuilderUriTemplate,
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "number",
         queryParametersMapper: CountRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/$count{?%24filter,%24search}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/messages/index.ts b/packages/test/generatedCode/users/item/messages/index.ts
index e0867dd7f..6da2ee7a2 100644
--- a/packages/test/generatedCode/users/item/messages/index.ts
+++ b/packages/test/generatedCode/users/item/messages/index.ts
@@ -3,8 +3,8 @@
 // Generated by Microsoft Kiota
 import { createMessageCollectionResponseFromDiscriminatorValue, createMessageFromDiscriminatorValue, serializeMessage, type Message, type MessageCollectionResponse } from '../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../models/oDataErrors/';
-import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
-import { MessageItemRequestBuilderNavigationMetadata, MessageItemRequestBuilderRequestsMetadata, MessageItemRequestBuilderUriTemplate, type MessageItemRequestBuilder } from './item/';
+import { CountRequestBuilderRequestsMetadata, type CountRequestBuilder } from './count/';
+import { MessageItemRequestBuilderNavigationMetadata, MessageItemRequestBuilderRequestsMetadata, type MessageItemRequestBuilder } from './item/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -18,13 +18,14 @@ export interface MessagesRequestBuilder extends BaseRequestBuilder<MessagesReque
     /**
      * Gets an item from the ApiSdk.users.item.messages.item collection
      * @param messageId The unique identifier of message
-     * @returns a MessageItemRequestBuilder
+     * @returns {MessageItemRequestBuilder}
      */
      byMessageId(messageId: string) : MessageItemRequestBuilder;
     /**
      * The messages in a mailbox or folder. Read-only. Nullable.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of MessageCollectionResponse
+     * @returns {Promise<MessageCollectionResponse>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-get?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<MessagesRequestBuilderGetQueryParameters> | undefined) : Promise<MessageCollectionResponse | undefined>;
@@ -32,21 +33,22 @@ export interface MessagesRequestBuilder extends BaseRequestBuilder<MessagesReque
      * Create a draft of a new message in either JSON or MIME format. When using JSON format, you can:- Include an attachment to the message.- Update the draft later to add content to the body or change other message properties. When using MIME format:- Provide the applicable Internet message headers and the MIME content, all encoded in base64 format in the request body.- /* Add any attachments and S/MIME properties to the MIME content. By default, this operation saves the draft in the Drafts folder. Send the draft message in a subsequent operation. Alternatively, send a new message in a single operation, or create a draft to forward, reply and reply-all to an existing message.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Message
+     * @returns {Promise<Message>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/user-post-messages?view=graph-rest-1.0|Find more info here}
      */
      post(body: Message, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<Message | undefined>;
     /**
      * The messages in a mailbox or folder. Read-only. Nullable.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<MessagesRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Create a draft of a new message in either JSON or MIME format. When using JSON format, you can:- Include an attachment to the message.- Update the draft later to add content to the body or change other message properties. When using MIME format:- Provide the applicable Internet message headers and the MIME content, all encoded in base64 format in the request body.- /* Add any attachments and S/MIME properties to the MIME content. By default, this operation saves the draft in the Drafts folder. Send the draft message in a subsequent operation. Alternatively, send a new message in a single operation, or create a draft to forward, reply and reply-all to an existing message.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPostRequestInformation(body: Message, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -91,6 +93,10 @@ export interface MessagesRequestBuilderGetQueryParameters {
      */
     top?: number;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const MessagesRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages{?%24count,%24expand,%24filter,%24orderby,%24search,%24select,%24skip,%24top,includeHiddenMessages}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -109,13 +115,11 @@ const MessagesRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const MessagesRequestBuilderNavigationMetadata: Record<Exclude<keyof MessagesRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     byMessageId: {
-        uriTemplate: MessageItemRequestBuilderUriTemplate,
         requestsMetadata: MessageItemRequestBuilderRequestsMetadata,
         navigationMetadata: MessageItemRequestBuilderNavigationMetadata,
         pathParametersMappings: ["message%2Did"],
     },
     count: {
-        uriTemplate: CountRequestBuilderUriTemplate,
         requestsMetadata: CountRequestBuilderRequestsMetadata,
     },
 };
@@ -124,20 +128,20 @@ export const MessagesRequestBuilderNavigationMetadata: Record<Exclude<keyof Mess
  */
 export const MessagesRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: MessagesRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: MessagesRequestBuilderGetQueryParametersMapper,
     },
     post: {
+        uriTemplate: MessagesRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageFromDiscriminatorValue,
@@ -146,9 +150,5 @@ export const MessagesRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const MessagesRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages{?%24count,%24expand,%24filter,%24orderby,%24search,%24select,%24skip,%24top,includeHiddenMessages}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/count/index.ts b/packages/test/generatedCode/users/item/messages/item/attachments/count/index.ts
index c09311b33..448e5c3b7 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/count/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/count/index.ts
@@ -11,13 +11,14 @@ export interface CountRequestBuilder extends BaseRequestBuilder<CountRequestBuil
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Integer
+     * @returns {Promise<number>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : Promise<number | undefined>;
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -30,6 +31,10 @@ export interface CountRequestBuilderGetQueryParameters {
      */
     filter?: string;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/{message%2Did}/attachments/$count{?%24filter}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -41,19 +46,15 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: CountRequestBuilderUriTemplate,
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "number",
         queryParametersMapper: CountRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/{message%2Did}/attachments/$count{?%24filter}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/index.ts b/packages/test/generatedCode/users/item/messages/item/attachments/index.ts
index 372c7a924..d753e0639 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/index.ts
@@ -3,8 +3,8 @@
 // Generated by Microsoft Kiota
 import { createAttachmentCollectionResponseFromDiscriminatorValue, createAttachmentFromDiscriminatorValue, serializeAttachment, type Attachment, type AttachmentCollectionResponse } from '../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../models/oDataErrors/';
-import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
-import { AttachmentItemRequestBuilderRequestsMetadata, AttachmentItemRequestBuilderUriTemplate, type AttachmentItemRequestBuilder } from './item/';
+import { CountRequestBuilderRequestsMetadata, type CountRequestBuilder } from './count/';
+import { AttachmentItemRequestBuilderRequestsMetadata, type AttachmentItemRequestBuilder } from './item/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -18,13 +18,14 @@ export interface AttachmentsRequestBuilder extends BaseRequestBuilder<Attachment
     /**
      * Gets an item from the ApiSdk.users.item.messages.item.attachments.item collection
      * @param attachmentId The unique identifier of attachment
-     * @returns a AttachmentItemRequestBuilder
+     * @returns {AttachmentItemRequestBuilder}
      */
      byAttachmentId(attachmentId: string) : AttachmentItemRequestBuilder;
     /**
      * Retrieve a list of attachment objects attached to a message.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of AttachmentCollectionResponse
+     * @returns {Promise<AttachmentCollectionResponse>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/message-list-attachments?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<AttachmentsRequestBuilderGetQueryParameters> | undefined) : Promise<AttachmentCollectionResponse | undefined>;
@@ -32,21 +33,22 @@ export interface AttachmentsRequestBuilder extends BaseRequestBuilder<Attachment
      * Use this API to create a new Attachment. An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Attachment
+     * @returns {Promise<Attachment>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/eventmessage-post-attachments?view=graph-rest-1.0|Find more info here}
      */
      post(body: Attachment, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<Attachment | undefined>;
     /**
      * Retrieve a list of attachment objects attached to a message.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<AttachmentsRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Use this API to create a new Attachment. An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPostRequestInformation(body: Attachment, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -75,6 +77,10 @@ export interface AttachmentsRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const AttachmentsRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/{message%2Did}/attachments{?%24count,%24expand,%24filter,%24orderby,%24select}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -90,12 +96,10 @@ const AttachmentsRequestBuilderGetQueryParametersMapper: Record<string, string>
  */
 export const AttachmentsRequestBuilderNavigationMetadata: Record<Exclude<keyof AttachmentsRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     byAttachmentId: {
-        uriTemplate: AttachmentItemRequestBuilderUriTemplate,
         requestsMetadata: AttachmentItemRequestBuilderRequestsMetadata,
         pathParametersMappings: ["attachment%2Did"],
     },
     count: {
-        uriTemplate: CountRequestBuilderUriTemplate,
         requestsMetadata: CountRequestBuilderRequestsMetadata,
     },
 };
@@ -104,20 +108,20 @@ export const AttachmentsRequestBuilderNavigationMetadata: Record<Exclude<keyof A
  */
 export const AttachmentsRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: AttachmentsRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createAttachmentCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: AttachmentsRequestBuilderGetQueryParametersMapper,
     },
     post: {
+        uriTemplate: AttachmentsRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createAttachmentFromDiscriminatorValue,
@@ -126,9 +130,5 @@ export const AttachmentsRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const AttachmentsRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/{message%2Did}/attachments{?%24count,%24expand,%24filter,%24orderby,%24select}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/item/index.ts b/packages/test/generatedCode/users/item/messages/item/attachments/item/index.ts
index 4c56aa950..eb027530b 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/item/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/item/index.ts
@@ -12,26 +12,28 @@ export interface AttachmentItemRequestBuilder extends BaseRequestBuilder<Attachm
     /**
      * Delete navigation property attachments for users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      delete(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * Read the properties, relationships, or raw contents of an attachment that is attached to a user event, message, or group post. An attachment can be one of the following types: All these types of attachments are derived from the attachment resource.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Attachment
+     * @returns {Promise<Attachment>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/attachment-get?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<AttachmentItemRequestBuilderGetQueryParameters> | undefined) : Promise<Attachment | undefined>;
     /**
      * Delete navigation property attachments for users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toDeleteRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * Read the properties, relationships, or raw contents of an attachment that is attached to a user event, message, or group post. An attachment can be one of the following types: All these types of attachments are derived from the attachment resource.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<AttachmentItemRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -48,6 +50,10 @@ export interface AttachmentItemRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const AttachmentItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/{message%2Did}/attachments/{attachment%2Did}{?%24expand,%24select}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -60,28 +66,24 @@ const AttachmentItemRequestBuilderGetQueryParametersMapper: Record<string, strin
  */
 export const AttachmentItemRequestBuilderRequestsMetadata: RequestsMetadata = {
     delete: {
+        uriTemplate: AttachmentItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     get: {
+        uriTemplate: AttachmentItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createAttachmentFromDiscriminatorValue,
         queryParametersMapper: AttachmentItemRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const AttachmentItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/{message%2Did}/attachments/{attachment%2Did}{?%24expand,%24select}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/count/index.ts b/packages/test/generatedCode/users/item/messages/item/extensions/count/index.ts
index ee7d67269..eb88292a7 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/count/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/count/index.ts
@@ -11,13 +11,14 @@ export interface CountRequestBuilder extends BaseRequestBuilder<CountRequestBuil
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Integer
+     * @returns {Promise<number>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : Promise<number | undefined>;
     /**
      * Get the number of the resource
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<CountRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
 }
@@ -30,6 +31,10 @@ export interface CountRequestBuilderGetQueryParameters {
      */
     filter?: string;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/{message%2Did}/extensions/$count{?%24filter}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -41,19 +46,15 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
  */
 export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: CountRequestBuilderUriTemplate,
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "number",
         queryParametersMapper: CountRequestBuilderGetQueryParametersMapper,
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const CountRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/{message%2Did}/extensions/$count{?%24filter}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/index.ts b/packages/test/generatedCode/users/item/messages/item/extensions/index.ts
index 6deb94425..4c03e39a5 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/index.ts
@@ -3,8 +3,8 @@
 // Generated by Microsoft Kiota
 import { createExtensionCollectionResponseFromDiscriminatorValue, createExtensionFromDiscriminatorValue, serializeExtension, type Extension, type ExtensionCollectionResponse } from '../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../models/oDataErrors/';
-import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
-import { ExtensionItemRequestBuilderRequestsMetadata, ExtensionItemRequestBuilderUriTemplate, type ExtensionItemRequestBuilder } from './item/';
+import { CountRequestBuilderRequestsMetadata, type CountRequestBuilder } from './count/';
+import { ExtensionItemRequestBuilderRequestsMetadata, type ExtensionItemRequestBuilder } from './item/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -18,34 +18,36 @@ export interface ExtensionsRequestBuilder extends BaseRequestBuilder<ExtensionsR
     /**
      * Gets an item from the ApiSdk.users.item.messages.item.extensions.item collection
      * @param extensionId The unique identifier of extension
-     * @returns a ExtensionItemRequestBuilder
+     * @returns {ExtensionItemRequestBuilder}
      */
      byExtensionId(extensionId: string) : ExtensionItemRequestBuilder;
     /**
      * Get an open extension (openTypeExtension object) identified by name or fully qualified name. The table in the Permissions section lists the resources that support open extensions. The following table lists the three scenarios where you can get an open extension from a supported resource instance.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ExtensionCollectionResponse
+     * @returns {Promise<ExtensionCollectionResponse>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      get(requestConfiguration?: RequestConfiguration<ExtensionsRequestBuilderGetQueryParameters> | undefined) : Promise<ExtensionCollectionResponse | undefined>;
     /**
      * Create an open extension (openTypeExtension object) and add custom properties in a new or existing instance of a resource. You can create an open extension in a resource instance and store custom data to it all in the same operation, except for specific resources. The table in the Permissions section lists the resources that support open extensions.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Extension
+     * @returns {Promise<Extension>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-post-opentypeextension?view=graph-rest-1.0|Find more info here}
      */
      post(body: Extension, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<Extension | undefined>;
     /**
      * Get an open extension (openTypeExtension object) identified by name or fully qualified name. The table in the Permissions section lists the resources that support open extensions. The following table lists the three scenarios where you can get an open extension from a supported resource instance.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<ExtensionsRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Create an open extension (openTypeExtension object) and add custom properties in a new or existing instance of a resource. You can create an open extension in a resource instance and store custom data to it all in the same operation, except for specific resources. The table in the Permissions section lists the resources that support open extensions.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPostRequestInformation(body: Extension, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -82,6 +84,10 @@ export interface ExtensionsRequestBuilderGetQueryParameters {
      */
     top?: number;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const ExtensionsRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/{message%2Did}/extensions{?%24count,%24expand,%24filter,%24orderby,%24select,%24skip,%24top}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -99,12 +105,10 @@ const ExtensionsRequestBuilderGetQueryParametersMapper: Record<string, string> =
  */
 export const ExtensionsRequestBuilderNavigationMetadata: Record<Exclude<keyof ExtensionsRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     byExtensionId: {
-        uriTemplate: ExtensionItemRequestBuilderUriTemplate,
         requestsMetadata: ExtensionItemRequestBuilderRequestsMetadata,
         pathParametersMappings: ["extension%2Did"],
     },
     count: {
-        uriTemplate: CountRequestBuilderUriTemplate,
         requestsMetadata: CountRequestBuilderRequestsMetadata,
     },
 };
@@ -113,20 +117,20 @@ export const ExtensionsRequestBuilderNavigationMetadata: Record<Exclude<keyof Ex
  */
 export const ExtensionsRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: ExtensionsRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createExtensionCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: ExtensionsRequestBuilderGetQueryParametersMapper,
     },
     post: {
+        uriTemplate: ExtensionsRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createExtensionFromDiscriminatorValue,
@@ -135,9 +139,5 @@ export const ExtensionsRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const ExtensionsRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/{message%2Did}/extensions{?%24count,%24expand,%24filter,%24orderby,%24select,%24skip,%24top}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/item/index.ts b/packages/test/generatedCode/users/item/messages/item/extensions/item/index.ts
index da37f4345..3290124e1 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/item/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/item/index.ts
@@ -12,14 +12,16 @@ export interface ExtensionItemRequestBuilder extends BaseRequestBuilder<Extensio
     /**
      * Delete an open extension (openTypeExtension object) from the specified instance of a resource.  For the list of resources that support open extensions, see the table in the Permissions section.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-delete?view=graph-rest-1.0|Find more info here}
      */
      delete(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * Get an open extension (openTypeExtension object) identified by name or fully qualified name. The table in the Permissions section lists the resources that support open extensions. The following table lists the three scenarios where you can get an open extension from a supported resource instance.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Extension
+     * @returns {Promise<Extension>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-get?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<ExtensionItemRequestBuilderGetQueryParameters> | undefined) : Promise<Extension | undefined>;
@@ -27,26 +29,27 @@ export interface ExtensionItemRequestBuilder extends BaseRequestBuilder<Extensio
      * Update the navigation property extensions in users
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Extension
+     * @returns {Promise<Extension>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      patch(body: Extension, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<Extension | undefined>;
     /**
      * Delete an open extension (openTypeExtension object) from the specified instance of a resource.  For the list of resources that support open extensions, see the table in the Permissions section.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toDeleteRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * Get an open extension (openTypeExtension object) identified by name or fully qualified name. The table in the Permissions section lists the resources that support open extensions. The following table lists the three scenarios where you can get an open extension from a supported resource instance.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<ExtensionItemRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Update the navigation property extensions in users
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPatchRequestInformation(body: Extension, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -63,6 +66,10 @@ export interface ExtensionItemRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const ExtensionItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/{message%2Did}/extensions/{extension%2Did}{?%24expand,%24select}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -75,29 +82,29 @@ const ExtensionItemRequestBuilderGetQueryParametersMapper: Record<string, string
  */
 export const ExtensionItemRequestBuilderRequestsMetadata: RequestsMetadata = {
     delete: {
+        uriTemplate: ExtensionItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     get: {
+        uriTemplate: ExtensionItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createExtensionFromDiscriminatorValue,
         queryParametersMapper: ExtensionItemRequestBuilderGetQueryParametersMapper,
     },
     patch: {
+        uriTemplate: ExtensionItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createExtensionFromDiscriminatorValue,
@@ -106,9 +113,5 @@ export const ExtensionItemRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const ExtensionItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/{message%2Did}/extensions/{extension%2Did}{?%24expand,%24select}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/messages/item/index.ts b/packages/test/generatedCode/users/item/messages/item/index.ts
index 69d528ea1..b32c04a1e 100644
--- a/packages/test/generatedCode/users/item/messages/item/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/index.ts
@@ -3,9 +3,9 @@
 // Generated by Microsoft Kiota
 import { createMessageFromDiscriminatorValue, serializeMessage, type Message } from '../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../models/oDataErrors/';
-import { AttachmentsRequestBuilderNavigationMetadata, AttachmentsRequestBuilderRequestsMetadata, AttachmentsRequestBuilderUriTemplate, type AttachmentsRequestBuilder } from './attachments/';
-import { ExtensionsRequestBuilderNavigationMetadata, ExtensionsRequestBuilderRequestsMetadata, ExtensionsRequestBuilderUriTemplate, type ExtensionsRequestBuilder } from './extensions/';
-import { ContentRequestBuilderRequestsMetadata, ContentRequestBuilderUriTemplate, type ContentRequestBuilder } from './value/';
+import { AttachmentsRequestBuilderNavigationMetadata, AttachmentsRequestBuilderRequestsMetadata, type AttachmentsRequestBuilder } from './attachments/';
+import { ExtensionsRequestBuilderNavigationMetadata, ExtensionsRequestBuilderRequestsMetadata, type ExtensionsRequestBuilder } from './extensions/';
+import { ContentRequestBuilderRequestsMetadata, type ContentRequestBuilder } from './value/';
 import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
@@ -27,14 +27,16 @@ export interface MessageItemRequestBuilder extends BaseRequestBuilder<MessageIte
     /**
      * Delete a message in the specified user's mailbox, or delete a relationship of the message.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/message-delete?view=graph-rest-1.0|Find more info here}
      */
      delete(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * The messages in a mailbox or folder. Read-only. Nullable.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Message
+     * @returns {Promise<Message>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/eventmessage-get?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<MessageItemRequestBuilderGetQueryParameters> | undefined) : Promise<Message | undefined>;
@@ -42,27 +44,28 @@ export interface MessageItemRequestBuilder extends BaseRequestBuilder<MessageIte
      * Update the properties of an eventMessage object.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of Message
+     * @returns {Promise<Message>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/eventmessage-update?view=graph-rest-1.0|Find more info here}
      */
      patch(body: Message, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<Message | undefined>;
     /**
      * Delete a message in the specified user's mailbox, or delete a relationship of the message.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toDeleteRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * The messages in a mailbox or folder. Read-only. Nullable.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<MessageItemRequestBuilderGetQueryParameters> | undefined) : RequestInformation;
     /**
      * Update the properties of an eventMessage object.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPatchRequestInformation(body: Message, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
@@ -83,6 +86,10 @@ export interface MessageItemRequestBuilderGetQueryParameters {
      */
     select?: string[];
 }
+/**
+ * Uri template for the request builder.
+ */
+export const MessageItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/{message%2Did}{?%24expand,%24select,includeHiddenMessages}";
 /**
  * Mapper for query parameters from symbol name to serialization name represented as a constant.
  */
@@ -95,16 +102,13 @@ const MessageItemRequestBuilderGetQueryParametersMapper: Record<string, string>
  */
 export const MessageItemRequestBuilderNavigationMetadata: Record<Exclude<keyof MessageItemRequestBuilder, KeysToExcludeForNavigationMetadata>, NavigationMetadata> = {
     attachments: {
-        uriTemplate: AttachmentsRequestBuilderUriTemplate,
         requestsMetadata: AttachmentsRequestBuilderRequestsMetadata,
         navigationMetadata: AttachmentsRequestBuilderNavigationMetadata,
     },
     content: {
-        uriTemplate: ContentRequestBuilderUriTemplate,
         requestsMetadata: ContentRequestBuilderRequestsMetadata,
     },
     extensions: {
-        uriTemplate: ExtensionsRequestBuilderUriTemplate,
         requestsMetadata: ExtensionsRequestBuilderRequestsMetadata,
         navigationMetadata: ExtensionsRequestBuilderNavigationMetadata,
     },
@@ -114,29 +118,29 @@ export const MessageItemRequestBuilderNavigationMetadata: Record<Exclude<keyof M
  */
 export const MessageItemRequestBuilderRequestsMetadata: RequestsMetadata = {
     delete: {
+        uriTemplate: MessageItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     get: {
+        uriTemplate: MessageItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageFromDiscriminatorValue,
         queryParametersMapper: MessageItemRequestBuilderGetQueryParametersMapper,
     },
     patch: {
+        uriTemplate: MessageItemRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendAsync",
         responseBodyFactory:  createMessageFromDiscriminatorValue,
@@ -145,9 +149,5 @@ export const MessageItemRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setContentFromParsable",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const MessageItemRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/{message%2Did}{?%24expand,%24select,includeHiddenMessages}";
 /* tslint:enable */
 /* eslint-enable */
diff --git a/packages/test/generatedCode/users/item/messages/item/value/index.ts b/packages/test/generatedCode/users/item/messages/item/value/index.ts
index 426dfdbfe..2bd37760c 100644
--- a/packages/test/generatedCode/users/item/messages/item/value/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/value/index.ts
@@ -11,7 +11,8 @@ export interface ContentRequestBuilder extends BaseRequestBuilder<ContentRequest
     /**
      * Get media content for the navigation property messages from users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-get?view=graph-rest-1.0|Find more info here}
      */
      get(requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
@@ -19,41 +20,46 @@ export interface ContentRequestBuilder extends BaseRequestBuilder<ContentRequest
      * Update media content for the navigation property messages in users
      * @param body Binary request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a Promise of ArrayBuffer
+     * @returns {Promise<ArrayBuffer>}
+     * @throws {ODataError} error when the service returns a 4XX or 5XX status code
      */
      put(body: ArrayBuffer | undefined, requestConfiguration?: RequestConfiguration<object> | undefined) : Promise<ArrayBuffer | undefined>;
     /**
      * Get media content for the navigation property messages from users
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toGetRequestInformation(requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
     /**
      * Update media content for the navigation property messages in users
      * @param body Binary request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
-     * @returns a RequestInformation
+     * @returns {RequestInformation}
      */
      toPutRequestInformation(body: ArrayBuffer | undefined, requestConfiguration?: RequestConfiguration<object> | undefined) : RequestInformation;
 }
+/**
+ * Uri template for the request builder.
+ */
+export const ContentRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/{message%2Did}/$value";
 /**
  * Metadata for all the requests in the request builder.
  */
 export const ContentRequestBuilderRequestsMetadata: RequestsMetadata = {
     get: {
+        uriTemplate: ContentRequestBuilderUriTemplate,
         responseBodyContentType: "application/octet-stream, application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
     put: {
+        uriTemplate: ContentRequestBuilderUriTemplate,
         responseBodyContentType: "application/json",
         errorMappings: {
-            _4XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
-            _5XX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
+            XXX: createODataErrorFromDiscriminatorValue as ParsableFactory<Parsable>,
         },
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
@@ -61,9 +67,5 @@ export const ContentRequestBuilderRequestsMetadata: RequestsMetadata = {
         requestInformationContentSetMethod: "setStreamContent",
     },
 };
-/**
- * Uri template for the request builder.
- */
-export const ContentRequestBuilderUriTemplate = "{+baseurl}/users/{user%2Did}/messages/{message%2Did}/$value";
 /* tslint:enable */
 /* eslint-enable */