From 484b0988574bb765cba7de6316ca6d20309fc39e Mon Sep 17 00:00:00 2001
From: Geoffrey Koros <gkoros@microsoft.com>
Date: Mon, 14 Aug 2023 18:56:55 +0300
Subject: [PATCH 01/11] update the abstraction lib to use import type for
 interfaces

---
 packages/abstractions/src/apiClientBuilder.ts |  6 ++--
 .../anonymousAuthenticationProvider.ts        |  2 +-
 .../apiKeyAuthenticationProvider.ts           |  2 +-
 .../baseBearerTokenAuthenticationProvider.ts  |  4 +--
 .../abstractions/src/baseRequestBuilder.ts    |  2 +-
 packages/abstractions/src/multipartBody.ts    |  4 +--
 .../abstractions/src/nativeResponseHandler.ts |  5 ++--
 .../abstractions/src/nativeResponseWrapper.ts |  2 +-
 packages/abstractions/src/requestAdapter.ts   |  9 ++----
 .../abstractions/src/requestInformation.ts    |  7 ++---
 packages/abstractions/src/responseHandler.ts  |  3 +-
 .../src/responseHandlerOptions.ts             |  4 +--
 .../src/serialization/parsableFactory.ts      |  4 +--
 .../src/serialization/parseNode.ts            |  2 +-
 .../src/serialization/parseNodeFactory.ts     |  2 +-
 .../serialization/parseNodeFactoryRegistry.ts |  4 +--
 .../serialization/parseNodeProxyFactory.ts    |  6 ++--
 .../serializationFunctionTypes.ts             |  6 ++--
 .../src/serialization/serializationWriter.ts  |  2 +-
 .../serializationWriterFactory.ts             |  2 +-
 .../serializationWriterFactoryRegistry.ts     |  4 +--
 .../serializationWriterProxyFactory.ts        |  6 ++--
 .../src/store/backingStoreFactory.ts          |  2 +-
 .../src/store/backingStoreFactorySingleton.ts |  2 +-
 .../src/store/backingStoreParseNodeFactory.ts |  5 ++--
 ...ingStoreSerializationWriterProxyFactory.ts |  8 ++----
 .../src/store/inMemoryBackingStore.ts         |  2 +-
 .../src/store/inMemoryBackingStoreFactory.ts  |  4 +--
 .../abstractions/test/common/multipartBody.ts |  2 +-
 .../test/common/requestInformation.ts         |  8 ++++--
 .../src/azureIdentityAccessTokenProvider.ts   |  8 ++----
 .../azureIdentityAuthenticationProvider.ts    |  6 ++--
 .../src/azureAdSpfxAccessTokenProvider.ts     |  8 ++----
 .../src/azureAdSpfxAuthenticationProvider.ts  |  3 +-
 .../http/fetch/src/fetchRequestAdapter.ts     |  7 +++--
 packages/http/fetch/src/httpClient.ts         |  4 +--
 packages/http/fetch/src/kiotaClientFactory.ts |  2 +-
 .../middlewares/browser/middlewareFactory.ts  |  2 +-
 .../fetch/src/middlewares/chaosHandler.ts     |  7 +++--
 .../src/middlewares/customFetchHandler.ts     |  2 +-
 .../http/fetch/src/middlewares/middleware.ts  |  2 +-
 .../src/middlewares/middlewareFactory.ts      |  2 +-
 .../options/chaosHandlerOptions.ts            |  6 ++--
 .../options/parametersNameDecodingOptions.ts  |  2 +-
 .../options/redirectHandlerOptions.ts         |  2 +-
 .../options/retryHandlerOptions.ts            |  2 +-
 .../options/telemetryHandlerOptions.ts        |  2 +-
 .../options/userAgentHandlerOptions.ts        |  2 +-
 .../parametersNameDecodingHandler.ts          |  4 +--
 .../fetch/src/middlewares/redirectHandler.ts  |  5 ++--
 .../fetch/src/middlewares/retryHandler.ts     |  5 ++--
 .../fetch/src/middlewares/telemetryHandler.ts |  6 ++--
 .../fetch/src/middlewares/userAgentHandler.ts |  4 +--
 .../http/fetch/src/observabilityOptions.ts    |  2 +-
 .../fetch/test/common/fetchRequestAdapter.ts  |  3 +-
 .../common/middleware/dummyFetchHandler.ts    |  4 +--
 .../middleware/testCallBackMiddleware.ts      |  4 +--
 packages/http/fetch/test/common/mockEntity.ts |  2 +-
 .../fetch/test/common/mockParseNodeFactory.ts |  3 +-
 .../form/src/browser/formParseNodeFactory.ts  |  3 +-
 .../serialization/form/src/formParseNode.ts   |  3 +-
 .../form/src/formParseNodeFactory.ts          |  2 +-
 .../form/src/formSerializationWriter.ts       |  3 +-
 .../src/formSerializationWriterFactory.ts     |  2 +-
 .../form/test/common/formParseNode.ts         |  6 ++--
 .../test/common/formSerializationWriter.ts    |  3 +-
 .../serialization/form/test/testEntity.ts     |  8 ++++--
 .../json/src/browser/jsonParseNodeFactory.ts  |  3 +-
 .../serialization/json/src/jsonParseNode.ts   |  3 +-
 .../json/src/jsonParseNodeFactory.ts          |  2 +-
 .../json/src/jsonSerializationWriter.ts       |  6 ++--
 .../src/jsonSerializationWriterFactory.ts     |  2 +-
 .../json/test/common/JsonParseNode.ts         |  6 ++--
 .../test/common/jsonSerializationWriter.ts    |  4 ++-
 .../json/test/common/testEntity.ts            |  3 +-
 .../src/multipartSerializationWriter.ts       |  6 ++--
 .../multipartSerializationWriterFactory.ts    |  2 +-
 .../common/multipartSerializationWriter.ts    |  5 ++--
 .../multipart/test/testEntity.ts              |  8 ++++--
 .../text/src/browser/textParseNodeFactory.ts  |  3 +-
 .../serialization/text/src/textParseNode.ts   |  3 +-
 .../text/src/textParseNodeFactory.ts          |  2 +-
 .../text/src/textSerializationWriter.ts       |  3 +-
 .../src/textSerializationWriterFactory.ts     |  2 +-
 packages/test/generatedCode/apiClient.ts      |  5 +++-
 packages/test/generatedCode/kiota-lock.json   | 10 ++++---
 .../test/generatedCode/models/attachment.ts   |  4 +--
 .../models/attachmentCollectionResponse.ts    |  4 +--
 .../generatedCode/models/dateTimeTimeZone.ts  |  2 +-
 .../models/deserializeIntoAttachment.ts       |  4 +--
 ...rializeIntoAttachmentCollectionResponse.ts |  6 ++--
 .../models/deserializeIntoDateTimeTimeZone.ts |  4 +--
 .../models/deserializeIntoEmailAddress.ts     |  4 +--
 .../models/deserializeIntoEntity.ts           |  4 +--
 .../models/deserializeIntoExtension.ts        |  4 +--
 ...erializeIntoExtensionCollectionResponse.ts |  6 ++--
 .../models/deserializeIntoFollowupFlag.ts     |  6 ++--
 .../deserializeIntoInferenceClassification.ts |  6 ++--
 ...lizeIntoInferenceClassificationOverride.ts |  6 ++--
 ...lassificationOverrideCollectionResponse.ts |  6 ++--
 .../deserializeIntoInternetMessageHeader.ts   |  4 +--
 .../models/deserializeIntoItemBody.ts         |  4 +--
 .../models/deserializeIntoMailFolder.ts       | 12 ++++----
 ...rializeIntoMailFolderCollectionResponse.ts |  6 ++--
 .../models/deserializeIntoMessage.ts          | 20 ++++++-------
 ...eserializeIntoMessageCollectionResponse.ts |  6 ++--
 .../models/deserializeIntoMessageRule.ts      |  8 +++---
 .../deserializeIntoMessageRuleActions.ts      |  6 ++--
 ...ializeIntoMessageRuleCollectionResponse.ts |  6 ++--
 .../deserializeIntoMessageRulePredicates.ts   |  8 +++---
 ...izeIntoMultiValueLegacyExtendedProperty.ts |  4 +--
 .../models/deserializeIntoOutlookItem.ts      |  4 +--
 .../models/deserializeIntoRecipient.ts        |  6 ++--
 ...zeIntoSingleValueLegacyExtendedProperty.ts |  4 +--
 .../models/deserializeIntoSizeRange.ts        |  4 +--
 .../test/generatedCode/models/emailAddress.ts |  2 +-
 packages/test/generatedCode/models/entity.ts  |  2 +-
 .../test/generatedCode/models/extension.ts    |  4 +--
 .../models/extensionCollectionResponse.ts     |  4 +--
 .../test/generatedCode/models/followupFlag.ts |  4 +--
 .../models/inferenceClassification.ts         |  6 ++--
 .../models/inferenceClassificationOverride.ts |  6 ++--
 ...lassificationOverrideCollectionResponse.ts |  4 +--
 .../models/internetMessageHeader.ts           |  2 +-
 .../test/generatedCode/models/itemBody.ts     |  2 +-
 .../test/generatedCode/models/mailFolder.ts   | 12 ++++----
 .../models/mailFolderCollectionResponse.ts    |  4 +--
 packages/test/generatedCode/models/message.ts | 20 ++++++-------
 .../models/messageCollectionResponse.ts       |  4 +--
 .../test/generatedCode/models/messageRule.ts  |  8 +++---
 .../models/messageRuleActions.ts              |  4 +--
 .../models/messageRuleCollectionResponse.ts   |  4 +--
 .../models/messageRulePredicates.ts           |  6 ++--
 .../multiValueLegacyExtendedProperty.ts       |  4 +--
 .../test/generatedCode/models/outlookItem.ts  |  4 +--
 .../test/generatedCode/models/recipient.ts    |  4 +--
 .../models/serializeAttachment.ts             |  4 +--
 .../serializeAttachmentCollectionResponse.ts  |  6 ++--
 .../models/serializeDateTimeTimeZone.ts       |  4 +--
 .../models/serializeEmailAddress.ts           |  4 +--
 .../generatedCode/models/serializeEntity.ts   |  4 +--
 .../models/serializeExtension.ts              |  4 +--
 .../serializeExtensionCollectionResponse.ts   |  6 ++--
 .../models/serializeFollowupFlag.ts           |  6 ++--
 .../serializeInferenceClassification.ts       |  6 ++--
 ...erializeInferenceClassificationOverride.ts |  6 ++--
 ...lassificationOverrideCollectionResponse.ts |  6 ++--
 .../models/serializeInternetMessageHeader.ts  |  4 +--
 .../generatedCode/models/serializeItemBody.ts |  4 +--
 .../models/serializeMailFolder.ts             | 12 ++++----
 .../serializeMailFolderCollectionResponse.ts  |  6 ++--
 .../generatedCode/models/serializeMessage.ts  | 20 ++++++-------
 .../serializeMessageCollectionResponse.ts     |  6 ++--
 .../models/serializeMessageRule.ts            |  8 +++---
 .../models/serializeMessageRuleActions.ts     |  6 ++--
 .../serializeMessageRuleCollectionResponse.ts |  6 ++--
 .../models/serializeMessageRulePredicates.ts  |  8 +++---
 ...rializeMultiValueLegacyExtendedProperty.ts |  4 +--
 .../models/serializeOutlookItem.ts            |  4 +--
 .../models/serializeRecipient.ts              |  6 ++--
 ...ializeSingleValueLegacyExtendedProperty.ts |  4 +--
 .../models/serializeSizeRange.ts              |  4 +--
 .../singleValueLegacyExtendedProperty.ts      |  4 +--
 .../test/generatedCode/models/sizeRange.ts    |  2 +-
 .../inferenceClassificationRequestBuilder.ts  | 12 ++++----
 ...onRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...RequestBuilderPatchRequestConfiguration.ts |  2 +-
 .../overrides/count/countRequestBuilder.ts    |  3 +-
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...lassificationOverrideItemRequestBuilder.ts | 20 ++++++-------
 ...equestBuilderDeleteRequestConfiguration.ts |  2 +-
 ...emRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...RequestBuilderPatchRequestConfiguration.ts |  2 +-
 .../overrides/overridesRequestBuilder.ts      | 22 +++++++--------
 ...esRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...sRequestBuilderPostRequestConfiguration.ts |  2 +-
 .../mailFolders/count/countRequestBuilder.ts  |  3 +-
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 .../childFoldersRequestBuilder.ts             | 28 +++++++++----------
 ...FoldersRequestBuilderGetQueryParameters.ts |  4 +++
 ...rsRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...sRequestBuilderPostRequestConfiguration.ts |  2 +-
 .../childFolders/count/countRequestBuilder.ts |  3 +-
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 .../item/mailFolderItemRequestBuilder.ts      | 14 +++++-----
 ...equestBuilderDeleteRequestConfiguration.ts |  2 +-
 ...derItemRequestBuilderGetQueryParameters.ts |  4 +++
 ...emRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...RequestBuilderPatchRequestConfiguration.ts |  2 +-
 .../messageRules/count/countRequestBuilder.ts |  3 +-
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 .../item/messageRuleItemRequestBuilder.ts     | 18 ++++++------
 ...equestBuilderDeleteRequestConfiguration.ts |  2 +-
 ...emRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...RequestBuilderPatchRequestConfiguration.ts |  2 +-
 .../messageRulesRequestBuilder.ts             | 18 ++++++------
 ...esRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...sRequestBuilderPostRequestConfiguration.ts |  2 +-
 .../messages/count/countRequestBuilder.ts     |  3 +-
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 .../attachments/attachmentsRequestBuilder.ts  | 18 ++++++------
 ...tsRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...sRequestBuilderPostRequestConfiguration.ts |  2 +-
 .../attachments/count/countRequestBuilder.ts  |  3 +-
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 .../item/attachmentItemRequestBuilder.ts      |  5 ++--
 ...equestBuilderDeleteRequestConfiguration.ts |  2 +-
 ...emRequestBuilderGetRequestConfiguration.ts |  2 +-
 .../extensions/count/countRequestBuilder.ts   |  3 +-
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 .../extensions/extensionsRequestBuilder.ts    | 20 ++++++-------
 ...nsRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...sRequestBuilderPostRequestConfiguration.ts |  2 +-
 .../item/extensionItemRequestBuilder.ts       | 20 ++++++-------
 ...equestBuilderDeleteRequestConfiguration.ts |  2 +-
 ...emRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...RequestBuilderPatchRequestConfiguration.ts |  2 +-
 .../item/messageItemRequestBuilder.ts         | 12 ++++----
 ...equestBuilderDeleteRequestConfiguration.ts |  2 +-
 ...emRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...RequestBuilderPatchRequestConfiguration.ts |  2 +-
 .../item/value/contentRequestBuilder.ts       |  6 ++--
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...ntRequestBuilderPutRequestConfiguration.ts |  2 +-
 .../item/messages/messagesRequestBuilder.ts   | 18 ++++++------
 ...esRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...sRequestBuilderPostRequestConfiguration.ts |  2 +-
 .../item/mailFolderItemRequestBuilder.ts      | 18 ++++++------
 ...equestBuilderDeleteRequestConfiguration.ts |  2 +-
 ...emRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...RequestBuilderPatchRequestConfiguration.ts |  2 +-
 .../messageRules/count/countRequestBuilder.ts |  3 +-
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 .../item/messageRuleItemRequestBuilder.ts     | 18 ++++++------
 ...equestBuilderDeleteRequestConfiguration.ts |  2 +-
 ...emRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...RequestBuilderPatchRequestConfiguration.ts |  2 +-
 .../messageRulesRequestBuilder.ts             | 18 ++++++------
 ...esRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...sRequestBuilderPostRequestConfiguration.ts |  2 +-
 .../messages/count/countRequestBuilder.ts     |  3 +-
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 .../attachments/attachmentsRequestBuilder.ts  | 18 ++++++------
 ...tsRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...sRequestBuilderPostRequestConfiguration.ts |  2 +-
 .../attachments/count/countRequestBuilder.ts  |  3 +-
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 .../item/attachmentItemRequestBuilder.ts      |  5 ++--
 ...equestBuilderDeleteRequestConfiguration.ts |  2 +-
 ...emRequestBuilderGetRequestConfiguration.ts |  2 +-
 .../extensions/count/countRequestBuilder.ts   |  3 +-
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 .../extensions/extensionsRequestBuilder.ts    | 20 ++++++-------
 ...nsRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...sRequestBuilderPostRequestConfiguration.ts |  2 +-
 .../item/extensionItemRequestBuilder.ts       | 20 ++++++-------
 ...equestBuilderDeleteRequestConfiguration.ts |  2 +-
 ...emRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...RequestBuilderPatchRequestConfiguration.ts |  2 +-
 .../item/messageItemRequestBuilder.ts         | 12 ++++----
 ...equestBuilderDeleteRequestConfiguration.ts |  2 +-
 ...emRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...RequestBuilderPatchRequestConfiguration.ts |  2 +-
 .../item/value/contentRequestBuilder.ts       |  6 ++--
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...ntRequestBuilderPutRequestConfiguration.ts |  2 +-
 .../item/messages/messagesRequestBuilder.ts   | 18 ++++++------
 ...esRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...sRequestBuilderPostRequestConfiguration.ts |  2 +-
 .../mailFolders/mailFoldersRequestBuilder.ts  | 22 +++++++--------
 ...rsRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...sRequestBuilderPostRequestConfiguration.ts |  2 +-
 .../messages/count/countRequestBuilder.ts     |  3 +-
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 .../attachments/attachmentsRequestBuilder.ts  | 18 ++++++------
 ...tsRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...sRequestBuilderPostRequestConfiguration.ts |  2 +-
 .../attachments/count/countRequestBuilder.ts  |  3 +-
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 .../item/attachmentItemRequestBuilder.ts      |  5 ++--
 ...equestBuilderDeleteRequestConfiguration.ts |  2 +-
 ...emRequestBuilderGetRequestConfiguration.ts |  2 +-
 .../extensions/count/countRequestBuilder.ts   |  3 +-
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 .../extensions/extensionsRequestBuilder.ts    | 20 ++++++-------
 ...nsRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...sRequestBuilderPostRequestConfiguration.ts |  2 +-
 .../item/extensionItemRequestBuilder.ts       | 20 ++++++-------
 ...equestBuilderDeleteRequestConfiguration.ts |  2 +-
 ...emRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...RequestBuilderPatchRequestConfiguration.ts |  2 +-
 .../item/messageItemRequestBuilder.ts         | 18 ++++++------
 ...equestBuilderDeleteRequestConfiguration.ts |  2 +-
 ...emRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...RequestBuilderPatchRequestConfiguration.ts |  2 +-
 .../item/value/contentRequestBuilder.ts       |  6 ++--
 ...ntRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...ntRequestBuilderPutRequestConfiguration.ts |  2 +-
 .../item/messages/messagesRequestBuilder.ts   | 22 +++++++--------
 ...esRequestBuilderGetRequestConfiguration.ts |  2 +-
 ...sRequestBuilderPostRequestConfiguration.ts |  2 +-
 .../users/item/userItemRequestBuilder.ts      |  3 +-
 .../users/usersRequestBuilder.ts              |  3 +-
 303 files changed, 782 insertions(+), 749 deletions(-)

diff --git a/packages/abstractions/src/apiClientBuilder.ts b/packages/abstractions/src/apiClientBuilder.ts
index de7ee6982..a46ce6a81 100644
--- a/packages/abstractions/src/apiClientBuilder.ts
+++ b/packages/abstractions/src/apiClientBuilder.ts
@@ -1,9 +1,11 @@
 import {
-  ParseNodeFactory,
   ParseNodeFactoryRegistry,
-  SerializationWriterFactory,
   SerializationWriterFactoryRegistry,
 } from "./serialization";
+import type {
+  ParseNodeFactory,
+  SerializationWriterFactory
+} from "./serialization";
 import {
   BackingStoreParseNodeFactory,
   BackingStoreSerializationWriterProxyFactory,
diff --git a/packages/abstractions/src/authentication/anonymousAuthenticationProvider.ts b/packages/abstractions/src/authentication/anonymousAuthenticationProvider.ts
index 9f3908dd3..5c2026f83 100644
--- a/packages/abstractions/src/authentication/anonymousAuthenticationProvider.ts
+++ b/packages/abstractions/src/authentication/anonymousAuthenticationProvider.ts
@@ -1,5 +1,5 @@
 import { RequestInformation } from "../requestInformation";
-import { AuthenticationProvider } from "./authenticationProvider";
+import type { AuthenticationProvider } from "./authenticationProvider";
 
 /** This authentication provider does not perform any authentication.   */
 export class AnonymousAuthenticationProvider implements AuthenticationProvider {
diff --git a/packages/abstractions/src/authentication/apiKeyAuthenticationProvider.ts b/packages/abstractions/src/authentication/apiKeyAuthenticationProvider.ts
index bc6ce38fa..dca8e455b 100644
--- a/packages/abstractions/src/authentication/apiKeyAuthenticationProvider.ts
+++ b/packages/abstractions/src/authentication/apiKeyAuthenticationProvider.ts
@@ -1,6 +1,6 @@
 import { RequestInformation } from "../requestInformation";
 import { AllowedHostsValidator } from "./allowedHostsValidator";
-import { AuthenticationProvider } from "./authenticationProvider";
+import type { AuthenticationProvider } from "./authenticationProvider";
 import { validateProtocol } from "./validateProtocol";
 
 /** Authenticate a request by using an API Key */
diff --git a/packages/abstractions/src/authentication/baseBearerTokenAuthenticationProvider.ts b/packages/abstractions/src/authentication/baseBearerTokenAuthenticationProvider.ts
index 21fd1b1cf..48114ede0 100644
--- a/packages/abstractions/src/authentication/baseBearerTokenAuthenticationProvider.ts
+++ b/packages/abstractions/src/authentication/baseBearerTokenAuthenticationProvider.ts
@@ -1,6 +1,6 @@
 import { RequestInformation } from "../requestInformation";
-import { AccessTokenProvider } from "./accessTokenProvider";
-import { AuthenticationProvider } from "./authenticationProvider";
+import type { AccessTokenProvider } from "./accessTokenProvider";
+import type { AuthenticationProvider } from "./authenticationProvider";
 
 /** Provides a base class for implementing AuthenticationProvider for Bearer token scheme. */
 export class BaseBearerTokenAuthenticationProvider
diff --git a/packages/abstractions/src/baseRequestBuilder.ts b/packages/abstractions/src/baseRequestBuilder.ts
index b12122b8f..7295d40fc 100644
--- a/packages/abstractions/src/baseRequestBuilder.ts
+++ b/packages/abstractions/src/baseRequestBuilder.ts
@@ -1,5 +1,5 @@
 import { getPathParameters } from "./getPathParameters";
-import { RequestAdapter } from "./requestAdapter";
+import type { RequestAdapter } from "./requestAdapter";
 
 export abstract class BaseRequestBuilder {
   /** Path parameters for the request */
diff --git a/packages/abstractions/src/multipartBody.ts b/packages/abstractions/src/multipartBody.ts
index 42d2af0de..2a256bd43 100644
--- a/packages/abstractions/src/multipartBody.ts
+++ b/packages/abstractions/src/multipartBody.ts
@@ -3,10 +3,8 @@ import { Guid } from "guid-typescript";
 import type { RequestAdapter } from "./requestAdapter";
 import type {
   ModelSerializerFunction,
-  ParseNode,
-  SerializationWriter,
 } from "./serialization";
-import type { Parsable } from "./serialization/parsable";
+import type { Parsable, ParseNode, SerializationWriter } from "./serialization";
 /**
  * Defines an interface for a multipart body for request or response.
  */
diff --git a/packages/abstractions/src/nativeResponseHandler.ts b/packages/abstractions/src/nativeResponseHandler.ts
index f43628665..a1f9ca90f 100644
--- a/packages/abstractions/src/nativeResponseHandler.ts
+++ b/packages/abstractions/src/nativeResponseHandler.ts
@@ -1,5 +1,6 @@
-import { ResponseHandler } from "./responseHandler";
-import { Parsable, ParsableFactory } from "./serialization";
+import type { ResponseHandler } from "./responseHandler";
+import { ParsableFactory } from "./serialization";
+import type { Parsable } from "./serialization";
 
 /** Default response handler to access the native response object. */
 export class NativeResponseHandler implements ResponseHandler {
diff --git a/packages/abstractions/src/nativeResponseWrapper.ts b/packages/abstractions/src/nativeResponseWrapper.ts
index d442cd665..61487ce26 100644
--- a/packages/abstractions/src/nativeResponseWrapper.ts
+++ b/packages/abstractions/src/nativeResponseWrapper.ts
@@ -1,6 +1,6 @@
 import { NativeResponseHandler } from "./nativeResponseHandler";
 import { RequestOption } from "./requestOption";
-import { ResponseHandler } from "./responseHandler";
+import type { ResponseHandler } from "./responseHandler";
 
 type originalCallType<modelType, queryParametersType, headersType> = (
   q?: queryParametersType,
diff --git a/packages/abstractions/src/requestAdapter.ts b/packages/abstractions/src/requestAdapter.ts
index 01eacb387..521157272 100644
--- a/packages/abstractions/src/requestAdapter.ts
+++ b/packages/abstractions/src/requestAdapter.ts
@@ -1,10 +1,7 @@
 import { RequestInformation } from "./requestInformation";
-import {
-  Parsable,
-  ParsableFactory,
-  SerializationWriterFactory,
-} from "./serialization";
-import { BackingStoreFactory } from "./store";
+import { ParsableFactory } from "./serialization";
+import type { Parsable, SerializationWriterFactory } from "./serialization";
+import type { BackingStoreFactory } from "./store";
 
 /** Service responsible for translating abstract Request Info into concrete native HTTP requests. */
 export interface RequestAdapter {
diff --git a/packages/abstractions/src/requestInformation.ts b/packages/abstractions/src/requestInformation.ts
index 5a5c4c50b..7769f051e 100644
--- a/packages/abstractions/src/requestInformation.ts
+++ b/packages/abstractions/src/requestInformation.ts
@@ -6,13 +6,12 @@ import { Duration } from "./duration";
 import { HttpMethod } from "./httpMethod";
 import { MultipartBody } from "./multipartBody";
 import { createRecordWithCaseInsensitiveKeys } from "./recordWithCaseInsensitiveKeys";
-import { RequestAdapter } from "./requestAdapter";
-import { RequestOption } from "./requestOption";
+import type { RequestAdapter } from "./requestAdapter";
+import type { RequestOption } from "./requestOption";
 import {
   ModelSerializerFunction,
-  Parsable,
-  SerializationWriter,
 } from "./serialization";
+import type { Parsable, SerializationWriter } from "./serialization";
 import { TimeOnly } from "./timeOnly";
 
 /** This class represents an abstract HTTP request. */
diff --git a/packages/abstractions/src/responseHandler.ts b/packages/abstractions/src/responseHandler.ts
index 0571eb891..df19d5b81 100644
--- a/packages/abstractions/src/responseHandler.ts
+++ b/packages/abstractions/src/responseHandler.ts
@@ -1,4 +1,5 @@
-import { Parsable, ParsableFactory } from "./serialization";
+import { ParsableFactory } from "./serialization";
+import type { Parsable } from "./serialization";
 
 /** Defines the contract for a response handler. */
 export interface ResponseHandler {
diff --git a/packages/abstractions/src/responseHandlerOptions.ts b/packages/abstractions/src/responseHandlerOptions.ts
index 756d93b3d..6959cadb1 100644
--- a/packages/abstractions/src/responseHandlerOptions.ts
+++ b/packages/abstractions/src/responseHandlerOptions.ts
@@ -5,8 +5,8 @@
  * -------------------------------------------------------------------------------------------
  */
 
-import { RequestOption } from "./requestOption";
-import { ResponseHandler } from "./responseHandler";
+import type { RequestOption } from "./requestOption";
+import type { ResponseHandler } from "./responseHandler";
 
 export const ResponseHandlerOptionKey = "ResponseHandlerOptionKey";
 
diff --git a/packages/abstractions/src/serialization/parsableFactory.ts b/packages/abstractions/src/serialization/parsableFactory.ts
index 14bf05a59..f86f169df 100644
--- a/packages/abstractions/src/serialization/parsableFactory.ts
+++ b/packages/abstractions/src/serialization/parsableFactory.ts
@@ -1,5 +1,5 @@
-import { Parsable } from "./parsable";
-import { ParseNode } from "./parseNode";
+import type { Parsable } from "./parsable";
+import type { ParseNode } from "./parseNode";
 import { DeserializeIntoModelFunction } from "./serializationFunctionTypes";
 
 /**
diff --git a/packages/abstractions/src/serialization/parseNode.ts b/packages/abstractions/src/serialization/parseNode.ts
index 1fba02e12..5e670875e 100644
--- a/packages/abstractions/src/serialization/parseNode.ts
+++ b/packages/abstractions/src/serialization/parseNode.ts
@@ -3,7 +3,7 @@ import { Guid } from "guid-typescript";
 import { DateOnly } from "../dateOnly";
 import { Duration } from "../duration";
 import { TimeOnly } from "../timeOnly";
-import { Parsable } from "./parsable";
+import type { Parsable } from "./parsable";
 import { ParsableFactory } from "./parsableFactory";
 
 /**
diff --git a/packages/abstractions/src/serialization/parseNodeFactory.ts b/packages/abstractions/src/serialization/parseNodeFactory.ts
index 30866012a..f6eb74447 100644
--- a/packages/abstractions/src/serialization/parseNodeFactory.ts
+++ b/packages/abstractions/src/serialization/parseNodeFactory.ts
@@ -1,4 +1,4 @@
-import { ParseNode } from "./parseNode";
+import type { ParseNode } from "./parseNode";
 
 /**
  * Defines the contract for a factory that is used to create {@link ParseNode}s.
diff --git a/packages/abstractions/src/serialization/parseNodeFactoryRegistry.ts b/packages/abstractions/src/serialization/parseNodeFactoryRegistry.ts
index 8c0897fbe..984be25e8 100644
--- a/packages/abstractions/src/serialization/parseNodeFactoryRegistry.ts
+++ b/packages/abstractions/src/serialization/parseNodeFactoryRegistry.ts
@@ -1,5 +1,5 @@
-import { ParseNode } from "./parseNode";
-import { ParseNodeFactory } from "./parseNodeFactory";
+import type { ParseNode } from "./parseNode";
+import type { ParseNodeFactory } from "./parseNodeFactory";
 
 /**
  * This factory holds a list of all the registered factories for the various types of nodes.
diff --git a/packages/abstractions/src/serialization/parseNodeProxyFactory.ts b/packages/abstractions/src/serialization/parseNodeProxyFactory.ts
index df8bbb4a0..c225407a1 100644
--- a/packages/abstractions/src/serialization/parseNodeProxyFactory.ts
+++ b/packages/abstractions/src/serialization/parseNodeProxyFactory.ts
@@ -1,6 +1,6 @@
-import { Parsable } from "./parsable";
-import { ParseNode } from "./parseNode";
-import { ParseNodeFactory } from "./parseNodeFactory";
+import type { Parsable } from "./parsable";
+import type { ParseNode } from "./parseNode";
+import type { ParseNodeFactory } from "./parseNodeFactory";
 
 /** Proxy factory that allows the composition of before and after callbacks on existing factories. */
 export abstract class ParseNodeProxyFactory implements ParseNodeFactory {
diff --git a/packages/abstractions/src/serialization/serializationFunctionTypes.ts b/packages/abstractions/src/serialization/serializationFunctionTypes.ts
index e5fbc9c36..965e269d8 100644
--- a/packages/abstractions/src/serialization/serializationFunctionTypes.ts
+++ b/packages/abstractions/src/serialization/serializationFunctionTypes.ts
@@ -1,6 +1,6 @@
-import { Parsable } from "./parsable";
-import { ParseNode } from "./parseNode";
-import { SerializationWriter } from "./serializationWriter";
+import type { Parsable } from "./parsable";
+import type { ParseNode } from "./parseNode";
+import type { SerializationWriter } from "./serializationWriter";
 
 export type ModelSerializerFunction<T extends Parsable> = (
   writer: SerializationWriter,
diff --git a/packages/abstractions/src/serialization/serializationWriter.ts b/packages/abstractions/src/serialization/serializationWriter.ts
index 8e3065f65..f69d90a46 100644
--- a/packages/abstractions/src/serialization/serializationWriter.ts
+++ b/packages/abstractions/src/serialization/serializationWriter.ts
@@ -3,7 +3,7 @@ import { Guid } from "guid-typescript";
 import { DateOnly } from "../dateOnly";
 import { Duration } from "../duration";
 import { TimeOnly } from "../timeOnly";
-import { Parsable } from "./parsable";
+import type { Parsable } from "./parsable";
 import { ModelSerializerFunction } from "./serializationFunctionTypes";
 
 /** Defines an interface for serialization of objects to a stream. */
diff --git a/packages/abstractions/src/serialization/serializationWriterFactory.ts b/packages/abstractions/src/serialization/serializationWriterFactory.ts
index 801e86a99..81c3dea31 100644
--- a/packages/abstractions/src/serialization/serializationWriterFactory.ts
+++ b/packages/abstractions/src/serialization/serializationWriterFactory.ts
@@ -1,4 +1,4 @@
-import { SerializationWriter } from "./serializationWriter";
+import type { SerializationWriter } from "./serializationWriter";
 
 /** Defines the contract for a factory that creates SerializationWriter instances. */
 export interface SerializationWriterFactory {
diff --git a/packages/abstractions/src/serialization/serializationWriterFactoryRegistry.ts b/packages/abstractions/src/serialization/serializationWriterFactoryRegistry.ts
index 47b7967e2..ab651dca9 100644
--- a/packages/abstractions/src/serialization/serializationWriterFactoryRegistry.ts
+++ b/packages/abstractions/src/serialization/serializationWriterFactoryRegistry.ts
@@ -1,5 +1,5 @@
-import { SerializationWriter } from "./serializationWriter";
-import { SerializationWriterFactory } from "./serializationWriterFactory";
+import type { SerializationWriter } from "./serializationWriter";
+import type { SerializationWriterFactory } from "./serializationWriterFactory";
 
 /** This factory holds a list of all the registered factories for the various types of nodes. */
 export class SerializationWriterFactoryRegistry
diff --git a/packages/abstractions/src/serialization/serializationWriterProxyFactory.ts b/packages/abstractions/src/serialization/serializationWriterProxyFactory.ts
index baaf6f6e7..5fd7be192 100644
--- a/packages/abstractions/src/serialization/serializationWriterProxyFactory.ts
+++ b/packages/abstractions/src/serialization/serializationWriterProxyFactory.ts
@@ -1,6 +1,6 @@
-import { Parsable } from "./parsable";
-import { SerializationWriter } from "./serializationWriter";
-import { SerializationWriterFactory } from "./serializationWriterFactory";
+import type { Parsable } from "./parsable";
+import type { SerializationWriter } from "./serializationWriter";
+import type { SerializationWriterFactory } from "./serializationWriterFactory";
 
 /** Proxy factory that allows the composition of before and after callbacks on existing factories. */
 export abstract class SerializationWriterProxyFactory
diff --git a/packages/abstractions/src/store/backingStoreFactory.ts b/packages/abstractions/src/store/backingStoreFactory.ts
index 8000dba64..373b0b1a1 100644
--- a/packages/abstractions/src/store/backingStoreFactory.ts
+++ b/packages/abstractions/src/store/backingStoreFactory.ts
@@ -1,4 +1,4 @@
-import { BackingStore } from "./backingStore";
+import type { BackingStore } from "./backingStore";
 
 /** Defines the contract for a factory that creates backing stores. */
 export interface BackingStoreFactory {
diff --git a/packages/abstractions/src/store/backingStoreFactorySingleton.ts b/packages/abstractions/src/store/backingStoreFactorySingleton.ts
index 4b85b9c8d..906a2b782 100644
--- a/packages/abstractions/src/store/backingStoreFactorySingleton.ts
+++ b/packages/abstractions/src/store/backingStoreFactorySingleton.ts
@@ -1,4 +1,4 @@
-import { BackingStoreFactory } from "./backingStoreFactory";
+import type { BackingStoreFactory } from "./backingStoreFactory";
 import { InMemoryBackingStoreFactory } from "./inMemoryBackingStoreFactory";
 
 export class BackingStoreFactorySingleton {
diff --git a/packages/abstractions/src/store/backingStoreParseNodeFactory.ts b/packages/abstractions/src/store/backingStoreParseNodeFactory.ts
index 300916033..cba7bf8ca 100644
--- a/packages/abstractions/src/store/backingStoreParseNodeFactory.ts
+++ b/packages/abstractions/src/store/backingStoreParseNodeFactory.ts
@@ -1,5 +1,6 @@
-import { ParseNodeFactory, ParseNodeProxyFactory } from "../serialization";
-import { BackedModel } from "./backedModel";
+import { ParseNodeProxyFactory } from "../serialization";
+import type { ParseNodeFactory } from "../serialization";
+import type { BackedModel } from "./backedModel";
 
 /** Proxy implementation of ParseNodeFactory for the backing store that automatically sets the state of the backing store when deserializing. */
 export class BackingStoreParseNodeFactory extends ParseNodeProxyFactory {
diff --git a/packages/abstractions/src/store/backingStoreSerializationWriterProxyFactory.ts b/packages/abstractions/src/store/backingStoreSerializationWriterProxyFactory.ts
index 2160852f7..3e0f2ba94 100644
--- a/packages/abstractions/src/store/backingStoreSerializationWriterProxyFactory.ts
+++ b/packages/abstractions/src/store/backingStoreSerializationWriterProxyFactory.ts
@@ -1,8 +1,6 @@
-import {
-  SerializationWriterFactory,
-  SerializationWriterProxyFactory,
-} from "../serialization";
-import { BackedModel } from "./backedModel";
+import { SerializationWriterProxyFactory } from "../serialization";
+import type { SerializationWriterFactory } from "../serialization";
+import type { BackedModel } from "./backedModel";
 
 /**Proxy implementation of SerializationWriterFactory for the backing store that automatically sets the state of the backing store when serializing. */
 export class BackingStoreSerializationWriterProxyFactory extends SerializationWriterProxyFactory {
diff --git a/packages/abstractions/src/store/inMemoryBackingStore.ts b/packages/abstractions/src/store/inMemoryBackingStore.ts
index 501ebf788..ae2fefb12 100644
--- a/packages/abstractions/src/store/inMemoryBackingStore.ts
+++ b/packages/abstractions/src/store/inMemoryBackingStore.ts
@@ -1,6 +1,6 @@
 import { v4 as uuidv4 } from "uuid";
 
-import { BackingStore } from "./backingStore";
+import type { BackingStore } from "./backingStore";
 
 interface storeEntryWrapper {
   changed: boolean;
diff --git a/packages/abstractions/src/store/inMemoryBackingStoreFactory.ts b/packages/abstractions/src/store/inMemoryBackingStoreFactory.ts
index 8ba49856f..0afaf8c90 100644
--- a/packages/abstractions/src/store/inMemoryBackingStoreFactory.ts
+++ b/packages/abstractions/src/store/inMemoryBackingStoreFactory.ts
@@ -1,5 +1,5 @@
-import { BackingStore } from "./backingStore";
-import { BackingStoreFactory } from "./backingStoreFactory";
+import type { BackingStore } from "./backingStore";
+import type { BackingStoreFactory } from "./backingStoreFactory";
 import { InMemoryBackingStore } from "./inMemoryBackingStore";
 
 /** This class is used to create instances of InMemoryBackingStore */
diff --git a/packages/abstractions/test/common/multipartBody.ts b/packages/abstractions/test/common/multipartBody.ts
index 772240c68..2ca2e1609 100644
--- a/packages/abstractions/test/common/multipartBody.ts
+++ b/packages/abstractions/test/common/multipartBody.ts
@@ -1,7 +1,7 @@
 import { assert } from "chai";
 
 import { MultipartBody, serializeMultipartBody } from "../../src/multipartBody";
-import { SerializationWriter } from "../../src/serialization";
+import type { SerializationWriter } from "../../src/serialization";
 describe("multipartBody", () => {
   it("implements defensive programming", () => {
     const mpBody = new MultipartBody();
diff --git a/packages/abstractions/test/common/requestInformation.ts b/packages/abstractions/test/common/requestInformation.ts
index 5503bfd43..f69c1544a 100644
--- a/packages/abstractions/test/common/requestInformation.ts
+++ b/packages/abstractions/test/common/requestInformation.ts
@@ -12,11 +12,13 @@ const assert = chai.assert;
 
 import {
   HttpMethod,
-  Parsable,
+  RequestInformation
+} from "../../src";
+import type { 
   RequestAdapter,
-  RequestInformation,
+  Parsable,
   SerializationWriter,
-  SerializationWriterFactory,
+  SerializationWriterFactory
 } from "../../src";
 import { MultipartBody } from "../../src/multipartBody";
 
diff --git a/packages/authentication/azure/src/azureIdentityAccessTokenProvider.ts b/packages/authentication/azure/src/azureIdentityAccessTokenProvider.ts
index c5515d8ec..ccf894025 100644
--- a/packages/authentication/azure/src/azureIdentityAccessTokenProvider.ts
+++ b/packages/authentication/azure/src/azureIdentityAccessTokenProvider.ts
@@ -1,15 +1,13 @@
 import { GetTokenOptions, TokenCredential } from "@azure/core-auth";
 import {
-  AccessTokenProvider,
   AllowedHostsValidator,
   validateProtocol,
 } from "@microsoft/kiota-abstractions";
+import type { AccessTokenProvider } from "@microsoft/kiota-abstractions";
 import { Span, trace } from "@opentelemetry/api";
 
-import {
-  ObservabilityOptions,
-  ObservabilityOptionsImpl,
-} from "./observabilityOptions";
+import { ObservabilityOptionsImpl } from "./observabilityOptions";
+import type { ObservabilityOptions } from "./observabilityOptions";
 
 /** Access token provider that leverages the Azure Identity library to retrieve an access token. */
 export class AzureIdentityAccessTokenProvider implements AccessTokenProvider {
diff --git a/packages/authentication/azure/src/azureIdentityAuthenticationProvider.ts b/packages/authentication/azure/src/azureIdentityAuthenticationProvider.ts
index ac6244be8..000a2c643 100644
--- a/packages/authentication/azure/src/azureIdentityAuthenticationProvider.ts
+++ b/packages/authentication/azure/src/azureIdentityAuthenticationProvider.ts
@@ -2,10 +2,8 @@ import { GetTokenOptions, TokenCredential } from "@azure/core-auth";
 import { BaseBearerTokenAuthenticationProvider } from "@microsoft/kiota-abstractions";
 
 import { AzureIdentityAccessTokenProvider } from "./azureIdentityAccessTokenProvider";
-import {
-  ObservabilityOptions,
-  ObservabilityOptionsImpl,
-} from "./observabilityOptions";
+import { ObservabilityOptionsImpl } from "./observabilityOptions";
+import type { ObservabilityOptions } from "./observabilityOptions";
 
 export class AzureIdentityAuthenticationProvider extends BaseBearerTokenAuthenticationProvider {
   /**
diff --git a/packages/authentication/spfx/src/azureAdSpfxAccessTokenProvider.ts b/packages/authentication/spfx/src/azureAdSpfxAccessTokenProvider.ts
index 8c7e6e533..9023ab9ee 100644
--- a/packages/authentication/spfx/src/azureAdSpfxAccessTokenProvider.ts
+++ b/packages/authentication/spfx/src/azureAdSpfxAccessTokenProvider.ts
@@ -1,15 +1,13 @@
 import {
-  AccessTokenProvider,
   AllowedHostsValidator,
   validateProtocol,
 } from "@microsoft/kiota-abstractions";
+import type { AccessTokenProvider } from "@microsoft/kiota-abstractions";
 import { AadTokenProvider } from "@microsoft/sp-http";
 import { Span, trace } from "@opentelemetry/api";
 
-import {
-  ObservabilityOptions,
-  ObservabilityOptionsImpl,
-} from "./observabilityOptions";
+import { ObservabilityOptionsImpl } from "./observabilityOptions";
+import type { ObservabilityOptions } from "./observabilityOptions";
 
 export class AzureAdSpfxAccessTokenProvider implements AccessTokenProvider {
   private readonly allowedHostsValidator: AllowedHostsValidator;
diff --git a/packages/authentication/spfx/src/azureAdSpfxAuthenticationProvider.ts b/packages/authentication/spfx/src/azureAdSpfxAuthenticationProvider.ts
index b163126bd..1ec8ce14f 100644
--- a/packages/authentication/spfx/src/azureAdSpfxAuthenticationProvider.ts
+++ b/packages/authentication/spfx/src/azureAdSpfxAuthenticationProvider.ts
@@ -1,7 +1,8 @@
 import { BaseBearerTokenAuthenticationProvider } from "@microsoft/kiota-abstractions";
 import { AadTokenProvider } from "@microsoft/sp-http";
 import { AzureAdSpfxAccessTokenProvider } from "./azureAdSpfxAccessTokenProvider";
-import { ObservabilityOptions, ObservabilityOptionsImpl } from "./observabilityOptions";
+import { ObservabilityOptionsImpl } from "./observabilityOptions";
+import type { ObservabilityOptions } from "./observabilityOptions";
 
 export class AzureAdSpfxAuthenticationProvider extends BaseBearerTokenAuthenticationProvider {
   /**
diff --git a/packages/http/fetch/src/fetchRequestAdapter.ts b/packages/http/fetch/src/fetchRequestAdapter.ts
index 4b959cacb..a3c414b65 100644
--- a/packages/http/fetch/src/fetchRequestAdapter.ts
+++ b/packages/http/fetch/src/fetchRequestAdapter.ts
@@ -1,8 +1,11 @@
-import { ApiError, AuthenticationProvider, BackingStoreFactory, BackingStoreFactorySingleton, DateOnly, DefaultApiError, Duration, enableBackingStoreForParseNodeFactory, enableBackingStoreForSerializationWriterFactory, Parsable, ParsableFactory, ParseNode, ParseNodeFactory, ParseNodeFactoryRegistry, RequestAdapter, RequestInformation, ResponseHandler, ResponseHandlerOption, ResponseHandlerOptionKey, SerializationWriterFactory, SerializationWriterFactoryRegistry, TimeOnly } from "@microsoft/kiota-abstractions";
+import { BackingStoreFactorySingleton, DateOnly, DefaultApiError, Duration, enableBackingStoreForParseNodeFactory, enableBackingStoreForSerializationWriterFactory, ParsableFactory, ParseNodeFactoryRegistry, RequestInformation, ResponseHandlerOption, ResponseHandlerOptionKey, SerializationWriterFactoryRegistry, TimeOnly } from "@microsoft/kiota-abstractions";
+import type { AuthenticationProvider, BackingStoreFactory, Parsable, ParseNode, ParseNodeFactory, SerializationWriterFactory } from "@microsoft/kiota-abstractions";
+import type { ApiError, RequestAdapter, ResponseHandler } from "@microsoft/kiota-abstractions";
 import { Span, SpanStatusCode, trace } from "@opentelemetry/api";
 
 import { HttpClient } from "./httpClient";
-import { ObservabilityOptions, ObservabilityOptionsImpl } from "./observabilityOptions";
+import { ObservabilityOptionsImpl } from "./observabilityOptions";
+import type { ObservabilityOptions } from "./observabilityOptions";
 
 export class FetchRequestAdapter implements RequestAdapter {
 	/** The base url for every request. */
diff --git a/packages/http/fetch/src/httpClient.ts b/packages/http/fetch/src/httpClient.ts
index 965fe62a6..134283b8e 100644
--- a/packages/http/fetch/src/httpClient.ts
+++ b/packages/http/fetch/src/httpClient.ts
@@ -5,10 +5,10 @@
  * -------------------------------------------------------------------------------------------
  */
 
-import { RequestOption } from "@microsoft/kiota-abstractions";
+import type { RequestOption } from "@microsoft/kiota-abstractions";
 
 import { CustomFetchHandler } from "./middlewares/customFetchHandler";
-import { Middleware } from "./middlewares/middleware";
+import type { Middleware } from "./middlewares/middleware";
 import { MiddlewareFactory } from "./middlewares/middlewareFactory";
 
 export class HttpClient {
diff --git a/packages/http/fetch/src/kiotaClientFactory.ts b/packages/http/fetch/src/kiotaClientFactory.ts
index ca08a45ff..5ebcd4ba5 100644
--- a/packages/http/fetch/src/kiotaClientFactory.ts
+++ b/packages/http/fetch/src/kiotaClientFactory.ts
@@ -1,4 +1,4 @@
-import { Middleware } from "./middlewares/middleware";
+import type { Middleware } from "./middlewares/middleware";
 import { MiddlewareFactory } from "./middlewares/middlewareFactory";
 
 /**
diff --git a/packages/http/fetch/src/middlewares/browser/middlewareFactory.ts b/packages/http/fetch/src/middlewares/browser/middlewareFactory.ts
index dcb1c6236..2668051a4 100644
--- a/packages/http/fetch/src/middlewares/browser/middlewareFactory.ts
+++ b/packages/http/fetch/src/middlewares/browser/middlewareFactory.ts
@@ -10,7 +10,7 @@
  */
 
 import { CustomFetchHandler } from "../customFetchHandler";
-import { Middleware } from "../middleware";
+import type { Middleware } from "../middleware";
 import { ParametersNameDecodingHandler } from "../parametersNameDecodingHandler";
 import { RetryHandler } from "../retryHandler";
 import { UserAgentHandler } from "../userAgentHandler";
diff --git a/packages/http/fetch/src/middlewares/chaosHandler.ts b/packages/http/fetch/src/middlewares/chaosHandler.ts
index 4a4bb68dd..d26f83293 100644
--- a/packages/http/fetch/src/middlewares/chaosHandler.ts
+++ b/packages/http/fetch/src/middlewares/chaosHandler.ts
@@ -9,14 +9,15 @@
  * @module ChaosHandler
  */
 
-import { HttpMethod, RequestOption } from "@microsoft/kiota-abstractions";
+import { HttpMethod } from "@microsoft/kiota-abstractions";
+import type { RequestOption } from "@microsoft/kiota-abstractions";
 import { Span, trace } from "@opentelemetry/api";
 
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
 import { FetchHeaders, FetchRequestInit } from "../utils/fetchDefinitions";
-import { Middleware } from "./middleware";
+import type { Middleware } from "./middleware";
 import { httpStatusCode, methodStatusCode } from "./options/ChaosHandlerData";
-import { ChaosHandlerOptions } from "./options/chaosHandlerOptions";
+import type { ChaosHandlerOptions } from "./options/chaosHandlerOptions";
 import { ChaosStrategy } from "./options/chaosStrategy";
 
 /**
diff --git a/packages/http/fetch/src/middlewares/customFetchHandler.ts b/packages/http/fetch/src/middlewares/customFetchHandler.ts
index 4141d704e..5d2cb03c3 100644
--- a/packages/http/fetch/src/middlewares/customFetchHandler.ts
+++ b/packages/http/fetch/src/middlewares/customFetchHandler.ts
@@ -9,7 +9,7 @@
  * @module FetchHandler
  */
 
-import { Middleware } from "./middleware";
+import type { Middleware } from "./middleware";
 
 /**
  * @class
diff --git a/packages/http/fetch/src/middlewares/middleware.ts b/packages/http/fetch/src/middlewares/middleware.ts
index d443e7b13..0dcbe1bed 100644
--- a/packages/http/fetch/src/middlewares/middleware.ts
+++ b/packages/http/fetch/src/middlewares/middleware.ts
@@ -4,7 +4,7 @@
  * See License in the project root for license information.
  * -------------------------------------------------------------------------------------------
  */
-import {RequestOption} from "@microsoft/kiota-abstractions";
+import type {RequestOption} from "@microsoft/kiota-abstractions";
 // use import types
 /** Defines the contract for a middleware in the request execution pipeline. */
 export interface Middleware {
diff --git a/packages/http/fetch/src/middlewares/middlewareFactory.ts b/packages/http/fetch/src/middlewares/middlewareFactory.ts
index 7d752b685..c5dc26e9a 100644
--- a/packages/http/fetch/src/middlewares/middlewareFactory.ts
+++ b/packages/http/fetch/src/middlewares/middlewareFactory.ts
@@ -11,7 +11,7 @@
 import fetch from "node-fetch";
 
 import { CustomFetchHandler } from "./customFetchHandler";
-import { Middleware } from "./middleware";
+import type { Middleware } from "./middleware";
 import { ParametersNameDecodingHandler } from "./parametersNameDecodingHandler";
 import { RedirectHandler } from "./redirectHandler";
 import { RetryHandler } from "./retryHandler";
diff --git a/packages/http/fetch/src/middlewares/options/chaosHandlerOptions.ts b/packages/http/fetch/src/middlewares/options/chaosHandlerOptions.ts
index 634be5993..a8e5ca46e 100644
--- a/packages/http/fetch/src/middlewares/options/chaosHandlerOptions.ts
+++ b/packages/http/fetch/src/middlewares/options/chaosHandlerOptions.ts
@@ -15,9 +15,9 @@ import { ChaosStrategy } from "./chaosStrategy";
 export const ChaosHandlerOptionsKey = "ChaosHandlerOptionsKey";
 
 /**
- * Class representing ChaosHandlerOptions
- * @class
- * Class
+ * interface representing ChaosHandlerOptions
+ * @interface
+ * interface
  * @implements MiddlewareOptions
  */
 export interface ChaosHandlerOptions {
diff --git a/packages/http/fetch/src/middlewares/options/parametersNameDecodingOptions.ts b/packages/http/fetch/src/middlewares/options/parametersNameDecodingOptions.ts
index 9bb361a11..163d02604 100644
--- a/packages/http/fetch/src/middlewares/options/parametersNameDecodingOptions.ts
+++ b/packages/http/fetch/src/middlewares/options/parametersNameDecodingOptions.ts
@@ -9,7 +9,7 @@
  * @module ParametersNameDecodingHandlerOptions
  */
 
-import { RequestOption } from "@microsoft/kiota-abstractions";
+import type { RequestOption } from "@microsoft/kiota-abstractions";
 
 export const ParametersNameDecodingHandlerOptionsKey = "RetryHandlerOptionKey";
 
diff --git a/packages/http/fetch/src/middlewares/options/redirectHandlerOptions.ts b/packages/http/fetch/src/middlewares/options/redirectHandlerOptions.ts
index 2679bd41a..49a80fd2d 100644
--- a/packages/http/fetch/src/middlewares/options/redirectHandlerOptions.ts
+++ b/packages/http/fetch/src/middlewares/options/redirectHandlerOptions.ts
@@ -9,7 +9,7 @@
  * @module RedirectHandlerOptions
  */
 
-import { RequestOption } from "@microsoft/kiota-abstractions";
+import type { RequestOption } from "@microsoft/kiota-abstractions";
 
 /**
  * @type
diff --git a/packages/http/fetch/src/middlewares/options/retryHandlerOptions.ts b/packages/http/fetch/src/middlewares/options/retryHandlerOptions.ts
index d52d85e11..9a83f6ffa 100644
--- a/packages/http/fetch/src/middlewares/options/retryHandlerOptions.ts
+++ b/packages/http/fetch/src/middlewares/options/retryHandlerOptions.ts
@@ -9,7 +9,7 @@
  * @module RetryHandlerOptions
  */
 
-import { RequestOption } from "@microsoft/kiota-abstractions";
+import type { RequestOption } from "@microsoft/kiota-abstractions";
 
 import { FetchResponse } from "../../utils/fetchDefinitions";
 
diff --git a/packages/http/fetch/src/middlewares/options/telemetryHandlerOptions.ts b/packages/http/fetch/src/middlewares/options/telemetryHandlerOptions.ts
index 34eb993b6..6f050a88b 100644
--- a/packages/http/fetch/src/middlewares/options/telemetryHandlerOptions.ts
+++ b/packages/http/fetch/src/middlewares/options/telemetryHandlerOptions.ts
@@ -4,7 +4,7 @@
  * See License in the project root for license information.
  * -------------------------------------------------------------------------------------------
  */
-import { RequestOption } from "@microsoft/kiota-abstractions";
+import type { RequestOption } from "@microsoft/kiota-abstractions";
 
 export interface TelemetryHandlerOptions extends RequestOption {
 	telemetryConfigurator: (url: string, requestInit: RequestInit, requestOptions?: Record<string, RequestOption>, telemetryInfomation?: unknown) => void;
diff --git a/packages/http/fetch/src/middlewares/options/userAgentHandlerOptions.ts b/packages/http/fetch/src/middlewares/options/userAgentHandlerOptions.ts
index b71342fc5..358b9be8e 100644
--- a/packages/http/fetch/src/middlewares/options/userAgentHandlerOptions.ts
+++ b/packages/http/fetch/src/middlewares/options/userAgentHandlerOptions.ts
@@ -5,7 +5,7 @@
  * -------------------------------------------------------------------------------------------
  */
 
-import { RequestOption } from "@microsoft/kiota-abstractions";
+import type { RequestOption } from "@microsoft/kiota-abstractions";
 
 import { libraryVersion } from "./version";
 
diff --git a/packages/http/fetch/src/middlewares/parametersNameDecodingHandler.ts b/packages/http/fetch/src/middlewares/parametersNameDecodingHandler.ts
index 54032af01..1827fdc02 100644
--- a/packages/http/fetch/src/middlewares/parametersNameDecodingHandler.ts
+++ b/packages/http/fetch/src/middlewares/parametersNameDecodingHandler.ts
@@ -5,11 +5,11 @@
  * -------------------------------------------------------------------------------------------
  */
 
-import { RequestOption } from "@microsoft/kiota-abstractions";
+import type { RequestOption } from "@microsoft/kiota-abstractions";
 import { trace } from "@opentelemetry/api";
 
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
-import { Middleware } from "./middleware";
+import type { Middleware } from "./middleware";
 import { ParametersNameDecodingHandlerOptions, ParametersNameDecodingHandlerOptionsKey } from "./options/parametersNameDecodingOptions";
 
 /**
diff --git a/packages/http/fetch/src/middlewares/redirectHandler.ts b/packages/http/fetch/src/middlewares/redirectHandler.ts
index 49706d781..470635d78 100644
--- a/packages/http/fetch/src/middlewares/redirectHandler.ts
+++ b/packages/http/fetch/src/middlewares/redirectHandler.ts
@@ -9,12 +9,13 @@
  * @module RedirectHandler
  */
 
-import { HttpMethod, RequestOption } from "@microsoft/kiota-abstractions";
+import { HttpMethod } from "@microsoft/kiota-abstractions";
+import type { RequestOption } from "@microsoft/kiota-abstractions";
 import { trace } from "@opentelemetry/api";
 
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
 import { FetchRequestInit, FetchResponse } from "../utils/fetchDefinitions";
-import { Middleware } from "./middleware";
+import type { Middleware } from "./middleware";
 import { RedirectHandlerOptionKey, RedirectHandlerOptions } from "./options/redirectHandlerOptions";
 
 /**
diff --git a/packages/http/fetch/src/middlewares/retryHandler.ts b/packages/http/fetch/src/middlewares/retryHandler.ts
index e3df0cc66..daa7b1675 100644
--- a/packages/http/fetch/src/middlewares/retryHandler.ts
+++ b/packages/http/fetch/src/middlewares/retryHandler.ts
@@ -9,13 +9,14 @@
  * @module RetryHandler
  */
 
-import { HttpMethod, RequestOption } from "@microsoft/kiota-abstractions";
+import { HttpMethod } from "@microsoft/kiota-abstractions";
+import type { RequestOption } from "@microsoft/kiota-abstractions";
 import { trace } from "@opentelemetry/api";
 
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
 import { FetchRequestInit, FetchResponse } from "../utils/fetchDefinitions";
 import { getRequestHeader, setRequestHeader } from "../utils/headersUtil";
-import { Middleware } from "./middleware";
+import type { Middleware } from "./middleware";
 import { RetryHandlerOptionKey, RetryHandlerOptions } from "./options/retryHandlerOptions";
 
 /**
diff --git a/packages/http/fetch/src/middlewares/telemetryHandler.ts b/packages/http/fetch/src/middlewares/telemetryHandler.ts
index 44c865e2f..a2104f6f0 100644
--- a/packages/http/fetch/src/middlewares/telemetryHandler.ts
+++ b/packages/http/fetch/src/middlewares/telemetryHandler.ts
@@ -4,10 +4,10 @@
  * See License in the project root for license information.
  * -------------------------------------------------------------------------------------------
  */
-import { RequestOption } from "@microsoft/kiota-abstractions";
+import type { RequestOption } from "@microsoft/kiota-abstractions";
 
-import { Middleware } from "./middleware";
-import { TelemetryHandlerOptions } from "./options/telemetryHandlerOptions";
+import type { Middleware } from "./middleware";
+import type { TelemetryHandlerOptions } from "./options/telemetryHandlerOptions";
 
 export const TelemetryHandlerOptionsKey = "TelemetryHandlerOptionsKey";
 export class TelemetryHandler implements Middleware {
diff --git a/packages/http/fetch/src/middlewares/userAgentHandler.ts b/packages/http/fetch/src/middlewares/userAgentHandler.ts
index d00452455..ca6e9a2fe 100644
--- a/packages/http/fetch/src/middlewares/userAgentHandler.ts
+++ b/packages/http/fetch/src/middlewares/userAgentHandler.ts
@@ -9,13 +9,13 @@
  * @module UserAgentHandler
  */
 
-import { RequestOption } from "@microsoft/kiota-abstractions";
+import type { RequestOption } from "@microsoft/kiota-abstractions";
 import { trace } from "@opentelemetry/api";
 
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
 import { FetchRequestInit } from "../utils/fetchDefinitions";
 import { appendRequestHeader, getRequestHeader } from "../utils/headersUtil";
-import { Middleware } from "./middleware";
+import type { Middleware } from "./middleware";
 import { UserAgentHandlerOptions, UserAgentHandlerOptionsKey } from "./options/userAgentHandlerOptions";
 
 const USER_AGENT_HEADER_KEY = "User-Agent";
diff --git a/packages/http/fetch/src/observabilityOptions.ts b/packages/http/fetch/src/observabilityOptions.ts
index 54d2e6608..c53c57dea 100644
--- a/packages/http/fetch/src/observabilityOptions.ts
+++ b/packages/http/fetch/src/observabilityOptions.ts
@@ -1,4 +1,4 @@
-import { RequestOption } from "@microsoft/kiota-abstractions";
+import type { RequestOption } from "@microsoft/kiota-abstractions";
 
 /** Holds the tracing, metrics and logging configuration for the request adapter */
 export interface ObservabilityOptions {
diff --git a/packages/http/fetch/test/common/fetchRequestAdapter.ts b/packages/http/fetch/test/common/fetchRequestAdapter.ts
index 57557f40e..664a80b3e 100644
--- a/packages/http/fetch/test/common/fetchRequestAdapter.ts
+++ b/packages/http/fetch/test/common/fetchRequestAdapter.ts
@@ -5,7 +5,8 @@
  * -------------------------------------------------------------------------------------------
  */
 /* eslint-disable @typescript-eslint/no-unused-vars*/
-import { AnonymousAuthenticationProvider, HttpMethod, RequestInformation, RequestOption } from "@microsoft/kiota-abstractions";
+import { AnonymousAuthenticationProvider, HttpMethod, RequestInformation } from "@microsoft/kiota-abstractions";
+import type { RequestOption } from "@microsoft/kiota-abstractions";
 import { assert } from "chai";
 
 import { FetchRequestAdapter } from "../../src/fetchRequestAdapter";
diff --git a/packages/http/fetch/test/common/middleware/dummyFetchHandler.ts b/packages/http/fetch/test/common/middleware/dummyFetchHandler.ts
index fa5ee0894..01ae2bb9f 100644
--- a/packages/http/fetch/test/common/middleware/dummyFetchHandler.ts
+++ b/packages/http/fetch/test/common/middleware/dummyFetchHandler.ts
@@ -9,8 +9,8 @@
  * @module DummyHTTPMessageHandler
  */
 
-import { RequestOption } from "@microsoft/kiota-abstractions";
-import { Middleware } from "../../../src/middlewares/middleware";
+import type { RequestOption } from "@microsoft/kiota-abstractions";
+import type { Middleware } from "../../../src/middlewares/middleware";
 
 /**
  * @class
diff --git a/packages/http/fetch/test/common/middleware/testCallBackMiddleware.ts b/packages/http/fetch/test/common/middleware/testCallBackMiddleware.ts
index 45cefe02f..f2e593474 100644
--- a/packages/http/fetch/test/common/middleware/testCallBackMiddleware.ts
+++ b/packages/http/fetch/test/common/middleware/testCallBackMiddleware.ts
@@ -1,6 +1,6 @@
-import { RequestOption } from "@microsoft/kiota-abstractions";
+import type { RequestOption } from "@microsoft/kiota-abstractions";
 
-import { Middleware } from "../../../src/middlewares/middleware";
+import type { Middleware } from "../../../src/middlewares/middleware";
 import { DummyFetchHandler } from "./dummyFetchHandler";
 import { getResponse } from "../../testUtils";
 
diff --git a/packages/http/fetch/test/common/mockEntity.ts b/packages/http/fetch/test/common/mockEntity.ts
index c7f29e4b3..31d2e7b17 100644
--- a/packages/http/fetch/test/common/mockEntity.ts
+++ b/packages/http/fetch/test/common/mockEntity.ts
@@ -1,4 +1,4 @@
-import { Parsable, ParseNode, SerializationWriter } from "@microsoft/kiota-abstractions";
+import type { Parsable, ParseNode, SerializationWriter } from "@microsoft/kiota-abstractions";
 
 export type MockEntity = Parsable;
 
diff --git a/packages/http/fetch/test/common/mockParseNodeFactory.ts b/packages/http/fetch/test/common/mockParseNodeFactory.ts
index c03a0fbd1..d857974dd 100644
--- a/packages/http/fetch/test/common/mockParseNodeFactory.ts
+++ b/packages/http/fetch/test/common/mockParseNodeFactory.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { DateOnly, Duration, Parsable, ParsableFactory, ParseNode, ParseNodeFactory, TimeOnly } from "@microsoft/kiota-abstractions";
+import { DateOnly, Duration, ParsableFactory, TimeOnly } from "@microsoft/kiota-abstractions";
+import type { Parsable, ParseNode, ParseNodeFactory } from "@microsoft/kiota-abstractions";
 import { Guid } from "guid-typescript";
 
 export class MockParseNodeFactory implements ParseNodeFactory {
diff --git a/packages/serialization/form/src/browser/formParseNodeFactory.ts b/packages/serialization/form/src/browser/formParseNodeFactory.ts
index 24eee3643..48f5cf424 100644
--- a/packages/serialization/form/src/browser/formParseNodeFactory.ts
+++ b/packages/serialization/form/src/browser/formParseNodeFactory.ts
@@ -1,5 +1,4 @@
-import { ParseNode, ParseNodeFactory } from "@microsoft/kiota-abstractions";
-
+import type { ParseNode, ParseNodeFactory } from "@microsoft/kiota-abstractions";
 import { FormParseNode } from "./../formParseNode";
 
 export class FormParseNodeFactory implements ParseNodeFactory {
diff --git a/packages/serialization/form/src/formParseNode.ts b/packages/serialization/form/src/formParseNode.ts
index c13d794fc..01b56760d 100644
--- a/packages/serialization/form/src/formParseNode.ts
+++ b/packages/serialization/form/src/formParseNode.ts
@@ -1,13 +1,12 @@
 import {
   DateOnly,
   Duration,
-  Parsable,
   ParsableFactory,
   parseGuidString,
-  ParseNode,
   TimeOnly,
   toFirstCharacterUpper,
 } from "@microsoft/kiota-abstractions";
+import type { Parsable, ParseNode } from "@microsoft/kiota-abstractions";
 
 export class FormParseNode implements ParseNode {
   private readonly _fields: Record<string, string> = {};
diff --git a/packages/serialization/form/src/formParseNodeFactory.ts b/packages/serialization/form/src/formParseNodeFactory.ts
index c50f9a23b..92d3610be 100644
--- a/packages/serialization/form/src/formParseNodeFactory.ts
+++ b/packages/serialization/form/src/formParseNodeFactory.ts
@@ -1,4 +1,4 @@
-import { ParseNode, ParseNodeFactory } from "@microsoft/kiota-abstractions";
+import type { ParseNode, ParseNodeFactory} from "@microsoft/kiota-abstractions";
 import { TextDecoder } from "util";
 
 import { FormParseNode } from "./formParseNode";
diff --git a/packages/serialization/form/src/formSerializationWriter.ts b/packages/serialization/form/src/formSerializationWriter.ts
index 046f56b7c..db5a573d9 100644
--- a/packages/serialization/form/src/formSerializationWriter.ts
+++ b/packages/serialization/form/src/formSerializationWriter.ts
@@ -3,10 +3,9 @@ import {
   DateOnly,
   Duration,
   ModelSerializerFunction,
-  Parsable,
-  SerializationWriter,
   TimeOnly,
 } from "@microsoft/kiota-abstractions";
+import type { Parsable, SerializationWriter } from "@microsoft/kiota-abstractions";
 import { Guid } from "guid-typescript";
 
 export class FormSerializationWriter implements SerializationWriter {
diff --git a/packages/serialization/form/src/formSerializationWriterFactory.ts b/packages/serialization/form/src/formSerializationWriterFactory.ts
index 99cf0f05d..d99fd4d71 100644
--- a/packages/serialization/form/src/formSerializationWriterFactory.ts
+++ b/packages/serialization/form/src/formSerializationWriterFactory.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   SerializationWriter,
   SerializationWriterFactory,
 } from "@microsoft/kiota-abstractions";
diff --git a/packages/serialization/form/test/common/formParseNode.ts b/packages/serialization/form/test/common/formParseNode.ts
index 46f5e1f8d..7961e0a98 100644
--- a/packages/serialization/form/test/common/formParseNode.ts
+++ b/packages/serialization/form/test/common/formParseNode.ts
@@ -1,10 +1,8 @@
 import { assert } from "chai";
 
 import { FormParseNode } from "../../src/index";
-import {
-  createTestParserFromDiscriminatorValue,
-  TestEntity,
-} from "../testEntity";
+import { createTestParserFromDiscriminatorValue } from "../testEntity";
+import type { TestEntity } from "../testEntity";
 
 describe("FormParseNode", () => {
   const testUserForm =
diff --git a/packages/serialization/form/test/common/formSerializationWriter.ts b/packages/serialization/form/test/common/formSerializationWriter.ts
index 8c1928d1c..db67791d8 100644
--- a/packages/serialization/form/test/common/formSerializationWriter.ts
+++ b/packages/serialization/form/test/common/formSerializationWriter.ts
@@ -2,7 +2,8 @@ import { DateOnly, Duration, TimeOnly } from "@microsoft/kiota-abstractions";
 import { assert } from "chai";
 
 import { FormSerializationWriter } from "../../src";
-import { serializeTestEntity, TestEntity } from "../testEntity";
+import { serializeTestEntity } from "../testEntity";
+import type { TestEntity } from "../testEntity";
 
 describe("FormSerializationWriter", () => {
   it("writesSampleObjectValue", () => {
diff --git a/packages/serialization/form/test/testEntity.ts b/packages/serialization/form/test/testEntity.ts
index ba60ae5de..554cafdc6 100644
--- a/packages/serialization/form/test/testEntity.ts
+++ b/packages/serialization/form/test/testEntity.ts
@@ -1,11 +1,13 @@
 import {
-  AdditionalDataHolder,
   DateOnly,
   Duration,
+  TimeOnly,
+} from "@microsoft/kiota-abstractions";
+import type { 
+  AdditionalDataHolder,
   Parsable,
   ParseNode,
-  SerializationWriter,
-  TimeOnly,
+  SerializationWriter
 } from "@microsoft/kiota-abstractions";
 
 export interface TestEntity extends Parsable, AdditionalDataHolder {
diff --git a/packages/serialization/json/src/browser/jsonParseNodeFactory.ts b/packages/serialization/json/src/browser/jsonParseNodeFactory.ts
index 326dab605..5e8023788 100644
--- a/packages/serialization/json/src/browser/jsonParseNodeFactory.ts
+++ b/packages/serialization/json/src/browser/jsonParseNodeFactory.ts
@@ -1,5 +1,4 @@
-import { ParseNode, ParseNodeFactory } from "@microsoft/kiota-abstractions";
-
+import type { ParseNode, ParseNodeFactory } from "@microsoft/kiota-abstractions";
 import { JsonParseNode } from "./../jsonParseNode";
 
 export class JsonParseNodeFactory implements ParseNodeFactory {
diff --git a/packages/serialization/json/src/jsonParseNode.ts b/packages/serialization/json/src/jsonParseNode.ts
index a74d6dad5..31c62bbed 100644
--- a/packages/serialization/json/src/jsonParseNode.ts
+++ b/packages/serialization/json/src/jsonParseNode.ts
@@ -1,13 +1,12 @@
 import {
   DateOnly,
   Duration,
-  Parsable,
   ParsableFactory,
   parseGuidString,
-  ParseNode,
   TimeOnly,
   toFirstCharacterUpper,
 } from "@microsoft/kiota-abstractions";
+import type { Parsable, ParseNode } from "@microsoft/kiota-abstractions";
 
 export class JsonParseNode implements ParseNode {
   /**
diff --git a/packages/serialization/json/src/jsonParseNodeFactory.ts b/packages/serialization/json/src/jsonParseNodeFactory.ts
index 454c5a634..5274a0c66 100644
--- a/packages/serialization/json/src/jsonParseNodeFactory.ts
+++ b/packages/serialization/json/src/jsonParseNodeFactory.ts
@@ -1,4 +1,4 @@
-import { ParseNode, ParseNodeFactory } from "@microsoft/kiota-abstractions";
+import type { ParseNode, ParseNodeFactory } from "@microsoft/kiota-abstractions";
 import { TextDecoder } from "util";
 
 import { JsonParseNode } from "./jsonParseNode";
diff --git a/packages/serialization/json/src/jsonSerializationWriter.ts b/packages/serialization/json/src/jsonSerializationWriter.ts
index ee01e1a69..2a7678402 100644
--- a/packages/serialization/json/src/jsonSerializationWriter.ts
+++ b/packages/serialization/json/src/jsonSerializationWriter.ts
@@ -3,10 +3,12 @@ import {
   DateOnly,
   Duration,
   ModelSerializerFunction,
-  Parsable,
-  SerializationWriter,
   TimeOnly,
 } from "@microsoft/kiota-abstractions";
+import type {
+  Parsable,
+  SerializationWriter
+} from "@microsoft/kiota-abstractions";
 import { Guid } from "guid-typescript";
 
 export class JsonSerializationWriter implements SerializationWriter {
diff --git a/packages/serialization/json/src/jsonSerializationWriterFactory.ts b/packages/serialization/json/src/jsonSerializationWriterFactory.ts
index c2c5af891..521b6f3fd 100644
--- a/packages/serialization/json/src/jsonSerializationWriterFactory.ts
+++ b/packages/serialization/json/src/jsonSerializationWriterFactory.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   SerializationWriter,
   SerializationWriterFactory,
 } from "@microsoft/kiota-abstractions";
diff --git a/packages/serialization/json/test/common/JsonParseNode.ts b/packages/serialization/json/test/common/JsonParseNode.ts
index 67e175cdc..68987d396 100644
--- a/packages/serialization/json/test/common/JsonParseNode.ts
+++ b/packages/serialization/json/test/common/JsonParseNode.ts
@@ -1,10 +1,8 @@
 import { assert } from "chai";
 
 import { JsonParseNode } from "../../src/index";
-import {
-  createTestParserFromDiscriminatorValue,
-  TestParser,
-} from "./testEntity";
+import { createTestParserFromDiscriminatorValue } from "./testEntity";
+import type { TestParser } from "./testEntity";
 
 describe("JsonParseNode", () => {
   it("jsonParseNode:initializes", async () => {
diff --git a/packages/serialization/json/test/common/jsonSerializationWriter.ts b/packages/serialization/json/test/common/jsonSerializationWriter.ts
index a12404939..1a41ec918 100644
--- a/packages/serialization/json/test/common/jsonSerializationWriter.ts
+++ b/packages/serialization/json/test/common/jsonSerializationWriter.ts
@@ -4,7 +4,9 @@ import { JsonParseNode, JsonSerializationWriter } from "../../src/index";
 import {
   createTestParserFromDiscriminatorValue,
   serializeTestParser,
-  TestParser,
+} from "./testEntity";
+import type {
+  TestParser
 } from "./testEntity";
 
 describe("JsonParseNode", () => {
diff --git a/packages/serialization/json/test/common/testEntity.ts b/packages/serialization/json/test/common/testEntity.ts
index 4c46c8eac..d22378c75 100644
--- a/packages/serialization/json/test/common/testEntity.ts
+++ b/packages/serialization/json/test/common/testEntity.ts
@@ -1,5 +1,4 @@
-import { ParseNode, SerializationWriter } from "@microsoft/kiota-abstractions";
-
+import type { ParseNode, SerializationWriter } from "@microsoft/kiota-abstractions";
 export interface TestParser {
   testCollection?: string[] | undefined;
   testString?: string | undefined;
diff --git a/packages/serialization/multipart/src/multipartSerializationWriter.ts b/packages/serialization/multipart/src/multipartSerializationWriter.ts
index ee8d8e440..9dc2db36a 100644
--- a/packages/serialization/multipart/src/multipartSerializationWriter.ts
+++ b/packages/serialization/multipart/src/multipartSerializationWriter.ts
@@ -4,10 +4,12 @@ import {
   Duration,
   ModelSerializerFunction,
   MultipartBody,
-  Parsable,
-  SerializationWriter,
   TimeOnly,
 } from "@microsoft/kiota-abstractions";
+import type {
+  Parsable,
+  SerializationWriter
+} from "@microsoft/kiota-abstractions";
 import { Guid } from "guid-typescript";
 
 /** Serialization writer for multipart/form-data */
diff --git a/packages/serialization/multipart/src/multipartSerializationWriterFactory.ts b/packages/serialization/multipart/src/multipartSerializationWriterFactory.ts
index 4ad8854b5..0436ff4d3 100644
--- a/packages/serialization/multipart/src/multipartSerializationWriterFactory.ts
+++ b/packages/serialization/multipart/src/multipartSerializationWriterFactory.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   SerializationWriter,
   SerializationWriterFactory,
 } from "@microsoft/kiota-abstractions";
diff --git a/packages/serialization/multipart/test/common/multipartSerializationWriter.ts b/packages/serialization/multipart/test/common/multipartSerializationWriter.ts
index 0f7672bc1..258a0abc2 100644
--- a/packages/serialization/multipart/test/common/multipartSerializationWriter.ts
+++ b/packages/serialization/multipart/test/common/multipartSerializationWriter.ts
@@ -2,15 +2,16 @@ import {
   DateOnly,
   Duration,
   MultipartBody,
-  RequestAdapter,
   serializeMultipartBody,
   TimeOnly,
 } from "@microsoft/kiota-abstractions";
+import type { RequestAdapter } from "@microsoft/kiota-abstractions";
 import { JsonSerializationWriterFactory } from "@microsoft/kiota-serialization-json";
 import { assert } from "chai";
 
 import { MultipartSerializationWriter } from "../../src";
-import { serializeTestEntity, TestEntity } from "../testEntity";
+import { serializeTestEntity } from "../testEntity";
+import type { TestEntity } from "../testEntity";
 
 describe("MultipartSerializationWriter", () => {
   it("throws on parsable serialization", () => {
diff --git a/packages/serialization/multipart/test/testEntity.ts b/packages/serialization/multipart/test/testEntity.ts
index ba60ae5de..554cafdc6 100644
--- a/packages/serialization/multipart/test/testEntity.ts
+++ b/packages/serialization/multipart/test/testEntity.ts
@@ -1,11 +1,13 @@
 import {
-  AdditionalDataHolder,
   DateOnly,
   Duration,
+  TimeOnly,
+} from "@microsoft/kiota-abstractions";
+import type { 
+  AdditionalDataHolder,
   Parsable,
   ParseNode,
-  SerializationWriter,
-  TimeOnly,
+  SerializationWriter
 } from "@microsoft/kiota-abstractions";
 
 export interface TestEntity extends Parsable, AdditionalDataHolder {
diff --git a/packages/serialization/text/src/browser/textParseNodeFactory.ts b/packages/serialization/text/src/browser/textParseNodeFactory.ts
index 51585c0a1..50dc9cde4 100644
--- a/packages/serialization/text/src/browser/textParseNodeFactory.ts
+++ b/packages/serialization/text/src/browser/textParseNodeFactory.ts
@@ -1,5 +1,4 @@
-import { ParseNode, ParseNodeFactory } from "@microsoft/kiota-abstractions";
-
+import type { ParseNode, ParseNodeFactory } from "@microsoft/kiota-abstractions";
 import { TextParseNode } from "./../textParseNode";
 
 export class TextParseNodeFactory implements ParseNodeFactory {
diff --git a/packages/serialization/text/src/textParseNode.ts b/packages/serialization/text/src/textParseNode.ts
index 72b3bf12a..d5eece3b6 100644
--- a/packages/serialization/text/src/textParseNode.ts
+++ b/packages/serialization/text/src/textParseNode.ts
@@ -1,13 +1,12 @@
 import {
   DateOnly,
   Duration,
-  Parsable,
   ParsableFactory,
   parseGuidString,
-  ParseNode,
   TimeOnly,
   toFirstCharacterUpper,
 } from "@microsoft/kiota-abstractions";
+import type { Parsable, ParseNode } from "@microsoft/kiota-abstractions";
 
 export class TextParseNode implements ParseNode {
   private static noStructuredDataMessage =
diff --git a/packages/serialization/text/src/textParseNodeFactory.ts b/packages/serialization/text/src/textParseNodeFactory.ts
index 0eb8f624b..54ad59c03 100644
--- a/packages/serialization/text/src/textParseNodeFactory.ts
+++ b/packages/serialization/text/src/textParseNodeFactory.ts
@@ -1,4 +1,4 @@
-import { ParseNode, ParseNodeFactory } from "@microsoft/kiota-abstractions";
+import type { ParseNode, ParseNodeFactory } from "@microsoft/kiota-abstractions";
 import { TextDecoder } from "util";
 
 import { TextParseNode } from "./textParseNode";
diff --git a/packages/serialization/text/src/textSerializationWriter.ts b/packages/serialization/text/src/textSerializationWriter.ts
index d88dd94f6..325e9b37e 100644
--- a/packages/serialization/text/src/textSerializationWriter.ts
+++ b/packages/serialization/text/src/textSerializationWriter.ts
@@ -3,10 +3,9 @@ import {
   DateOnly,
   Duration,
   ModelSerializerFunction,
-  Parsable,
-  SerializationWriter,
   TimeOnly,
 } from "@microsoft/kiota-abstractions";
+import type { Parsable, SerializationWriter } from "@microsoft/kiota-abstractions";
 import { Guid } from "guid-typescript";
 
 export class TextSerializationWriter implements SerializationWriter {
diff --git a/packages/serialization/text/src/textSerializationWriterFactory.ts b/packages/serialization/text/src/textSerializationWriterFactory.ts
index b866a09f3..10536a951 100644
--- a/packages/serialization/text/src/textSerializationWriterFactory.ts
+++ b/packages/serialization/text/src/textSerializationWriterFactory.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   SerializationWriter,
   SerializationWriterFactory,
 } from "@microsoft/kiota-abstractions";
diff --git a/packages/test/generatedCode/apiClient.ts b/packages/test/generatedCode/apiClient.ts
index ed967f21c..95dff00f9 100644
--- a/packages/test/generatedCode/apiClient.ts
+++ b/packages/test/generatedCode/apiClient.ts
@@ -1,7 +1,9 @@
 import {UsersRequestBuilder} from './users/usersRequestBuilder';
-import {BaseRequestBuilder, enableBackingStoreForSerializationWriterFactory, ParseNodeFactoryRegistry, registerDefaultDeserializer, registerDefaultSerializer, RequestAdapter, SerializationWriterFactoryRegistry} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, ParseNodeFactoryRegistry, SerializationWriterFactoryRegistry, enableBackingStoreForSerializationWriterFactory, registerDefaultDeserializer, registerDefaultSerializer} from '@microsoft/kiota-abstractions';
+import type {RequestAdapter} from '@microsoft/kiota-abstractions';
 import {FormParseNodeFactory, FormSerializationWriterFactory} from '@microsoft/kiota-serialization-form';
 import {JsonParseNodeFactory, JsonSerializationWriterFactory} from '@microsoft/kiota-serialization-json';
+import {MultipartSerializationWriterFactory} from '@microsoft/kiota-serialization-multipart';
 import {TextParseNodeFactory, TextSerializationWriterFactory} from '@microsoft/kiota-serialization-text';
 
 /**
@@ -23,6 +25,7 @@ export class ApiClient extends BaseRequestBuilder {
         registerDefaultSerializer(JsonSerializationWriterFactory);
         registerDefaultSerializer(TextSerializationWriterFactory);
         registerDefaultSerializer(FormSerializationWriterFactory);
+        registerDefaultSerializer(MultipartSerializationWriterFactory);
         registerDefaultDeserializer(JsonParseNodeFactory);
         registerDefaultDeserializer(TextParseNodeFactory);
         registerDefaultDeserializer(FormParseNodeFactory);
diff --git a/packages/test/generatedCode/kiota-lock.json b/packages/test/generatedCode/kiota-lock.json
index f9c5d97d5..819ea166b 100644
--- a/packages/test/generatedCode/kiota-lock.json
+++ b/packages/test/generatedCode/kiota-lock.json
@@ -1,8 +1,8 @@
 {
-  "descriptionHash": "B9068CFB8EB21E8E1E4918F684CAE3C993B2E99585B544918BB5BDF398ECCE5DBC1ABCDA6EA77D048439C29014AA7668B276ED98B8E92740931963F3A7701241",
+  "descriptionHash": "BCA660F549E6B77563972121CEBDD92906DA590C37483649B859B2179089FD72457541C7D14A626F0144756386186D90CC2FE47E7DBF4A483C47507A82971D4C",
   "descriptionLocation": "https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-powershell/dev/openApiDocs/v1.0/Mail.yml",
   "lockFileVersion": "1.0.0",
-  "kiotaVersion": "1.3.0",
+  "kiotaVersion": "1.6.0",
   "clientClassName": "ApiClient",
   "clientNamespaceName": "ApiSdk",
   "language": "TypeScript",
@@ -11,7 +11,8 @@
   "serializers": [
     "Microsoft.Kiota.Serialization.Json.JsonSerializationWriterFactory",
     "Microsoft.Kiota.Serialization.Text.TextSerializationWriterFactory",
-    "Microsoft.Kiota.Serialization.Form.FormSerializationWriterFactory"
+    "Microsoft.Kiota.Serialization.Form.FormSerializationWriterFactory",
+    "Microsoft.Kiota.Serialization.Multipart.MultipartSerializationWriterFactory"
   ],
   "deserializers": [
     "Microsoft.Kiota.Serialization.Json.JsonParseNodeFactory",
@@ -21,7 +22,8 @@
   "structuredMimeTypes": [
     "application/json",
     "text/plain",
-    "application/x-www-form-urlencoded"
+    "application/x-www-form-urlencoded",
+    "multipart/form-data"
   ],
   "includePatterns": [],
   "excludePatterns": [],
diff --git a/packages/test/generatedCode/models/attachment.ts b/packages/test/generatedCode/models/attachment.ts
index ba9fd110c..5822b0c31 100644
--- a/packages/test/generatedCode/models/attachment.ts
+++ b/packages/test/generatedCode/models/attachment.ts
@@ -1,5 +1,5 @@
-import {Entity} from './entity';
-import {Parsable} from '@microsoft/kiota-abstractions';
+import type {Entity} from './entity';
+import type {Parsable} from '@microsoft/kiota-abstractions';
 
 export interface Attachment extends Entity, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/attachmentCollectionResponse.ts b/packages/test/generatedCode/models/attachmentCollectionResponse.ts
index 8dc9b3386..110aab93f 100644
--- a/packages/test/generatedCode/models/attachmentCollectionResponse.ts
+++ b/packages/test/generatedCode/models/attachmentCollectionResponse.ts
@@ -1,5 +1,5 @@
-import {Attachment} from './attachment';
-import {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+import type {Attachment} from './attachment';
+import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
 
 export interface AttachmentCollectionResponse extends AdditionalDataHolder, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/dateTimeTimeZone.ts b/packages/test/generatedCode/models/dateTimeTimeZone.ts
index abd392dac..0cb257d01 100644
--- a/packages/test/generatedCode/models/dateTimeTimeZone.ts
+++ b/packages/test/generatedCode/models/dateTimeTimeZone.ts
@@ -1,4 +1,4 @@
-import {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
 
 export interface DateTimeTimeZone extends AdditionalDataHolder, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/deserializeIntoAttachment.ts b/packages/test/generatedCode/models/deserializeIntoAttachment.ts
index 6e95118df..0c0b479f6 100644
--- a/packages/test/generatedCode/models/deserializeIntoAttachment.ts
+++ b/packages/test/generatedCode/models/deserializeIntoAttachment.ts
@@ -1,6 +1,6 @@
-import {Attachment} from './attachment';
+import type {Attachment} from './attachment';
 import {deserializeIntoEntity} from './deserializeIntoEntity';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoAttachment(attachment: Attachment | undefined = {} as Attachment) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoAttachmentCollectionResponse.ts b/packages/test/generatedCode/models/deserializeIntoAttachmentCollectionResponse.ts
index 578a4e912..dc6e9cb92 100644
--- a/packages/test/generatedCode/models/deserializeIntoAttachmentCollectionResponse.ts
+++ b/packages/test/generatedCode/models/deserializeIntoAttachmentCollectionResponse.ts
@@ -1,8 +1,8 @@
-import {Attachment} from './attachment';
-import {AttachmentCollectionResponse} from './attachmentCollectionResponse';
+import type {Attachment} from './attachment';
+import type {AttachmentCollectionResponse} from './attachmentCollectionResponse';
 import {createAttachmentFromDiscriminatorValue} from './createAttachmentFromDiscriminatorValue';
 import {serializeAttachment} from './serializeAttachment';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoAttachmentCollectionResponse(attachmentCollectionResponse: AttachmentCollectionResponse | undefined = {} as AttachmentCollectionResponse) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoDateTimeTimeZone.ts b/packages/test/generatedCode/models/deserializeIntoDateTimeTimeZone.ts
index cea105d8c..f2639efdd 100644
--- a/packages/test/generatedCode/models/deserializeIntoDateTimeTimeZone.ts
+++ b/packages/test/generatedCode/models/deserializeIntoDateTimeTimeZone.ts
@@ -1,5 +1,5 @@
-import {DateTimeTimeZone} from './dateTimeTimeZone';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {DateTimeTimeZone} from './dateTimeTimeZone';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoDateTimeTimeZone(dateTimeTimeZone: DateTimeTimeZone | undefined = {} as DateTimeTimeZone) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoEmailAddress.ts b/packages/test/generatedCode/models/deserializeIntoEmailAddress.ts
index c7d3386bf..85363295d 100644
--- a/packages/test/generatedCode/models/deserializeIntoEmailAddress.ts
+++ b/packages/test/generatedCode/models/deserializeIntoEmailAddress.ts
@@ -1,5 +1,5 @@
-import {EmailAddress} from './emailAddress';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {EmailAddress} from './emailAddress';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoEmailAddress(emailAddress: EmailAddress | undefined = {} as EmailAddress) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoEntity.ts b/packages/test/generatedCode/models/deserializeIntoEntity.ts
index 425900a6c..27c7f0d5e 100644
--- a/packages/test/generatedCode/models/deserializeIntoEntity.ts
+++ b/packages/test/generatedCode/models/deserializeIntoEntity.ts
@@ -1,5 +1,5 @@
-import {Entity} from './entity';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {Entity} from './entity';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoEntity(entity: Entity | undefined = {} as Entity) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoExtension.ts b/packages/test/generatedCode/models/deserializeIntoExtension.ts
index 450c5d17d..8af652a96 100644
--- a/packages/test/generatedCode/models/deserializeIntoExtension.ts
+++ b/packages/test/generatedCode/models/deserializeIntoExtension.ts
@@ -1,6 +1,6 @@
 import {deserializeIntoEntity} from './deserializeIntoEntity';
-import {Extension} from './extension';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {Extension} from './extension';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoExtension(extension: Extension | undefined = {} as Extension) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoExtensionCollectionResponse.ts b/packages/test/generatedCode/models/deserializeIntoExtensionCollectionResponse.ts
index 801483848..5f1742986 100644
--- a/packages/test/generatedCode/models/deserializeIntoExtensionCollectionResponse.ts
+++ b/packages/test/generatedCode/models/deserializeIntoExtensionCollectionResponse.ts
@@ -1,8 +1,8 @@
 import {createExtensionFromDiscriminatorValue} from './createExtensionFromDiscriminatorValue';
-import {Extension} from './extension';
-import {ExtensionCollectionResponse} from './extensionCollectionResponse';
+import type {Extension} from './extension';
+import type {ExtensionCollectionResponse} from './extensionCollectionResponse';
 import {serializeExtension} from './serializeExtension';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoExtensionCollectionResponse(extensionCollectionResponse: ExtensionCollectionResponse | undefined = {} as ExtensionCollectionResponse) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoFollowupFlag.ts b/packages/test/generatedCode/models/deserializeIntoFollowupFlag.ts
index a550e34d7..6fc640913 100644
--- a/packages/test/generatedCode/models/deserializeIntoFollowupFlag.ts
+++ b/packages/test/generatedCode/models/deserializeIntoFollowupFlag.ts
@@ -1,9 +1,9 @@
 import {createDateTimeTimeZoneFromDiscriminatorValue} from './createDateTimeTimeZoneFromDiscriminatorValue';
-import {DateTimeTimeZone} from './dateTimeTimeZone';
-import {FollowupFlag} from './followupFlag';
+import type {DateTimeTimeZone} from './dateTimeTimeZone';
+import type {FollowupFlag} from './followupFlag';
 import {FollowupFlagStatus} from './followupFlagStatus';
 import {serializeDateTimeTimeZone} from './serializeDateTimeTimeZone';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoFollowupFlag(followupFlag: FollowupFlag | undefined = {} as FollowupFlag) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoInferenceClassification.ts b/packages/test/generatedCode/models/deserializeIntoInferenceClassification.ts
index 1d4c6be9f..168dedeff 100644
--- a/packages/test/generatedCode/models/deserializeIntoInferenceClassification.ts
+++ b/packages/test/generatedCode/models/deserializeIntoInferenceClassification.ts
@@ -1,9 +1,9 @@
 import {createInferenceClassificationOverrideFromDiscriminatorValue} from './createInferenceClassificationOverrideFromDiscriminatorValue';
 import {deserializeIntoEntity} from './deserializeIntoEntity';
-import {InferenceClassification} from './inferenceClassification';
-import {InferenceClassificationOverride} from './inferenceClassificationOverride';
+import type {InferenceClassification} from './inferenceClassification';
+import type {InferenceClassificationOverride} from './inferenceClassificationOverride';
 import {serializeInferenceClassificationOverride} from './serializeInferenceClassificationOverride';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoInferenceClassification(inferenceClassification: InferenceClassification | undefined = {} as InferenceClassification) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoInferenceClassificationOverride.ts b/packages/test/generatedCode/models/deserializeIntoInferenceClassificationOverride.ts
index 6a3b05868..0476fed1e 100644
--- a/packages/test/generatedCode/models/deserializeIntoInferenceClassificationOverride.ts
+++ b/packages/test/generatedCode/models/deserializeIntoInferenceClassificationOverride.ts
@@ -1,10 +1,10 @@
 import {createEmailAddressFromDiscriminatorValue} from './createEmailAddressFromDiscriminatorValue';
 import {deserializeIntoEntity} from './deserializeIntoEntity';
-import {EmailAddress} from './emailAddress';
-import {InferenceClassificationOverride} from './inferenceClassificationOverride';
+import type {EmailAddress} from './emailAddress';
+import type {InferenceClassificationOverride} from './inferenceClassificationOverride';
 import {InferenceClassificationType} from './inferenceClassificationType';
 import {serializeEmailAddress} from './serializeEmailAddress';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoInferenceClassificationOverride(inferenceClassificationOverride: InferenceClassificationOverride | undefined = {} as InferenceClassificationOverride) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoInferenceClassificationOverrideCollectionResponse.ts b/packages/test/generatedCode/models/deserializeIntoInferenceClassificationOverrideCollectionResponse.ts
index 8497f4510..8d4030b52 100644
--- a/packages/test/generatedCode/models/deserializeIntoInferenceClassificationOverrideCollectionResponse.ts
+++ b/packages/test/generatedCode/models/deserializeIntoInferenceClassificationOverrideCollectionResponse.ts
@@ -1,8 +1,8 @@
 import {createInferenceClassificationOverrideFromDiscriminatorValue} from './createInferenceClassificationOverrideFromDiscriminatorValue';
-import {InferenceClassificationOverride} from './inferenceClassificationOverride';
-import {InferenceClassificationOverrideCollectionResponse} from './inferenceClassificationOverrideCollectionResponse';
+import type {InferenceClassificationOverride} from './inferenceClassificationOverride';
+import type {InferenceClassificationOverrideCollectionResponse} from './inferenceClassificationOverrideCollectionResponse';
 import {serializeInferenceClassificationOverride} from './serializeInferenceClassificationOverride';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoInferenceClassificationOverrideCollectionResponse(inferenceClassificationOverrideCollectionResponse: InferenceClassificationOverrideCollectionResponse | undefined = {} as InferenceClassificationOverrideCollectionResponse) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoInternetMessageHeader.ts b/packages/test/generatedCode/models/deserializeIntoInternetMessageHeader.ts
index 8538f8ff8..b7de7a489 100644
--- a/packages/test/generatedCode/models/deserializeIntoInternetMessageHeader.ts
+++ b/packages/test/generatedCode/models/deserializeIntoInternetMessageHeader.ts
@@ -1,5 +1,5 @@
-import {InternetMessageHeader} from './internetMessageHeader';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {InternetMessageHeader} from './internetMessageHeader';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoInternetMessageHeader(internetMessageHeader: InternetMessageHeader | undefined = {} as InternetMessageHeader) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoItemBody.ts b/packages/test/generatedCode/models/deserializeIntoItemBody.ts
index e1b28099d..e31eac638 100644
--- a/packages/test/generatedCode/models/deserializeIntoItemBody.ts
+++ b/packages/test/generatedCode/models/deserializeIntoItemBody.ts
@@ -1,6 +1,6 @@
 import {BodyType} from './bodyType';
-import {ItemBody} from './itemBody';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {ItemBody} from './itemBody';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoItemBody(itemBody: ItemBody | undefined = {} as ItemBody) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoMailFolder.ts b/packages/test/generatedCode/models/deserializeIntoMailFolder.ts
index 5b7742c79..7abfb5b85 100644
--- a/packages/test/generatedCode/models/deserializeIntoMailFolder.ts
+++ b/packages/test/generatedCode/models/deserializeIntoMailFolder.ts
@@ -4,17 +4,17 @@ import {createMessageRuleFromDiscriminatorValue} from './createMessageRuleFromDi
 import {createMultiValueLegacyExtendedPropertyFromDiscriminatorValue} from './createMultiValueLegacyExtendedPropertyFromDiscriminatorValue';
 import {createSingleValueLegacyExtendedPropertyFromDiscriminatorValue} from './createSingleValueLegacyExtendedPropertyFromDiscriminatorValue';
 import {deserializeIntoEntity} from './deserializeIntoEntity';
-import {MailFolder} from './mailFolder';
-import {Message} from './message';
-import {MessageRule} from './messageRule';
-import {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
+import type {MailFolder} from './mailFolder';
+import type {Message} from './message';
+import type {MessageRule} from './messageRule';
+import type {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
 import {serializeMailFolder} from './serializeMailFolder';
 import {serializeMessage} from './serializeMessage';
 import {serializeMessageRule} from './serializeMessageRule';
 import {serializeMultiValueLegacyExtendedProperty} from './serializeMultiValueLegacyExtendedProperty';
 import {serializeSingleValueLegacyExtendedProperty} from './serializeSingleValueLegacyExtendedProperty';
-import {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoMailFolder(mailFolder: MailFolder | undefined = {} as MailFolder) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoMailFolderCollectionResponse.ts b/packages/test/generatedCode/models/deserializeIntoMailFolderCollectionResponse.ts
index 618069191..f051c9f6e 100644
--- a/packages/test/generatedCode/models/deserializeIntoMailFolderCollectionResponse.ts
+++ b/packages/test/generatedCode/models/deserializeIntoMailFolderCollectionResponse.ts
@@ -1,8 +1,8 @@
 import {createMailFolderFromDiscriminatorValue} from './createMailFolderFromDiscriminatorValue';
-import {MailFolder} from './mailFolder';
-import {MailFolderCollectionResponse} from './mailFolderCollectionResponse';
+import type {MailFolder} from './mailFolder';
+import type {MailFolderCollectionResponse} from './mailFolderCollectionResponse';
 import {serializeMailFolder} from './serializeMailFolder';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoMailFolderCollectionResponse(mailFolderCollectionResponse: MailFolderCollectionResponse | undefined = {} as MailFolderCollectionResponse) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoMessage.ts b/packages/test/generatedCode/models/deserializeIntoMessage.ts
index e617343ba..6686a1a64 100644
--- a/packages/test/generatedCode/models/deserializeIntoMessage.ts
+++ b/packages/test/generatedCode/models/deserializeIntoMessage.ts
@@ -1,4 +1,4 @@
-import {Attachment} from './attachment';
+import type {Attachment} from './attachment';
 import {createAttachmentFromDiscriminatorValue} from './createAttachmentFromDiscriminatorValue';
 import {createExtensionFromDiscriminatorValue} from './createExtensionFromDiscriminatorValue';
 import {createFollowupFlagFromDiscriminatorValue} from './createFollowupFlagFromDiscriminatorValue';
@@ -8,15 +8,15 @@ import {createMultiValueLegacyExtendedPropertyFromDiscriminatorValue} from './cr
 import {createRecipientFromDiscriminatorValue} from './createRecipientFromDiscriminatorValue';
 import {createSingleValueLegacyExtendedPropertyFromDiscriminatorValue} from './createSingleValueLegacyExtendedPropertyFromDiscriminatorValue';
 import {deserializeIntoOutlookItem} from './deserializeIntoOutlookItem';
-import {Extension} from './extension';
-import {FollowupFlag} from './followupFlag';
+import type {Extension} from './extension';
+import type {FollowupFlag} from './followupFlag';
 import {Importance} from './importance';
 import {InferenceClassificationType} from './inferenceClassificationType';
-import {InternetMessageHeader} from './internetMessageHeader';
-import {ItemBody} from './itemBody';
-import {Message} from './message';
-import {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
-import {Recipient} from './recipient';
+import type {InternetMessageHeader} from './internetMessageHeader';
+import type {ItemBody} from './itemBody';
+import type {Message} from './message';
+import type {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
+import type {Recipient} from './recipient';
 import {serializeAttachment} from './serializeAttachment';
 import {serializeExtension} from './serializeExtension';
 import {serializeFollowupFlag} from './serializeFollowupFlag';
@@ -25,8 +25,8 @@ import {serializeItemBody} from './serializeItemBody';
 import {serializeMultiValueLegacyExtendedProperty} from './serializeMultiValueLegacyExtendedProperty';
 import {serializeRecipient} from './serializeRecipient';
 import {serializeSingleValueLegacyExtendedProperty} from './serializeSingleValueLegacyExtendedProperty';
-import {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoMessage(message: Message | undefined = {} as Message) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoMessageCollectionResponse.ts b/packages/test/generatedCode/models/deserializeIntoMessageCollectionResponse.ts
index 85bbfb462..c50a9c819 100644
--- a/packages/test/generatedCode/models/deserializeIntoMessageCollectionResponse.ts
+++ b/packages/test/generatedCode/models/deserializeIntoMessageCollectionResponse.ts
@@ -1,8 +1,8 @@
 import {createMessageFromDiscriminatorValue} from './createMessageFromDiscriminatorValue';
-import {Message} from './message';
-import {MessageCollectionResponse} from './messageCollectionResponse';
+import type {Message} from './message';
+import type {MessageCollectionResponse} from './messageCollectionResponse';
 import {serializeMessage} from './serializeMessage';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoMessageCollectionResponse(messageCollectionResponse: MessageCollectionResponse | undefined = {} as MessageCollectionResponse) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoMessageRule.ts b/packages/test/generatedCode/models/deserializeIntoMessageRule.ts
index 11c61e0f4..e46da91a0 100644
--- a/packages/test/generatedCode/models/deserializeIntoMessageRule.ts
+++ b/packages/test/generatedCode/models/deserializeIntoMessageRule.ts
@@ -1,12 +1,12 @@
 import {createMessageRuleActionsFromDiscriminatorValue} from './createMessageRuleActionsFromDiscriminatorValue';
 import {createMessageRulePredicatesFromDiscriminatorValue} from './createMessageRulePredicatesFromDiscriminatorValue';
 import {deserializeIntoEntity} from './deserializeIntoEntity';
-import {MessageRule} from './messageRule';
-import {MessageRuleActions} from './messageRuleActions';
-import {MessageRulePredicates} from './messageRulePredicates';
+import type {MessageRule} from './messageRule';
+import type {MessageRuleActions} from './messageRuleActions';
+import type {MessageRulePredicates} from './messageRulePredicates';
 import {serializeMessageRuleActions} from './serializeMessageRuleActions';
 import {serializeMessageRulePredicates} from './serializeMessageRulePredicates';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoMessageRule(messageRule: MessageRule | undefined = {} as MessageRule) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoMessageRuleActions.ts b/packages/test/generatedCode/models/deserializeIntoMessageRuleActions.ts
index 5abca7e5b..af024405f 100644
--- a/packages/test/generatedCode/models/deserializeIntoMessageRuleActions.ts
+++ b/packages/test/generatedCode/models/deserializeIntoMessageRuleActions.ts
@@ -1,9 +1,9 @@
 import {createRecipientFromDiscriminatorValue} from './createRecipientFromDiscriminatorValue';
 import {Importance} from './importance';
-import {MessageRuleActions} from './messageRuleActions';
-import {Recipient} from './recipient';
+import type {MessageRuleActions} from './messageRuleActions';
+import type {Recipient} from './recipient';
 import {serializeRecipient} from './serializeRecipient';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoMessageRuleActions(messageRuleActions: MessageRuleActions | undefined = {} as MessageRuleActions) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoMessageRuleCollectionResponse.ts b/packages/test/generatedCode/models/deserializeIntoMessageRuleCollectionResponse.ts
index cad707224..1a213fdcd 100644
--- a/packages/test/generatedCode/models/deserializeIntoMessageRuleCollectionResponse.ts
+++ b/packages/test/generatedCode/models/deserializeIntoMessageRuleCollectionResponse.ts
@@ -1,8 +1,8 @@
 import {createMessageRuleFromDiscriminatorValue} from './createMessageRuleFromDiscriminatorValue';
-import {MessageRule} from './messageRule';
-import {MessageRuleCollectionResponse} from './messageRuleCollectionResponse';
+import type {MessageRule} from './messageRule';
+import type {MessageRuleCollectionResponse} from './messageRuleCollectionResponse';
 import {serializeMessageRule} from './serializeMessageRule';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoMessageRuleCollectionResponse(messageRuleCollectionResponse: MessageRuleCollectionResponse | undefined = {} as MessageRuleCollectionResponse) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoMessageRulePredicates.ts b/packages/test/generatedCode/models/deserializeIntoMessageRulePredicates.ts
index 44c5adc1c..9c852335a 100644
--- a/packages/test/generatedCode/models/deserializeIntoMessageRulePredicates.ts
+++ b/packages/test/generatedCode/models/deserializeIntoMessageRulePredicates.ts
@@ -2,13 +2,13 @@ import {createRecipientFromDiscriminatorValue} from './createRecipientFromDiscri
 import {createSizeRangeFromDiscriminatorValue} from './createSizeRangeFromDiscriminatorValue';
 import {Importance} from './importance';
 import {MessageActionFlag} from './messageActionFlag';
-import {MessageRulePredicates} from './messageRulePredicates';
-import {Recipient} from './recipient';
+import type {MessageRulePredicates} from './messageRulePredicates';
+import type {Recipient} from './recipient';
 import {Sensitivity} from './sensitivity';
 import {serializeRecipient} from './serializeRecipient';
 import {serializeSizeRange} from './serializeSizeRange';
-import {SizeRange} from './sizeRange';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {SizeRange} from './sizeRange';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoMessageRulePredicates(messageRulePredicates: MessageRulePredicates | undefined = {} as MessageRulePredicates) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoMultiValueLegacyExtendedProperty.ts b/packages/test/generatedCode/models/deserializeIntoMultiValueLegacyExtendedProperty.ts
index c665fa36d..7eb708f16 100644
--- a/packages/test/generatedCode/models/deserializeIntoMultiValueLegacyExtendedProperty.ts
+++ b/packages/test/generatedCode/models/deserializeIntoMultiValueLegacyExtendedProperty.ts
@@ -1,6 +1,6 @@
 import {deserializeIntoEntity} from './deserializeIntoEntity';
-import {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoMultiValueLegacyExtendedProperty(multiValueLegacyExtendedProperty: MultiValueLegacyExtendedProperty | undefined = {} as MultiValueLegacyExtendedProperty) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoOutlookItem.ts b/packages/test/generatedCode/models/deserializeIntoOutlookItem.ts
index eb7faf7c8..a8d223c9d 100644
--- a/packages/test/generatedCode/models/deserializeIntoOutlookItem.ts
+++ b/packages/test/generatedCode/models/deserializeIntoOutlookItem.ts
@@ -1,6 +1,6 @@
 import {deserializeIntoEntity} from './deserializeIntoEntity';
-import {OutlookItem} from './outlookItem';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {OutlookItem} from './outlookItem';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoOutlookItem(outlookItem: OutlookItem | undefined = {} as OutlookItem) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoRecipient.ts b/packages/test/generatedCode/models/deserializeIntoRecipient.ts
index d1dd04857..9069f7008 100644
--- a/packages/test/generatedCode/models/deserializeIntoRecipient.ts
+++ b/packages/test/generatedCode/models/deserializeIntoRecipient.ts
@@ -1,8 +1,8 @@
 import {createEmailAddressFromDiscriminatorValue} from './createEmailAddressFromDiscriminatorValue';
-import {EmailAddress} from './emailAddress';
-import {Recipient} from './recipient';
+import type {EmailAddress} from './emailAddress';
+import type {Recipient} from './recipient';
 import {serializeEmailAddress} from './serializeEmailAddress';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoRecipient(recipient: Recipient | undefined = {} as Recipient) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoSingleValueLegacyExtendedProperty.ts b/packages/test/generatedCode/models/deserializeIntoSingleValueLegacyExtendedProperty.ts
index 3fd53a9ed..9e34a27f5 100644
--- a/packages/test/generatedCode/models/deserializeIntoSingleValueLegacyExtendedProperty.ts
+++ b/packages/test/generatedCode/models/deserializeIntoSingleValueLegacyExtendedProperty.ts
@@ -1,6 +1,6 @@
 import {deserializeIntoEntity} from './deserializeIntoEntity';
-import {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoSingleValueLegacyExtendedProperty(singleValueLegacyExtendedProperty: SingleValueLegacyExtendedProperty | undefined = {} as SingleValueLegacyExtendedProperty) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/deserializeIntoSizeRange.ts b/packages/test/generatedCode/models/deserializeIntoSizeRange.ts
index 952fcd317..8d798ffd0 100644
--- a/packages/test/generatedCode/models/deserializeIntoSizeRange.ts
+++ b/packages/test/generatedCode/models/deserializeIntoSizeRange.ts
@@ -1,5 +1,5 @@
-import {SizeRange} from './sizeRange';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {SizeRange} from './sizeRange';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function deserializeIntoSizeRange(sizeRange: SizeRange | undefined = {} as SizeRange) : Record<string, (node: ParseNode) => void> {
     return {
diff --git a/packages/test/generatedCode/models/emailAddress.ts b/packages/test/generatedCode/models/emailAddress.ts
index fccb17c11..081c1b341 100644
--- a/packages/test/generatedCode/models/emailAddress.ts
+++ b/packages/test/generatedCode/models/emailAddress.ts
@@ -1,4 +1,4 @@
-import {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
 
 export interface EmailAddress extends AdditionalDataHolder, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/entity.ts b/packages/test/generatedCode/models/entity.ts
index bed07c76f..d29987408 100644
--- a/packages/test/generatedCode/models/entity.ts
+++ b/packages/test/generatedCode/models/entity.ts
@@ -1,4 +1,4 @@
-import {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
 
 export interface Entity extends AdditionalDataHolder, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/extension.ts b/packages/test/generatedCode/models/extension.ts
index 36d229b49..c12272c7b 100644
--- a/packages/test/generatedCode/models/extension.ts
+++ b/packages/test/generatedCode/models/extension.ts
@@ -1,5 +1,5 @@
-import {Entity} from './entity';
-import {Parsable} from '@microsoft/kiota-abstractions';
+import type {Entity} from './entity';
+import type {Parsable} from '@microsoft/kiota-abstractions';
 
 export interface Extension extends Entity, Parsable {
 }
diff --git a/packages/test/generatedCode/models/extensionCollectionResponse.ts b/packages/test/generatedCode/models/extensionCollectionResponse.ts
index a6cbba1df..2b49cbf2a 100644
--- a/packages/test/generatedCode/models/extensionCollectionResponse.ts
+++ b/packages/test/generatedCode/models/extensionCollectionResponse.ts
@@ -1,5 +1,5 @@
-import {Extension} from './extension';
-import {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+import type {Extension} from './extension';
+import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
 
 export interface ExtensionCollectionResponse extends AdditionalDataHolder, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/followupFlag.ts b/packages/test/generatedCode/models/followupFlag.ts
index 0754f38c8..6fbff6afd 100644
--- a/packages/test/generatedCode/models/followupFlag.ts
+++ b/packages/test/generatedCode/models/followupFlag.ts
@@ -1,6 +1,6 @@
-import {DateTimeTimeZone} from './dateTimeTimeZone';
+import type {DateTimeTimeZone} from './dateTimeTimeZone';
 import {FollowupFlagStatus} from './followupFlagStatus';
-import {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
 
 export interface FollowupFlag extends AdditionalDataHolder, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/inferenceClassification.ts b/packages/test/generatedCode/models/inferenceClassification.ts
index 88b8fa2a3..3200f7a22 100644
--- a/packages/test/generatedCode/models/inferenceClassification.ts
+++ b/packages/test/generatedCode/models/inferenceClassification.ts
@@ -1,6 +1,6 @@
-import {Entity} from './entity';
-import {InferenceClassificationOverride} from './inferenceClassificationOverride';
-import {Parsable} from '@microsoft/kiota-abstractions';
+import type {Entity} from './entity';
+import type {InferenceClassificationOverride} from './inferenceClassificationOverride';
+import type {Parsable} from '@microsoft/kiota-abstractions';
 
 export interface InferenceClassification extends Entity, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/inferenceClassificationOverride.ts b/packages/test/generatedCode/models/inferenceClassificationOverride.ts
index f98995c8f..df7d9e016 100644
--- a/packages/test/generatedCode/models/inferenceClassificationOverride.ts
+++ b/packages/test/generatedCode/models/inferenceClassificationOverride.ts
@@ -1,7 +1,7 @@
-import {EmailAddress} from './emailAddress';
-import {Entity} from './entity';
+import type {EmailAddress} from './emailAddress';
+import type {Entity} from './entity';
 import {InferenceClassificationType} from './inferenceClassificationType';
-import {Parsable} from '@microsoft/kiota-abstractions';
+import type {Parsable} from '@microsoft/kiota-abstractions';
 
 export interface InferenceClassificationOverride extends Entity, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/inferenceClassificationOverrideCollectionResponse.ts b/packages/test/generatedCode/models/inferenceClassificationOverrideCollectionResponse.ts
index 035565cb4..e7c3cf571 100644
--- a/packages/test/generatedCode/models/inferenceClassificationOverrideCollectionResponse.ts
+++ b/packages/test/generatedCode/models/inferenceClassificationOverrideCollectionResponse.ts
@@ -1,5 +1,5 @@
-import {InferenceClassificationOverride} from './inferenceClassificationOverride';
-import {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+import type {InferenceClassificationOverride} from './inferenceClassificationOverride';
+import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
 
 export interface InferenceClassificationOverrideCollectionResponse extends AdditionalDataHolder, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/internetMessageHeader.ts b/packages/test/generatedCode/models/internetMessageHeader.ts
index 58b3a8921..c3ee21d89 100644
--- a/packages/test/generatedCode/models/internetMessageHeader.ts
+++ b/packages/test/generatedCode/models/internetMessageHeader.ts
@@ -1,4 +1,4 @@
-import {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
 
 export interface InternetMessageHeader extends AdditionalDataHolder, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/itemBody.ts b/packages/test/generatedCode/models/itemBody.ts
index e7ba440e7..10cf1fd2a 100644
--- a/packages/test/generatedCode/models/itemBody.ts
+++ b/packages/test/generatedCode/models/itemBody.ts
@@ -1,5 +1,5 @@
 import {BodyType} from './bodyType';
-import {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
 
 export interface ItemBody extends AdditionalDataHolder, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/mailFolder.ts b/packages/test/generatedCode/models/mailFolder.ts
index ebfe54902..4d14024c3 100644
--- a/packages/test/generatedCode/models/mailFolder.ts
+++ b/packages/test/generatedCode/models/mailFolder.ts
@@ -1,9 +1,9 @@
-import {Entity} from './entity';
-import {Message} from './message';
-import {MessageRule} from './messageRule';
-import {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
-import {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
-import {Parsable} from '@microsoft/kiota-abstractions';
+import type {Entity} from './entity';
+import type {Message} from './message';
+import type {MessageRule} from './messageRule';
+import type {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
+import type {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
+import type {Parsable} from '@microsoft/kiota-abstractions';
 
 export interface MailFolder extends Entity, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/mailFolderCollectionResponse.ts b/packages/test/generatedCode/models/mailFolderCollectionResponse.ts
index 5b0a4b396..b9f483a35 100644
--- a/packages/test/generatedCode/models/mailFolderCollectionResponse.ts
+++ b/packages/test/generatedCode/models/mailFolderCollectionResponse.ts
@@ -1,5 +1,5 @@
-import {MailFolder} from './mailFolder';
-import {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+import type {MailFolder} from './mailFolder';
+import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
 
 export interface MailFolderCollectionResponse extends AdditionalDataHolder, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/message.ts b/packages/test/generatedCode/models/message.ts
index 23556c00f..5d43a27de 100644
--- a/packages/test/generatedCode/models/message.ts
+++ b/packages/test/generatedCode/models/message.ts
@@ -1,15 +1,15 @@
-import {Attachment} from './attachment';
-import {Extension} from './extension';
-import {FollowupFlag} from './followupFlag';
+import type {Attachment} from './attachment';
+import type {Extension} from './extension';
+import type {FollowupFlag} from './followupFlag';
 import {Importance} from './importance';
 import {InferenceClassificationType} from './inferenceClassificationType';
-import {InternetMessageHeader} from './internetMessageHeader';
-import {ItemBody} from './itemBody';
-import {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
-import {OutlookItem} from './outlookItem';
-import {Recipient} from './recipient';
-import {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
-import {Parsable} from '@microsoft/kiota-abstractions';
+import type {InternetMessageHeader} from './internetMessageHeader';
+import type {ItemBody} from './itemBody';
+import type {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
+import type {OutlookItem} from './outlookItem';
+import type {Recipient} from './recipient';
+import type {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
+import type {Parsable} from '@microsoft/kiota-abstractions';
 
 export interface Message extends OutlookItem, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/messageCollectionResponse.ts b/packages/test/generatedCode/models/messageCollectionResponse.ts
index cd4d3db00..2ded66bc8 100644
--- a/packages/test/generatedCode/models/messageCollectionResponse.ts
+++ b/packages/test/generatedCode/models/messageCollectionResponse.ts
@@ -1,5 +1,5 @@
-import {Message} from './message';
-import {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+import type {Message} from './message';
+import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
 
 export interface MessageCollectionResponse extends AdditionalDataHolder, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/messageRule.ts b/packages/test/generatedCode/models/messageRule.ts
index 585769271..468036408 100644
--- a/packages/test/generatedCode/models/messageRule.ts
+++ b/packages/test/generatedCode/models/messageRule.ts
@@ -1,7 +1,7 @@
-import {Entity} from './entity';
-import {MessageRuleActions} from './messageRuleActions';
-import {MessageRulePredicates} from './messageRulePredicates';
-import {Parsable} from '@microsoft/kiota-abstractions';
+import type {Entity} from './entity';
+import type {MessageRuleActions} from './messageRuleActions';
+import type {MessageRulePredicates} from './messageRulePredicates';
+import type {Parsable} from '@microsoft/kiota-abstractions';
 
 export interface MessageRule extends Entity, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/messageRuleActions.ts b/packages/test/generatedCode/models/messageRuleActions.ts
index e36d84857..9821edcf7 100644
--- a/packages/test/generatedCode/models/messageRuleActions.ts
+++ b/packages/test/generatedCode/models/messageRuleActions.ts
@@ -1,6 +1,6 @@
 import {Importance} from './importance';
-import {Recipient} from './recipient';
-import {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+import type {Recipient} from './recipient';
+import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
 
 export interface MessageRuleActions extends AdditionalDataHolder, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/messageRuleCollectionResponse.ts b/packages/test/generatedCode/models/messageRuleCollectionResponse.ts
index 9e9247ef5..9a721a9be 100644
--- a/packages/test/generatedCode/models/messageRuleCollectionResponse.ts
+++ b/packages/test/generatedCode/models/messageRuleCollectionResponse.ts
@@ -1,5 +1,5 @@
-import {MessageRule} from './messageRule';
-import {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+import type {MessageRule} from './messageRule';
+import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
 
 export interface MessageRuleCollectionResponse extends AdditionalDataHolder, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/messageRulePredicates.ts b/packages/test/generatedCode/models/messageRulePredicates.ts
index 1cebac2a8..4ce5aae6c 100644
--- a/packages/test/generatedCode/models/messageRulePredicates.ts
+++ b/packages/test/generatedCode/models/messageRulePredicates.ts
@@ -1,9 +1,9 @@
 import {Importance} from './importance';
 import {MessageActionFlag} from './messageActionFlag';
-import {Recipient} from './recipient';
+import type {Recipient} from './recipient';
 import {Sensitivity} from './sensitivity';
-import {SizeRange} from './sizeRange';
-import {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+import type {SizeRange} from './sizeRange';
+import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
 
 export interface MessageRulePredicates extends AdditionalDataHolder, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/multiValueLegacyExtendedProperty.ts b/packages/test/generatedCode/models/multiValueLegacyExtendedProperty.ts
index 18b20e432..a11336624 100644
--- a/packages/test/generatedCode/models/multiValueLegacyExtendedProperty.ts
+++ b/packages/test/generatedCode/models/multiValueLegacyExtendedProperty.ts
@@ -1,5 +1,5 @@
-import {Entity} from './entity';
-import {Parsable} from '@microsoft/kiota-abstractions';
+import type {Entity} from './entity';
+import type {Parsable} from '@microsoft/kiota-abstractions';
 
 export interface MultiValueLegacyExtendedProperty extends Entity, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/outlookItem.ts b/packages/test/generatedCode/models/outlookItem.ts
index 93b962cf5..2eb0e78f6 100644
--- a/packages/test/generatedCode/models/outlookItem.ts
+++ b/packages/test/generatedCode/models/outlookItem.ts
@@ -1,5 +1,5 @@
-import {Entity} from './entity';
-import {Parsable} from '@microsoft/kiota-abstractions';
+import type {Entity} from './entity';
+import type {Parsable} from '@microsoft/kiota-abstractions';
 
 export interface OutlookItem extends Entity, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/recipient.ts b/packages/test/generatedCode/models/recipient.ts
index 104583a28..1377a72d5 100644
--- a/packages/test/generatedCode/models/recipient.ts
+++ b/packages/test/generatedCode/models/recipient.ts
@@ -1,5 +1,5 @@
-import {EmailAddress} from './emailAddress';
-import {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+import type {EmailAddress} from './emailAddress';
+import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
 
 export interface Recipient extends AdditionalDataHolder, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/serializeAttachment.ts b/packages/test/generatedCode/models/serializeAttachment.ts
index cc6c25e53..08952b5aa 100644
--- a/packages/test/generatedCode/models/serializeAttachment.ts
+++ b/packages/test/generatedCode/models/serializeAttachment.ts
@@ -1,6 +1,6 @@
-import {Attachment} from './attachment';
+import type {Attachment} from './attachment';
 import {serializeEntity} from './serializeEntity';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeAttachment(writer: SerializationWriter, attachment: Attachment | undefined = {} as Attachment) : void {
         serializeEntity(writer, attachment)
diff --git a/packages/test/generatedCode/models/serializeAttachmentCollectionResponse.ts b/packages/test/generatedCode/models/serializeAttachmentCollectionResponse.ts
index 442f65d29..5da820b28 100644
--- a/packages/test/generatedCode/models/serializeAttachmentCollectionResponse.ts
+++ b/packages/test/generatedCode/models/serializeAttachmentCollectionResponse.ts
@@ -1,7 +1,7 @@
-import {Attachment} from './attachment';
-import {AttachmentCollectionResponse} from './attachmentCollectionResponse';
+import type {Attachment} from './attachment';
+import type {AttachmentCollectionResponse} from './attachmentCollectionResponse';
 import {serializeAttachment} from './serializeAttachment';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeAttachmentCollectionResponse(writer: SerializationWriter, attachmentCollectionResponse: AttachmentCollectionResponse | undefined = {} as AttachmentCollectionResponse) : void {
         writer.writeStringValue("@odata.nextLink", attachmentCollectionResponse.odataNextLink);
diff --git a/packages/test/generatedCode/models/serializeDateTimeTimeZone.ts b/packages/test/generatedCode/models/serializeDateTimeTimeZone.ts
index 7aa3f46c0..39061bcf8 100644
--- a/packages/test/generatedCode/models/serializeDateTimeTimeZone.ts
+++ b/packages/test/generatedCode/models/serializeDateTimeTimeZone.ts
@@ -1,5 +1,5 @@
-import {DateTimeTimeZone} from './dateTimeTimeZone';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {DateTimeTimeZone} from './dateTimeTimeZone';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeDateTimeTimeZone(writer: SerializationWriter, dateTimeTimeZone: DateTimeTimeZone | undefined = {} as DateTimeTimeZone) : void {
         writer.writeStringValue("dateTime", dateTimeTimeZone.dateTime);
diff --git a/packages/test/generatedCode/models/serializeEmailAddress.ts b/packages/test/generatedCode/models/serializeEmailAddress.ts
index dd7afecba..9429b55c5 100644
--- a/packages/test/generatedCode/models/serializeEmailAddress.ts
+++ b/packages/test/generatedCode/models/serializeEmailAddress.ts
@@ -1,5 +1,5 @@
-import {EmailAddress} from './emailAddress';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {EmailAddress} from './emailAddress';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeEmailAddress(writer: SerializationWriter, emailAddress: EmailAddress | undefined = {} as EmailAddress) : void {
         writer.writeStringValue("address", emailAddress.address);
diff --git a/packages/test/generatedCode/models/serializeEntity.ts b/packages/test/generatedCode/models/serializeEntity.ts
index 3a57ca23d..beaff2785 100644
--- a/packages/test/generatedCode/models/serializeEntity.ts
+++ b/packages/test/generatedCode/models/serializeEntity.ts
@@ -1,5 +1,5 @@
-import {Entity} from './entity';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {Entity} from './entity';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeEntity(writer: SerializationWriter, entity: Entity | undefined = {} as Entity) : void {
         writer.writeStringValue("id", entity.id);
diff --git a/packages/test/generatedCode/models/serializeExtension.ts b/packages/test/generatedCode/models/serializeExtension.ts
index f5a28b908..2444d2e95 100644
--- a/packages/test/generatedCode/models/serializeExtension.ts
+++ b/packages/test/generatedCode/models/serializeExtension.ts
@@ -1,6 +1,6 @@
-import {Extension} from './extension';
+import type {Extension} from './extension';
 import {serializeEntity} from './serializeEntity';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeExtension(writer: SerializationWriter, extension: Extension | undefined = {} as Extension) : void {
         serializeEntity(writer, extension)
diff --git a/packages/test/generatedCode/models/serializeExtensionCollectionResponse.ts b/packages/test/generatedCode/models/serializeExtensionCollectionResponse.ts
index ff7db346c..2c3ecebeb 100644
--- a/packages/test/generatedCode/models/serializeExtensionCollectionResponse.ts
+++ b/packages/test/generatedCode/models/serializeExtensionCollectionResponse.ts
@@ -1,7 +1,7 @@
-import {Extension} from './extension';
-import {ExtensionCollectionResponse} from './extensionCollectionResponse';
+import type {Extension} from './extension';
+import type {ExtensionCollectionResponse} from './extensionCollectionResponse';
 import {serializeExtension} from './serializeExtension';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeExtensionCollectionResponse(writer: SerializationWriter, extensionCollectionResponse: ExtensionCollectionResponse | undefined = {} as ExtensionCollectionResponse) : void {
         writer.writeStringValue("@odata.nextLink", extensionCollectionResponse.odataNextLink);
diff --git a/packages/test/generatedCode/models/serializeFollowupFlag.ts b/packages/test/generatedCode/models/serializeFollowupFlag.ts
index 65bc8ae4e..3e420e1a4 100644
--- a/packages/test/generatedCode/models/serializeFollowupFlag.ts
+++ b/packages/test/generatedCode/models/serializeFollowupFlag.ts
@@ -1,8 +1,8 @@
-import {DateTimeTimeZone} from './dateTimeTimeZone';
-import {FollowupFlag} from './followupFlag';
+import type {DateTimeTimeZone} from './dateTimeTimeZone';
+import type {FollowupFlag} from './followupFlag';
 import {FollowupFlagStatus} from './followupFlagStatus';
 import {serializeDateTimeTimeZone} from './serializeDateTimeTimeZone';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeFollowupFlag(writer: SerializationWriter, followupFlag: FollowupFlag | undefined = {} as FollowupFlag) : void {
         writer.writeObjectValue<DateTimeTimeZone>("completedDateTime", followupFlag.completedDateTime, serializeDateTimeTimeZone);
diff --git a/packages/test/generatedCode/models/serializeInferenceClassification.ts b/packages/test/generatedCode/models/serializeInferenceClassification.ts
index a95763bed..bdd3ebfad 100644
--- a/packages/test/generatedCode/models/serializeInferenceClassification.ts
+++ b/packages/test/generatedCode/models/serializeInferenceClassification.ts
@@ -1,8 +1,8 @@
-import {InferenceClassification} from './inferenceClassification';
-import {InferenceClassificationOverride} from './inferenceClassificationOverride';
+import type {InferenceClassification} from './inferenceClassification';
+import type {InferenceClassificationOverride} from './inferenceClassificationOverride';
 import {serializeEntity} from './serializeEntity';
 import {serializeInferenceClassificationOverride} from './serializeInferenceClassificationOverride';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeInferenceClassification(writer: SerializationWriter, inferenceClassification: InferenceClassification | undefined = {} as InferenceClassification) : void {
         serializeEntity(writer, inferenceClassification)
diff --git a/packages/test/generatedCode/models/serializeInferenceClassificationOverride.ts b/packages/test/generatedCode/models/serializeInferenceClassificationOverride.ts
index e4d5e6393..6735c5444 100644
--- a/packages/test/generatedCode/models/serializeInferenceClassificationOverride.ts
+++ b/packages/test/generatedCode/models/serializeInferenceClassificationOverride.ts
@@ -1,9 +1,9 @@
-import {EmailAddress} from './emailAddress';
-import {InferenceClassificationOverride} from './inferenceClassificationOverride';
+import type {EmailAddress} from './emailAddress';
+import type {InferenceClassificationOverride} from './inferenceClassificationOverride';
 import {InferenceClassificationType} from './inferenceClassificationType';
 import {serializeEmailAddress} from './serializeEmailAddress';
 import {serializeEntity} from './serializeEntity';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeInferenceClassificationOverride(writer: SerializationWriter, inferenceClassificationOverride: InferenceClassificationOverride | undefined = {} as InferenceClassificationOverride) : void {
         serializeEntity(writer, inferenceClassificationOverride)
diff --git a/packages/test/generatedCode/models/serializeInferenceClassificationOverrideCollectionResponse.ts b/packages/test/generatedCode/models/serializeInferenceClassificationOverrideCollectionResponse.ts
index a644cd863..58066ea2e 100644
--- a/packages/test/generatedCode/models/serializeInferenceClassificationOverrideCollectionResponse.ts
+++ b/packages/test/generatedCode/models/serializeInferenceClassificationOverrideCollectionResponse.ts
@@ -1,7 +1,7 @@
-import {InferenceClassificationOverride} from './inferenceClassificationOverride';
-import {InferenceClassificationOverrideCollectionResponse} from './inferenceClassificationOverrideCollectionResponse';
+import type {InferenceClassificationOverride} from './inferenceClassificationOverride';
+import type {InferenceClassificationOverrideCollectionResponse} from './inferenceClassificationOverrideCollectionResponse';
 import {serializeInferenceClassificationOverride} from './serializeInferenceClassificationOverride';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeInferenceClassificationOverrideCollectionResponse(writer: SerializationWriter, inferenceClassificationOverrideCollectionResponse: InferenceClassificationOverrideCollectionResponse | undefined = {} as InferenceClassificationOverrideCollectionResponse) : void {
         writer.writeStringValue("@odata.nextLink", inferenceClassificationOverrideCollectionResponse.odataNextLink);
diff --git a/packages/test/generatedCode/models/serializeInternetMessageHeader.ts b/packages/test/generatedCode/models/serializeInternetMessageHeader.ts
index 0dd18b076..022b785fc 100644
--- a/packages/test/generatedCode/models/serializeInternetMessageHeader.ts
+++ b/packages/test/generatedCode/models/serializeInternetMessageHeader.ts
@@ -1,5 +1,5 @@
-import {InternetMessageHeader} from './internetMessageHeader';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {InternetMessageHeader} from './internetMessageHeader';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeInternetMessageHeader(writer: SerializationWriter, internetMessageHeader: InternetMessageHeader | undefined = {} as InternetMessageHeader) : void {
         writer.writeStringValue("name", internetMessageHeader.name);
diff --git a/packages/test/generatedCode/models/serializeItemBody.ts b/packages/test/generatedCode/models/serializeItemBody.ts
index be35250b7..b6723e264 100644
--- a/packages/test/generatedCode/models/serializeItemBody.ts
+++ b/packages/test/generatedCode/models/serializeItemBody.ts
@@ -1,6 +1,6 @@
 import {BodyType} from './bodyType';
-import {ItemBody} from './itemBody';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {ItemBody} from './itemBody';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeItemBody(writer: SerializationWriter, itemBody: ItemBody | undefined = {} as ItemBody) : void {
         writer.writeStringValue("content", itemBody.content);
diff --git a/packages/test/generatedCode/models/serializeMailFolder.ts b/packages/test/generatedCode/models/serializeMailFolder.ts
index 035e0b90e..7882b6eb0 100644
--- a/packages/test/generatedCode/models/serializeMailFolder.ts
+++ b/packages/test/generatedCode/models/serializeMailFolder.ts
@@ -1,14 +1,14 @@
-import {MailFolder} from './mailFolder';
-import {Message} from './message';
-import {MessageRule} from './messageRule';
-import {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
+import type {MailFolder} from './mailFolder';
+import type {Message} from './message';
+import type {MessageRule} from './messageRule';
+import type {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
 import {serializeEntity} from './serializeEntity';
 import {serializeMessage} from './serializeMessage';
 import {serializeMessageRule} from './serializeMessageRule';
 import {serializeMultiValueLegacyExtendedProperty} from './serializeMultiValueLegacyExtendedProperty';
 import {serializeSingleValueLegacyExtendedProperty} from './serializeSingleValueLegacyExtendedProperty';
-import {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeMailFolder(writer: SerializationWriter, mailFolder: MailFolder | undefined = {} as MailFolder) : void {
         serializeEntity(writer, mailFolder)
diff --git a/packages/test/generatedCode/models/serializeMailFolderCollectionResponse.ts b/packages/test/generatedCode/models/serializeMailFolderCollectionResponse.ts
index a56877a7b..504710047 100644
--- a/packages/test/generatedCode/models/serializeMailFolderCollectionResponse.ts
+++ b/packages/test/generatedCode/models/serializeMailFolderCollectionResponse.ts
@@ -1,7 +1,7 @@
-import {MailFolder} from './mailFolder';
-import {MailFolderCollectionResponse} from './mailFolderCollectionResponse';
+import type {MailFolder} from './mailFolder';
+import type {MailFolderCollectionResponse} from './mailFolderCollectionResponse';
 import {serializeMailFolder} from './serializeMailFolder';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeMailFolderCollectionResponse(writer: SerializationWriter, mailFolderCollectionResponse: MailFolderCollectionResponse | undefined = {} as MailFolderCollectionResponse) : void {
         writer.writeStringValue("@odata.nextLink", mailFolderCollectionResponse.odataNextLink);
diff --git a/packages/test/generatedCode/models/serializeMessage.ts b/packages/test/generatedCode/models/serializeMessage.ts
index b93dcfb41..ab0aaccab 100644
--- a/packages/test/generatedCode/models/serializeMessage.ts
+++ b/packages/test/generatedCode/models/serializeMessage.ts
@@ -1,13 +1,13 @@
-import {Attachment} from './attachment';
-import {Extension} from './extension';
-import {FollowupFlag} from './followupFlag';
+import type {Attachment} from './attachment';
+import type {Extension} from './extension';
+import type {FollowupFlag} from './followupFlag';
 import {Importance} from './importance';
 import {InferenceClassificationType} from './inferenceClassificationType';
-import {InternetMessageHeader} from './internetMessageHeader';
-import {ItemBody} from './itemBody';
-import {Message} from './message';
-import {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
-import {Recipient} from './recipient';
+import type {InternetMessageHeader} from './internetMessageHeader';
+import type {ItemBody} from './itemBody';
+import type {Message} from './message';
+import type {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
+import type {Recipient} from './recipient';
 import {serializeAttachment} from './serializeAttachment';
 import {serializeExtension} from './serializeExtension';
 import {serializeFollowupFlag} from './serializeFollowupFlag';
@@ -17,8 +17,8 @@ import {serializeMultiValueLegacyExtendedProperty} from './serializeMultiValueLe
 import {serializeOutlookItem} from './serializeOutlookItem';
 import {serializeRecipient} from './serializeRecipient';
 import {serializeSingleValueLegacyExtendedProperty} from './serializeSingleValueLegacyExtendedProperty';
-import {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeMessage(writer: SerializationWriter, message: Message | undefined = {} as Message) : void {
         serializeOutlookItem(writer, message)
diff --git a/packages/test/generatedCode/models/serializeMessageCollectionResponse.ts b/packages/test/generatedCode/models/serializeMessageCollectionResponse.ts
index 2634bda19..3f0282f90 100644
--- a/packages/test/generatedCode/models/serializeMessageCollectionResponse.ts
+++ b/packages/test/generatedCode/models/serializeMessageCollectionResponse.ts
@@ -1,7 +1,7 @@
-import {Message} from './message';
-import {MessageCollectionResponse} from './messageCollectionResponse';
+import type {Message} from './message';
+import type {MessageCollectionResponse} from './messageCollectionResponse';
 import {serializeMessage} from './serializeMessage';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeMessageCollectionResponse(writer: SerializationWriter, messageCollectionResponse: MessageCollectionResponse | undefined = {} as MessageCollectionResponse) : void {
         writer.writeStringValue("@odata.nextLink", messageCollectionResponse.odataNextLink);
diff --git a/packages/test/generatedCode/models/serializeMessageRule.ts b/packages/test/generatedCode/models/serializeMessageRule.ts
index 3b6bcbfb2..dc04199a6 100644
--- a/packages/test/generatedCode/models/serializeMessageRule.ts
+++ b/packages/test/generatedCode/models/serializeMessageRule.ts
@@ -1,10 +1,10 @@
-import {MessageRule} from './messageRule';
-import {MessageRuleActions} from './messageRuleActions';
-import {MessageRulePredicates} from './messageRulePredicates';
+import type {MessageRule} from './messageRule';
+import type {MessageRuleActions} from './messageRuleActions';
+import type {MessageRulePredicates} from './messageRulePredicates';
 import {serializeEntity} from './serializeEntity';
 import {serializeMessageRuleActions} from './serializeMessageRuleActions';
 import {serializeMessageRulePredicates} from './serializeMessageRulePredicates';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeMessageRule(writer: SerializationWriter, messageRule: MessageRule | undefined = {} as MessageRule) : void {
         serializeEntity(writer, messageRule)
diff --git a/packages/test/generatedCode/models/serializeMessageRuleActions.ts b/packages/test/generatedCode/models/serializeMessageRuleActions.ts
index 51ad42f47..03f1c4c13 100644
--- a/packages/test/generatedCode/models/serializeMessageRuleActions.ts
+++ b/packages/test/generatedCode/models/serializeMessageRuleActions.ts
@@ -1,8 +1,8 @@
 import {Importance} from './importance';
-import {MessageRuleActions} from './messageRuleActions';
-import {Recipient} from './recipient';
+import type {MessageRuleActions} from './messageRuleActions';
+import type {Recipient} from './recipient';
 import {serializeRecipient} from './serializeRecipient';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeMessageRuleActions(writer: SerializationWriter, messageRuleActions: MessageRuleActions | undefined = {} as MessageRuleActions) : void {
         writer.writeCollectionOfPrimitiveValues<string>("assignCategories", messageRuleActions.assignCategories);
diff --git a/packages/test/generatedCode/models/serializeMessageRuleCollectionResponse.ts b/packages/test/generatedCode/models/serializeMessageRuleCollectionResponse.ts
index 12b241173..61f0120de 100644
--- a/packages/test/generatedCode/models/serializeMessageRuleCollectionResponse.ts
+++ b/packages/test/generatedCode/models/serializeMessageRuleCollectionResponse.ts
@@ -1,7 +1,7 @@
-import {MessageRule} from './messageRule';
-import {MessageRuleCollectionResponse} from './messageRuleCollectionResponse';
+import type {MessageRule} from './messageRule';
+import type {MessageRuleCollectionResponse} from './messageRuleCollectionResponse';
 import {serializeMessageRule} from './serializeMessageRule';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeMessageRuleCollectionResponse(writer: SerializationWriter, messageRuleCollectionResponse: MessageRuleCollectionResponse | undefined = {} as MessageRuleCollectionResponse) : void {
         writer.writeStringValue("@odata.nextLink", messageRuleCollectionResponse.odataNextLink);
diff --git a/packages/test/generatedCode/models/serializeMessageRulePredicates.ts b/packages/test/generatedCode/models/serializeMessageRulePredicates.ts
index 38fa8e2ea..8b50b7350 100644
--- a/packages/test/generatedCode/models/serializeMessageRulePredicates.ts
+++ b/packages/test/generatedCode/models/serializeMessageRulePredicates.ts
@@ -1,12 +1,12 @@
 import {Importance} from './importance';
 import {MessageActionFlag} from './messageActionFlag';
-import {MessageRulePredicates} from './messageRulePredicates';
-import {Recipient} from './recipient';
+import type {MessageRulePredicates} from './messageRulePredicates';
+import type {Recipient} from './recipient';
 import {Sensitivity} from './sensitivity';
 import {serializeRecipient} from './serializeRecipient';
 import {serializeSizeRange} from './serializeSizeRange';
-import {SizeRange} from './sizeRange';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {SizeRange} from './sizeRange';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeMessageRulePredicates(writer: SerializationWriter, messageRulePredicates: MessageRulePredicates | undefined = {} as MessageRulePredicates) : void {
         writer.writeCollectionOfPrimitiveValues<string>("bodyContains", messageRulePredicates.bodyContains);
diff --git a/packages/test/generatedCode/models/serializeMultiValueLegacyExtendedProperty.ts b/packages/test/generatedCode/models/serializeMultiValueLegacyExtendedProperty.ts
index 009fa2754..641775882 100644
--- a/packages/test/generatedCode/models/serializeMultiValueLegacyExtendedProperty.ts
+++ b/packages/test/generatedCode/models/serializeMultiValueLegacyExtendedProperty.ts
@@ -1,6 +1,6 @@
-import {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
+import type {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
 import {serializeEntity} from './serializeEntity';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeMultiValueLegacyExtendedProperty(writer: SerializationWriter, multiValueLegacyExtendedProperty: MultiValueLegacyExtendedProperty | undefined = {} as MultiValueLegacyExtendedProperty) : void {
         serializeEntity(writer, multiValueLegacyExtendedProperty)
diff --git a/packages/test/generatedCode/models/serializeOutlookItem.ts b/packages/test/generatedCode/models/serializeOutlookItem.ts
index 43bb57763..25a745fb8 100644
--- a/packages/test/generatedCode/models/serializeOutlookItem.ts
+++ b/packages/test/generatedCode/models/serializeOutlookItem.ts
@@ -1,6 +1,6 @@
-import {OutlookItem} from './outlookItem';
+import type {OutlookItem} from './outlookItem';
 import {serializeEntity} from './serializeEntity';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeOutlookItem(writer: SerializationWriter, outlookItem: OutlookItem | undefined = {} as OutlookItem) : void {
         serializeEntity(writer, outlookItem)
diff --git a/packages/test/generatedCode/models/serializeRecipient.ts b/packages/test/generatedCode/models/serializeRecipient.ts
index a04815454..5b8a46094 100644
--- a/packages/test/generatedCode/models/serializeRecipient.ts
+++ b/packages/test/generatedCode/models/serializeRecipient.ts
@@ -1,7 +1,7 @@
-import {EmailAddress} from './emailAddress';
-import {Recipient} from './recipient';
+import type {EmailAddress} from './emailAddress';
+import type {Recipient} from './recipient';
 import {serializeEmailAddress} from './serializeEmailAddress';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeRecipient(writer: SerializationWriter, recipient: Recipient | undefined = {} as Recipient) : void {
         writer.writeObjectValue<EmailAddress>("emailAddress", recipient.emailAddress, serializeEmailAddress);
diff --git a/packages/test/generatedCode/models/serializeSingleValueLegacyExtendedProperty.ts b/packages/test/generatedCode/models/serializeSingleValueLegacyExtendedProperty.ts
index d1b92e457..fd0c03a5b 100644
--- a/packages/test/generatedCode/models/serializeSingleValueLegacyExtendedProperty.ts
+++ b/packages/test/generatedCode/models/serializeSingleValueLegacyExtendedProperty.ts
@@ -1,6 +1,6 @@
 import {serializeEntity} from './serializeEntity';
-import {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
-import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
+import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeSingleValueLegacyExtendedProperty(writer: SerializationWriter, singleValueLegacyExtendedProperty: SingleValueLegacyExtendedProperty | undefined = {} as SingleValueLegacyExtendedProperty) : void {
         serializeEntity(writer, singleValueLegacyExtendedProperty)
diff --git a/packages/test/generatedCode/models/serializeSizeRange.ts b/packages/test/generatedCode/models/serializeSizeRange.ts
index e243dc1ff..0df84de96 100644
--- a/packages/test/generatedCode/models/serializeSizeRange.ts
+++ b/packages/test/generatedCode/models/serializeSizeRange.ts
@@ -1,5 +1,5 @@
-import {SizeRange} from './sizeRange';
-import {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
+import type {SizeRange} from './sizeRange';
+import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
 
 export function serializeSizeRange(writer: SerializationWriter, sizeRange: SizeRange | undefined = {} as SizeRange) : void {
         writer.writeNumberValue("maximumSize", sizeRange.maximumSize);
diff --git a/packages/test/generatedCode/models/singleValueLegacyExtendedProperty.ts b/packages/test/generatedCode/models/singleValueLegacyExtendedProperty.ts
index a6e9ebd8b..778f5ad74 100644
--- a/packages/test/generatedCode/models/singleValueLegacyExtendedProperty.ts
+++ b/packages/test/generatedCode/models/singleValueLegacyExtendedProperty.ts
@@ -1,5 +1,5 @@
-import {Entity} from './entity';
-import {Parsable} from '@microsoft/kiota-abstractions';
+import type {Entity} from './entity';
+import type {Parsable} from '@microsoft/kiota-abstractions';
 
 export interface SingleValueLegacyExtendedProperty extends Entity, Parsable {
     /**
diff --git a/packages/test/generatedCode/models/sizeRange.ts b/packages/test/generatedCode/models/sizeRange.ts
index ec5e19316..401ca0ca6 100644
--- a/packages/test/generatedCode/models/sizeRange.ts
+++ b/packages/test/generatedCode/models/sizeRange.ts
@@ -1,4 +1,4 @@
-import {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
 
 export interface SizeRange extends AdditionalDataHolder, Parsable {
     /**
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts b/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts
index e3e9c0e2c..85af26958 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts
@@ -1,11 +1,12 @@
 import {createInferenceClassificationFromDiscriminatorValue} from '../../../models/createInferenceClassificationFromDiscriminatorValue';
 import {deserializeIntoInferenceClassification} from '../../../models/deserializeIntoInferenceClassification';
-import {InferenceClassification} from '../../../models/inferenceClassification';
+import type {InferenceClassification} from '../../../models/inferenceClassification';
 import {serializeInferenceClassification} from '../../../models/serializeInferenceClassification';
 import {InferenceClassificationRequestBuilderGetRequestConfiguration} from './inferenceClassificationRequestBuilderGetRequestConfiguration';
 import {InferenceClassificationRequestBuilderPatchRequestConfiguration} from './inferenceClassificationRequestBuilderPatchRequestConfiguration';
 import {OverridesRequestBuilder} from './overrides/overridesRequestBuilder';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/inferenceClassification
@@ -42,8 +43,7 @@ export class InferenceClassificationRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of InferenceClassification
      */
-    public patch(body: InferenceClassification | undefined, requestConfiguration?: InferenceClassificationRequestBuilderPatchRequestConfiguration | undefined) : Promise<InferenceClassification | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public patch(body: InferenceClassification, requestConfiguration?: InferenceClassificationRequestBuilderPatchRequestConfiguration | undefined) : Promise<InferenceClassification | undefined> {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
@@ -73,7 +73,7 @@ export class InferenceClassificationRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPatchRequestInformation(body: InferenceClassification | undefined, requestConfiguration?: InferenceClassificationRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
+    public toPatchRequestInformation(body: InferenceClassification, requestConfiguration?: InferenceClassificationRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -84,7 +84,7 @@ export class InferenceClassificationRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeInferenceClassification);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeInferenceClassification);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderGetRequestConfiguration.ts
index f6eb41eab..665aa961a 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {InferenceClassificationRequestBuilderGetQueryParameters} from './inferenceClassificationRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface InferenceClassificationRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderPatchRequestConfiguration.ts
index dd6a06583..ec305fa25 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderPatchRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderPatchRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface InferenceClassificationRequestBuilderPatchRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilder.ts
index db9ae4658..d6711be99 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilder.ts
@@ -1,5 +1,6 @@
 import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides/$count
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilderGetRequestConfiguration.ts
index 9d7ff3183..8aee05dfa 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface CountRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilder.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilder.ts
index d01d9e958..5d981f069 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilder.ts
@@ -1,11 +1,12 @@
 import {createInferenceClassificationOverrideFromDiscriminatorValue} from '../../../../../models/createInferenceClassificationOverrideFromDiscriminatorValue';
 import {deserializeIntoInferenceClassificationOverride} from '../../../../../models/deserializeIntoInferenceClassificationOverride';
-import {InferenceClassificationOverride} from '../../../../../models/inferenceClassificationOverride';
+import type {InferenceClassificationOverride} from '../../../../../models/inferenceClassificationOverride';
 import {serializeInferenceClassificationOverride} from '../../../../../models/serializeInferenceClassificationOverride';
 import {InferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration} from './inferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration';
 import {InferenceClassificationOverrideItemRequestBuilderGetRequestConfiguration} from './inferenceClassificationOverrideItemRequestBuilderGetRequestConfiguration';
 import {InferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration} from './inferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides/{inferenceClassificationOverride-id}
@@ -23,7 +24,7 @@ export class InferenceClassificationOverrideItemRequestBuilder extends BaseReque
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/inferenceclassificationoverride-delete?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/inferenceclassificationoverride-delete?view=graph-rest-1.0|Find more info here}
      */
     public delete(requestConfiguration?: InferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration | undefined) : Promise<ArrayBuffer | undefined> {
         const requestInfo = this.toDeleteRequestInformation(
@@ -43,14 +44,13 @@ export class InferenceClassificationOverrideItemRequestBuilder extends BaseReque
         return this.requestAdapter.sendAsync<InferenceClassificationOverride>(requestInfo, createInferenceClassificationOverrideFromDiscriminatorValue, 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.
+     * 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
-     * @see {@link https://docs.microsoft.com/graph/api/inferenceclassificationoverride-update?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/inferenceclassificationoverride-update?view=graph-rest-1.0|Find more info here}
      */
-    public patch(body: InferenceClassificationOverride | undefined, requestConfiguration?: InferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<InferenceClassificationOverride | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public patch(body: InferenceClassificationOverride, requestConfiguration?: InferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<InferenceClassificationOverride | undefined> {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
@@ -91,12 +91,12 @@ export class InferenceClassificationOverrideItemRequestBuilder extends BaseReque
         return requestInfo;
     };
     /**
-     * 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.
+     * 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
      */
-    public toPatchRequestInformation(body: InferenceClassificationOverride | undefined, requestConfiguration?: InferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
+    public toPatchRequestInformation(body: InferenceClassificationOverride, requestConfiguration?: InferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -107,7 +107,7 @@ export class InferenceClassificationOverrideItemRequestBuilder extends BaseReque
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeInferenceClassificationOverride);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeInferenceClassificationOverride);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration.ts
index 085e2df0c..c88ce1e33 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface InferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderGetRequestConfiguration.ts
index a0d8d7122..d5a99844a 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {InferenceClassificationOverrideItemRequestBuilderGetQueryParameters} from './inferenceClassificationOverrideItemRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface InferenceClassificationOverrideItemRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration.ts
index 1290774d9..bf333482b 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface InferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts
index ab60ec889..de6b97c56 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts
@@ -2,13 +2,14 @@ import {InferenceClassificationOverrideCollectionResponse} from '../../../../mod
 import {createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue} from '../../../../models/createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue';
 import {createInferenceClassificationOverrideFromDiscriminatorValue} from '../../../../models/createInferenceClassificationOverrideFromDiscriminatorValue';
 import {deserializeIntoInferenceClassificationOverride} from '../../../../models/deserializeIntoInferenceClassificationOverride';
-import {InferenceClassificationOverride} from '../../../../models/inferenceClassificationOverride';
+import type {InferenceClassificationOverride} from '../../../../models/inferenceClassificationOverride';
 import {serializeInferenceClassificationOverride} from '../../../../models/serializeInferenceClassificationOverride';
 import {CountRequestBuilder} from './count/countRequestBuilder';
 import {InferenceClassificationOverrideItemRequestBuilder} from './item/inferenceClassificationOverrideItemRequestBuilder';
 import {OverridesRequestBuilderGetRequestConfiguration} from './overridesRequestBuilderGetRequestConfiguration';
 import {OverridesRequestBuilderPostRequestConfiguration} from './overridesRequestBuilderPostRequestConfiguration';
-import {BaseRequestBuilder, getPathParameters, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides
@@ -22,7 +23,7 @@ export class OverridesRequestBuilder extends BaseRequestBuilder {
     }
     /**
      * Gets an item from the ApiSdk.users.item.inferenceClassification.overrides.item collection
-     * @param inferenceClassificationOverrideId Unique identifier of the item
+     * @param inferenceClassificationOverrideId The unique identifier of inferenceClassificationOverride
      * @returns a InferenceClassificationOverrideItemRequestBuilder
      */
     public byInferenceClassificationOverrideId(inferenceClassificationOverrideId: string) : InferenceClassificationOverrideItemRequestBuilder {
@@ -43,7 +44,7 @@ export class OverridesRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/inferenceclassification-list-overrides?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/inferenceclassification-list-overrides?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: OverridesRequestBuilderGetRequestConfiguration | undefined) : Promise<InferenceClassificationOverrideCollectionResponse | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -52,14 +53,13 @@ export class OverridesRequestBuilder extends BaseRequestBuilder {
         return this.requestAdapter.sendAsync<InferenceClassificationOverrideCollectionResponse>(requestInfo, createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue, undefined);
     };
     /**
-     * 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**
+     * 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
-     * @see {@link https://docs.microsoft.com/graph/api/inferenceclassification-post-overrides?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/inferenceclassification-post-overrides?view=graph-rest-1.0|Find more info here}
      */
-    public post(body: InferenceClassificationOverride | undefined, requestConfiguration?: OverridesRequestBuilderPostRequestConfiguration | undefined) : Promise<InferenceClassificationOverride | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public post(body: InferenceClassificationOverride, requestConfiguration?: OverridesRequestBuilderPostRequestConfiguration | undefined) : Promise<InferenceClassificationOverride | undefined> {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
@@ -84,12 +84,12 @@ export class OverridesRequestBuilder extends BaseRequestBuilder {
         return requestInfo;
     };
     /**
-     * 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**
+     * 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
      */
-    public toPostRequestInformation(body: InferenceClassificationOverride | undefined, requestConfiguration?: OverridesRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
+    public toPostRequestInformation(body: InferenceClassificationOverride, requestConfiguration?: OverridesRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -100,7 +100,7 @@ export class OverridesRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeInferenceClassificationOverride);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeInferenceClassificationOverride);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderGetRequestConfiguration.ts
index de14e75cc..eced106ac 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {OverridesRequestBuilderGetQueryParameters} from './overridesRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface OverridesRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderPostRequestConfiguration.ts
index 772863c0f..d08ad0106 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderPostRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderPostRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface OverridesRequestBuilderPostRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilder.ts
index 7fac405b4..a485433b5 100644
--- a/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilder.ts
@@ -1,5 +1,6 @@
 import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/$count
diff --git a/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilderGetRequestConfiguration.ts
index 9d7ff3183..8aee05dfa 100644
--- a/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface CountRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts
index 1b57d7296..4849a6fdd 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts
@@ -2,13 +2,14 @@ import {MailFolderCollectionResponse} from '../../../../../models/';
 import {createMailFolderCollectionResponseFromDiscriminatorValue} from '../../../../../models/createMailFolderCollectionResponseFromDiscriminatorValue';
 import {createMailFolderFromDiscriminatorValue} from '../../../../../models/createMailFolderFromDiscriminatorValue';
 import {deserializeIntoMailFolder} from '../../../../../models/deserializeIntoMailFolder';
-import {MailFolder} from '../../../../../models/mailFolder';
+import type {MailFolder} from '../../../../../models/mailFolder';
 import {serializeMailFolder} from '../../../../../models/serializeMailFolder';
 import {ChildFoldersRequestBuilderGetRequestConfiguration} from './childFoldersRequestBuilderGetRequestConfiguration';
 import {ChildFoldersRequestBuilderPostRequestConfiguration} from './childFoldersRequestBuilderPostRequestConfiguration';
 import {CountRequestBuilder} from './count/countRequestBuilder';
 import {MailFolderItemRequestBuilder} from './item/mailFolderItemRequestBuilder';
-import {BaseRequestBuilder, getPathParameters, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders
@@ -22,7 +23,7 @@ export class ChildFoldersRequestBuilder extends BaseRequestBuilder {
     }
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.childFolders.item collection
-     * @param mailFolderId1 Unique identifier of the item
+     * @param mailFolderId1 The unique identifier of mailFolder
      * @returns a MailFolderItemRequestBuilder
      */
     public byMailFolderId1(mailFolderId1: string) : MailFolderItemRequestBuilder {
@@ -37,13 +38,13 @@ export class ChildFoldersRequestBuilder extends BaseRequestBuilder {
      * @param requestAdapter The request adapter to use to execute the requests.
      */
     public constructor(pathParameters: Record<string, unknown> | string | undefined, requestAdapter: RequestAdapter) {
-        super(pathParameters, requestAdapter, "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders{?%24top,%24skip,%24filter,%24count,%24orderby,%24select,%24expand}");
+        super(pathParameters, requestAdapter, "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders{?includeHiddenFolders,%24top,%24skip,%24filter,%24count,%24orderby,%24select,%24expand}");
     };
     /**
-     * Get the folder collection under the specified folder. You can use the `.../me/mailFolders` shortcut to get the top-level folder collection and navigate to another folder. By default, this operation does not return hidden folders. Use a query parameter _includeHiddenFolders_ to include them in the response.
+     * 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
-     * @see {@link https://docs.microsoft.com/graph/api/mailfolder-list-childfolders?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/mailfolder-list-childfolders?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: ChildFoldersRequestBuilderGetRequestConfiguration | undefined) : Promise<MailFolderCollectionResponse | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -52,21 +53,20 @@ export class ChildFoldersRequestBuilder extends BaseRequestBuilder {
         return this.requestAdapter.sendAsync<MailFolderCollectionResponse>(requestInfo, createMailFolderCollectionResponseFromDiscriminatorValue, undefined);
     };
     /**
-     * Create a new mailSearchFolder in the specified user's mailbox.
+     * Use this API to create a new child mailFolder. 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
-     * @see {@link https://docs.microsoft.com/graph/api/mailsearchfolder-post?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/mailfolder-post-childfolders?view=graph-rest-1.0|Find more info here}
      */
-    public post(body: MailFolder | undefined, requestConfiguration?: ChildFoldersRequestBuilderPostRequestConfiguration | undefined) : Promise<MailFolder | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public post(body: MailFolder, requestConfiguration?: ChildFoldersRequestBuilderPostRequestConfiguration | undefined) : Promise<MailFolder | undefined> {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
         return this.requestAdapter.sendAsync<MailFolder>(requestInfo, createMailFolderFromDiscriminatorValue, undefined);
     };
     /**
-     * Get the folder collection under the specified folder. You can use the `.../me/mailFolders` shortcut to get the top-level folder collection and navigate to another folder. By default, this operation does not return hidden folders. Use a query parameter _includeHiddenFolders_ to include them in the response.
+     * 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
      */
@@ -84,12 +84,12 @@ export class ChildFoldersRequestBuilder extends BaseRequestBuilder {
         return requestInfo;
     };
     /**
-     * Create a new mailSearchFolder in the specified user's mailbox.
+     * Use this API to create a new child mailFolder. 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
      */
-    public toPostRequestInformation(body: MailFolder | undefined, requestConfiguration?: ChildFoldersRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
+    public toPostRequestInformation(body: MailFolder, requestConfiguration?: ChildFoldersRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -100,7 +100,7 @@ export class ChildFoldersRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeMailFolder);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMailFolder);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderGetQueryParameters.ts
index d594212c0..16b08322d 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderGetQueryParameters.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderGetQueryParameters.ts
@@ -12,6 +12,10 @@ export interface ChildFoldersRequestBuilderGetQueryParameters {
      * Filter items by property values
      */
     filter?: string | undefined;
+    /**
+     * Include Hidden Folders
+     */
+    includeHiddenFolders?: string | undefined;
     /**
      * Order items by property values
      */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderGetRequestConfiguration.ts
index 464aabbff..eeb47b884 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {ChildFoldersRequestBuilderGetQueryParameters} from './childFoldersRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ChildFoldersRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderPostRequestConfiguration.ts
index ba3e0d961..7b40063fd 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderPostRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderPostRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ChildFoldersRequestBuilderPostRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilder.ts
index 95f5269bb..9b0faf772 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilder.ts
@@ -1,5 +1,6 @@
 import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/$count
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilderGetRequestConfiguration.ts
index 9d7ff3183..8aee05dfa 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface CountRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilder.ts
index ef64d0479..e25d484e3 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilder.ts
@@ -1,13 +1,14 @@
 import {createMailFolderFromDiscriminatorValue} from '../../../../../../models/createMailFolderFromDiscriminatorValue';
 import {deserializeIntoMailFolder} from '../../../../../../models/deserializeIntoMailFolder';
-import {MailFolder} from '../../../../../../models/mailFolder';
+import type {MailFolder} from '../../../../../../models/mailFolder';
 import {serializeMailFolder} from '../../../../../../models/serializeMailFolder';
 import {MailFolderItemRequestBuilderDeleteRequestConfiguration} from './mailFolderItemRequestBuilderDeleteRequestConfiguration';
 import {MailFolderItemRequestBuilderGetRequestConfiguration} from './mailFolderItemRequestBuilderGetRequestConfiguration';
 import {MailFolderItemRequestBuilderPatchRequestConfiguration} from './mailFolderItemRequestBuilderPatchRequestConfiguration';
 import {MessageRulesRequestBuilder} from './messageRules/messageRulesRequestBuilder';
 import {MessagesRequestBuilder} from './messages/messagesRequestBuilder';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}
@@ -31,7 +32,7 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
      * @param requestAdapter The request adapter to use to execute the requests.
      */
     public constructor(pathParameters: Record<string, unknown> | string | undefined, requestAdapter: RequestAdapter) {
-        super(pathParameters, requestAdapter, "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}{?%24select,%24expand}");
+        super(pathParameters, requestAdapter, "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}{?includeHiddenFolders,%24select,%24expand}");
     };
     /**
      * Delete navigation property childFolders for users
@@ -61,8 +62,7 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of MailFolder
      */
-    public patch(body: MailFolder | undefined, requestConfiguration?: MailFolderItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<MailFolder | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public patch(body: MailFolder, requestConfiguration?: MailFolderItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<MailFolder | undefined> {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
@@ -108,7 +108,7 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPatchRequestInformation(body: MailFolder | undefined, requestConfiguration?: MailFolderItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
+    public toPatchRequestInformation(body: MailFolder, requestConfiguration?: MailFolderItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -119,7 +119,7 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeMailFolder);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMailFolder);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderDeleteRequestConfiguration.ts
index 9fcf8c952..db075adce 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderDeleteRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderDeleteRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MailFolderItemRequestBuilderDeleteRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderGetQueryParameters.ts
index ce8b65f5b..4c303a776 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderGetQueryParameters.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderGetQueryParameters.ts
@@ -4,6 +4,10 @@ export interface MailFolderItemRequestBuilderGetQueryParameters {
      * Expand related entities
      */
     expand?: string[] | undefined;
+    /**
+     * Include Hidden Folders
+     */
+    includeHiddenFolders?: string | undefined;
     /**
      * Select properties to be returned
      */
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderGetRequestConfiguration.ts
index 8598ed633..2bad54a29 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {MailFolderItemRequestBuilderGetQueryParameters} from './mailFolderItemRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MailFolderItemRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderPatchRequestConfiguration.ts
index 8d7752edf..fe2821123 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderPatchRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderPatchRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MailFolderItemRequestBuilderPatchRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilder.ts
index a4a5b0af4..56a4a918a 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilder.ts
@@ -1,5 +1,6 @@
 import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messageRules/$count
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilderGetRequestConfiguration.ts
index 9d7ff3183..8aee05dfa 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface CountRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilder.ts
index 6749f08a8..fc0f87eee 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilder.ts
@@ -1,11 +1,12 @@
 import {createMessageRuleFromDiscriminatorValue} from '../../../../../../../../models/createMessageRuleFromDiscriminatorValue';
 import {deserializeIntoMessageRule} from '../../../../../../../../models/deserializeIntoMessageRule';
-import {MessageRule} from '../../../../../../../../models/messageRule';
+import type {MessageRule} from '../../../../../../../../models/messageRule';
 import {serializeMessageRule} from '../../../../../../../../models/serializeMessageRule';
 import {MessageRuleItemRequestBuilderDeleteRequestConfiguration} from './messageRuleItemRequestBuilderDeleteRequestConfiguration';
 import {MessageRuleItemRequestBuilderGetRequestConfiguration} from './messageRuleItemRequestBuilderGetRequestConfiguration';
 import {MessageRuleItemRequestBuilderPatchRequestConfiguration} from './messageRuleItemRequestBuilderPatchRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messageRules/{messageRule-id}
@@ -23,7 +24,7 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
      * Delete the specified messageRule object.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of ArrayBuffer
-     * @see {@link https://docs.microsoft.com/graph/api/messagerule-delete?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/messagerule-delete?view=graph-rest-1.0|Find more info here}
      */
     public delete(requestConfiguration?: MessageRuleItemRequestBuilderDeleteRequestConfiguration | undefined) : Promise<ArrayBuffer | undefined> {
         const requestInfo = this.toDeleteRequestInformation(
@@ -35,7 +36,7 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/messagerule-get?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/messagerule-get?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: MessageRuleItemRequestBuilderGetRequestConfiguration | undefined) : Promise<MessageRule | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -48,10 +49,9 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of MessageRule
-     * @see {@link https://docs.microsoft.com/graph/api/messagerule-update?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/messagerule-update?view=graph-rest-1.0|Find more info here}
      */
-    public patch(body: MessageRule | undefined, requestConfiguration?: MessageRuleItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<MessageRule | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public patch(body: MessageRule, requestConfiguration?: MessageRuleItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<MessageRule | undefined> {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
@@ -97,7 +97,7 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPatchRequestInformation(body: MessageRule | undefined, requestConfiguration?: MessageRuleItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
+    public toPatchRequestInformation(body: MessageRule, requestConfiguration?: MessageRuleItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -108,7 +108,7 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeMessageRule);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessageRule);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderDeleteRequestConfiguration.ts
index 26b3a6896..2f71af4a3 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderDeleteRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderDeleteRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageRuleItemRequestBuilderDeleteRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderGetRequestConfiguration.ts
index 3fb2e5102..bd5c6d537 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {MessageRuleItemRequestBuilderGetQueryParameters} from './messageRuleItemRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageRuleItemRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderPatchRequestConfiguration.ts
index 33552db25..fb4e6f881 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderPatchRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderPatchRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageRuleItemRequestBuilderPatchRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilder.ts
index e39a397c5..bc81be598 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilder.ts
@@ -2,13 +2,14 @@ import {MessageRuleCollectionResponse} from '../../../../../../../models/';
 import {createMessageRuleCollectionResponseFromDiscriminatorValue} from '../../../../../../../models/createMessageRuleCollectionResponseFromDiscriminatorValue';
 import {createMessageRuleFromDiscriminatorValue} from '../../../../../../../models/createMessageRuleFromDiscriminatorValue';
 import {deserializeIntoMessageRule} from '../../../../../../../models/deserializeIntoMessageRule';
-import {MessageRule} from '../../../../../../../models/messageRule';
+import type {MessageRule} from '../../../../../../../models/messageRule';
 import {serializeMessageRule} from '../../../../../../../models/serializeMessageRule';
 import {CountRequestBuilder} from './count/countRequestBuilder';
 import {MessageRuleItemRequestBuilder} from './item/messageRuleItemRequestBuilder';
 import {MessageRulesRequestBuilderGetRequestConfiguration} from './messageRulesRequestBuilderGetRequestConfiguration';
 import {MessageRulesRequestBuilderPostRequestConfiguration} from './messageRulesRequestBuilderPostRequestConfiguration';
-import {BaseRequestBuilder, getPathParameters, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messageRules
@@ -22,7 +23,7 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
     }
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.childFolders.item.messageRules.item collection
-     * @param messageRuleId Unique identifier of the item
+     * @param messageRuleId The unique identifier of messageRule
      * @returns a MessageRuleItemRequestBuilder
      */
     public byMessageRuleId(messageRuleId: string) : MessageRuleItemRequestBuilder {
@@ -43,7 +44,7 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/mailfolder-list-messagerules?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/mailfolder-list-messagerules?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: MessageRulesRequestBuilderGetRequestConfiguration | undefined) : Promise<MessageRuleCollectionResponse | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -56,10 +57,9 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of MessageRule
-     * @see {@link https://docs.microsoft.com/graph/api/mailfolder-post-messagerules?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/mailfolder-post-messagerules?view=graph-rest-1.0|Find more info here}
      */
-    public post(body: MessageRule | undefined, requestConfiguration?: MessageRulesRequestBuilderPostRequestConfiguration | undefined) : Promise<MessageRule | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public post(body: MessageRule, requestConfiguration?: MessageRulesRequestBuilderPostRequestConfiguration | undefined) : Promise<MessageRule | undefined> {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
@@ -89,7 +89,7 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPostRequestInformation(body: MessageRule | undefined, requestConfiguration?: MessageRulesRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
+    public toPostRequestInformation(body: MessageRule, requestConfiguration?: MessageRulesRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -100,7 +100,7 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeMessageRule);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessageRule);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderGetRequestConfiguration.ts
index 827a17bcb..3f039e72b 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {MessageRulesRequestBuilderGetQueryParameters} from './messageRulesRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageRulesRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderPostRequestConfiguration.ts
index 91094930d..1c42756e9 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderPostRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderPostRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageRulesRequestBuilderPostRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilder.ts
index f4036963b..474126b38 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilder.ts
@@ -1,5 +1,6 @@
 import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/$count
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
index 9d7ff3183..8aee05dfa 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface CountRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts
index e9fbe952e..7107531c8 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts
@@ -1,5 +1,5 @@
 import {AttachmentCollectionResponse} from '../../../../../../../../../models/';
-import {Attachment} from '../../../../../../../../../models/attachment';
+import type {Attachment} from '../../../../../../../../../models/attachment';
 import {createAttachmentCollectionResponseFromDiscriminatorValue} from '../../../../../../../../../models/createAttachmentCollectionResponseFromDiscriminatorValue';
 import {createAttachmentFromDiscriminatorValue} from '../../../../../../../../../models/createAttachmentFromDiscriminatorValue';
 import {deserializeIntoAttachment} from '../../../../../../../../../models/deserializeIntoAttachment';
@@ -8,7 +8,8 @@ import {AttachmentsRequestBuilderGetRequestConfiguration} from './attachmentsReq
 import {AttachmentsRequestBuilderPostRequestConfiguration} from './attachmentsRequestBuilderPostRequestConfiguration';
 import {CountRequestBuilder} from './count/countRequestBuilder';
 import {AttachmentItemRequestBuilder} from './item/attachmentItemRequestBuilder';
-import {BaseRequestBuilder, getPathParameters, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/attachments
@@ -22,7 +23,7 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
     }
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.childFolders.item.messages.item.attachments.item collection
-     * @param attachmentId Unique identifier of the item
+     * @param attachmentId The unique identifier of attachment
      * @returns a AttachmentItemRequestBuilder
      */
     public byAttachmentId(attachmentId: string) : AttachmentItemRequestBuilder {
@@ -43,7 +44,7 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
      * Retrieve a list of attachment objects.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of AttachmentCollectionResponse
-     * @see {@link https://docs.microsoft.com/graph/api/eventmessage-list-attachments?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/eventmessage-list-attachments?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: AttachmentsRequestBuilderGetRequestConfiguration | undefined) : Promise<AttachmentCollectionResponse | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -56,10 +57,9 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of Attachment
-     * @see {@link https://docs.microsoft.com/graph/api/message-post-attachments?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/message-post-attachments?view=graph-rest-1.0|Find more info here}
      */
-    public post(body: Attachment | undefined, requestConfiguration?: AttachmentsRequestBuilderPostRequestConfiguration | undefined) : Promise<Attachment | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public post(body: Attachment, requestConfiguration?: AttachmentsRequestBuilderPostRequestConfiguration | undefined) : Promise<Attachment | undefined> {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
@@ -89,7 +89,7 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPostRequestInformation(body: Attachment | undefined, requestConfiguration?: AttachmentsRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
+    public toPostRequestInformation(body: Attachment, requestConfiguration?: AttachmentsRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -100,7 +100,7 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeAttachment);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeAttachment);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
index 9aadf62f1..e486e1cfb 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {AttachmentsRequestBuilderGetQueryParameters} from './attachmentsRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface AttachmentsRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
index 5ede62796..404d93fc7 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface AttachmentsRequestBuilderPostRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilder.ts
index c4dadaaaf..db54c4090 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilder.ts
@@ -1,5 +1,6 @@
 import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/attachments/$count
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
index 9d7ff3183..8aee05dfa 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface CountRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
index 1f01aeb6f..bb2049869 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
@@ -2,7 +2,8 @@ import {Attachment} from '../../../../../../../../../../models/';
 import {createAttachmentFromDiscriminatorValue} from '../../../../../../../../../../models/createAttachmentFromDiscriminatorValue';
 import {AttachmentItemRequestBuilderDeleteRequestConfiguration} from './attachmentItemRequestBuilderDeleteRequestConfiguration';
 import {AttachmentItemRequestBuilderGetRequestConfiguration} from './attachmentItemRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/attachments/{attachment-id}
@@ -31,7 +32,7 @@ export class AttachmentItemRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/attachment-get?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/attachment-get?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: AttachmentItemRequestBuilderGetRequestConfiguration | undefined) : Promise<Attachment | undefined> {
         const requestInfo = this.toGetRequestInformation(
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
index 5077ef3cd..3538f5b72 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface AttachmentItemRequestBuilderDeleteRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
index 63b42911b..a62b74418 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {AttachmentItemRequestBuilderGetQueryParameters} from './attachmentItemRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface AttachmentItemRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilder.ts
index 4de6b17e3..c2746ae4c 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilder.ts
@@ -1,5 +1,6 @@
 import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/extensions/$count
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
index 9d7ff3183..8aee05dfa 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface CountRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilder.ts
index adda52845..f6c7aa204 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilder.ts
@@ -2,13 +2,14 @@ import {ExtensionCollectionResponse} from '../../../../../../../../../models/';
 import {createExtensionCollectionResponseFromDiscriminatorValue} from '../../../../../../../../../models/createExtensionCollectionResponseFromDiscriminatorValue';
 import {createExtensionFromDiscriminatorValue} from '../../../../../../../../../models/createExtensionFromDiscriminatorValue';
 import {deserializeIntoExtension} from '../../../../../../../../../models/deserializeIntoExtension';
-import {Extension} from '../../../../../../../../../models/extension';
+import type {Extension} from '../../../../../../../../../models/extension';
 import {serializeExtension} from '../../../../../../../../../models/serializeExtension';
 import {CountRequestBuilder} from './count/countRequestBuilder';
 import {ExtensionsRequestBuilderGetRequestConfiguration} from './extensionsRequestBuilderGetRequestConfiguration';
 import {ExtensionsRequestBuilderPostRequestConfiguration} from './extensionsRequestBuilderPostRequestConfiguration';
 import {ExtensionItemRequestBuilder} from './item/extensionItemRequestBuilder';
-import {BaseRequestBuilder, getPathParameters, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/extensions
@@ -22,7 +23,7 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
     }
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.childFolders.item.messages.item.extensions.item collection
-     * @param extensionId Unique identifier of the item
+     * @param extensionId The unique identifier of extension
      * @returns a ExtensionItemRequestBuilder
      */
     public byExtensionId(extensionId: string) : ExtensionItemRequestBuilder {
@@ -51,14 +52,13 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
         return this.requestAdapter.sendAsync<ExtensionCollectionResponse>(requestInfo, createExtensionCollectionResponseFromDiscriminatorValue, 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. See known limitations of open extensions for more information. The table in the Permissions section lists the resources that support open extensions.
+     * 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
-     * @see {@link https://docs.microsoft.com/graph/api/opentypeextension-post-opentypeextension?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-post-opentypeextension?view=graph-rest-1.0|Find more info here}
      */
-    public post(body: Extension | undefined, requestConfiguration?: ExtensionsRequestBuilderPostRequestConfiguration | undefined) : Promise<Extension | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public post(body: Extension, requestConfiguration?: ExtensionsRequestBuilderPostRequestConfiguration | undefined) : Promise<Extension | undefined> {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
@@ -83,12 +83,12 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
         return requestInfo;
     };
     /**
-     * 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. See known limitations of open extensions for more information. The table in the Permissions section lists the resources that support open extensions.
+     * 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
      */
-    public toPostRequestInformation(body: Extension | undefined, requestConfiguration?: ExtensionsRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
+    public toPostRequestInformation(body: Extension, requestConfiguration?: ExtensionsRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -99,7 +99,7 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeExtension);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeExtension);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
index 86a733a06..296d2e099 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {ExtensionsRequestBuilderGetQueryParameters} from './extensionsRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ExtensionsRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
index 269015385..2d639a33d 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ExtensionsRequestBuilderPostRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
index 644df98d7..7ace12f79 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
@@ -1,11 +1,12 @@
 import {createExtensionFromDiscriminatorValue} from '../../../../../../../../../../models/createExtensionFromDiscriminatorValue';
 import {deserializeIntoExtension} from '../../../../../../../../../../models/deserializeIntoExtension';
-import {Extension} from '../../../../../../../../../../models/extension';
+import type {Extension} from '../../../../../../../../../../models/extension';
 import {serializeExtension} from '../../../../../../../../../../models/serializeExtension';
 import {ExtensionItemRequestBuilderDeleteRequestConfiguration} from './extensionItemRequestBuilderDeleteRequestConfiguration';
 import {ExtensionItemRequestBuilderGetRequestConfiguration} from './extensionItemRequestBuilderGetRequestConfiguration';
 import {ExtensionItemRequestBuilderPatchRequestConfiguration} from './extensionItemRequestBuilderPatchRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/extensions/{extension-id}
@@ -20,10 +21,10 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
         super(pathParameters, requestAdapter, "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}/extensions/{extension%2Did}{?%24select,%24expand}");
     };
     /**
-     * Delete an open extension (openTypeExtension object) from the specified instance of a resource.  See the table in the Permissions section for the list of resources that support open extensions.
+     * 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
-     * @see {@link https://docs.microsoft.com/graph/api/opentypeextension-delete?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-delete?view=graph-rest-1.0|Find more info here}
      */
     public delete(requestConfiguration?: ExtensionItemRequestBuilderDeleteRequestConfiguration | undefined) : Promise<ArrayBuffer | undefined> {
         const requestInfo = this.toDeleteRequestInformation(
@@ -35,7 +36,7 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/opentypeextension-get?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-get?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: ExtensionItemRequestBuilderGetRequestConfiguration | undefined) : Promise<Extension | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -49,15 +50,14 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of Extension
      */
-    public patch(body: Extension | undefined, requestConfiguration?: ExtensionItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<Extension | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public patch(body: Extension, requestConfiguration?: ExtensionItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<Extension | undefined> {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
         return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, undefined);
     };
     /**
-     * Delete an open extension (openTypeExtension object) from the specified instance of a resource.  See the table in the Permissions section for the list of resources that support open extensions.
+     * 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
      */
@@ -96,7 +96,7 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPatchRequestInformation(body: Extension | undefined, requestConfiguration?: ExtensionItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
+    public toPatchRequestInformation(body: Extension, requestConfiguration?: ExtensionItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -107,7 +107,7 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeExtension);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeExtension);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
index b3efa8083..dab7a050d 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ExtensionItemRequestBuilderDeleteRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
index fdbede22c..9929a4faf 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {ExtensionItemRequestBuilderGetQueryParameters} from './extensionItemRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ExtensionItemRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
index 47383016b..c46dbb966 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ExtensionItemRequestBuilderPatchRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilder.ts
index d473ddd0f..508de9720 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilder.ts
@@ -1,6 +1,6 @@
 import {createMessageFromDiscriminatorValue} from '../../../../../../../../models/createMessageFromDiscriminatorValue';
 import {deserializeIntoMessage} from '../../../../../../../../models/deserializeIntoMessage';
-import {Message} from '../../../../../../../../models/message';
+import type {Message} from '../../../../../../../../models/message';
 import {serializeMessage} from '../../../../../../../../models/serializeMessage';
 import {AttachmentsRequestBuilder} from './attachments/attachmentsRequestBuilder';
 import {ExtensionsRequestBuilder} from './extensions/extensionsRequestBuilder';
@@ -8,7 +8,8 @@ import {MessageItemRequestBuilderDeleteRequestConfiguration} from './messageItem
 import {MessageItemRequestBuilderGetRequestConfiguration} from './messageItemRequestBuilderGetRequestConfiguration';
 import {MessageItemRequestBuilderPatchRequestConfiguration} from './messageItemRequestBuilderPatchRequestConfiguration';
 import {ContentRequestBuilder} from './value/contentRequestBuilder';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}
@@ -68,8 +69,7 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of Message
      */
-    public patch(body: Message | undefined, requestConfiguration?: MessageItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<Message | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public patch(body: Message, requestConfiguration?: MessageItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<Message | undefined> {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
@@ -115,7 +115,7 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPatchRequestInformation(body: Message | undefined, requestConfiguration?: MessageItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
+    public toPatchRequestInformation(body: Message, requestConfiguration?: MessageItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -126,7 +126,7 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeMessage);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessage);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
index 6c964b34b..502dc2f91 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageItemRequestBuilderDeleteRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
index 5a2809576..a659064b4 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {MessageItemRequestBuilderGetQueryParameters} from './messageItemRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageItemRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
index c37f315b5..00baca8f7 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageItemRequestBuilderPatchRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilder.ts
index 23899223b..c4325ea67 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilder.ts
@@ -1,6 +1,7 @@
 import {ContentRequestBuilderGetRequestConfiguration} from './contentRequestBuilderGetRequestConfiguration';
 import {ContentRequestBuilderPutRequestConfiguration} from './contentRequestBuilderPutRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/$value
@@ -18,7 +19,7 @@ export class ContentRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/mailfolder-list-messages?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/mailfolder-list-messages?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: ContentRequestBuilderGetRequestConfiguration | undefined) : Promise<ArrayBuffer | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -33,7 +34,6 @@ export class ContentRequestBuilder extends BaseRequestBuilder {
      * @returns a Promise of ArrayBuffer
      */
     public put(body: ArrayBuffer | undefined, requestConfiguration?: ContentRequestBuilderPutRequestConfiguration | undefined) : Promise<ArrayBuffer | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
         const requestInfo = this.toPutRequestInformation(
             body, requestConfiguration
         );
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
index 63588eb43..10e67530a 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ContentRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
index b5d42481f..8a61d2a6d 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ContentRequestBuilderPutRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilder.ts
index 1569d6006..e160f872c 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilder.ts
@@ -2,13 +2,14 @@ import {MessageCollectionResponse} from '../../../../../../../models/';
 import {createMessageCollectionResponseFromDiscriminatorValue} from '../../../../../../../models/createMessageCollectionResponseFromDiscriminatorValue';
 import {createMessageFromDiscriminatorValue} from '../../../../../../../models/createMessageFromDiscriminatorValue';
 import {deserializeIntoMessage} from '../../../../../../../models/deserializeIntoMessage';
-import {Message} from '../../../../../../../models/message';
+import type {Message} from '../../../../../../../models/message';
 import {serializeMessage} from '../../../../../../../models/serializeMessage';
 import {CountRequestBuilder} from './count/countRequestBuilder';
 import {MessageItemRequestBuilder} from './item/messageItemRequestBuilder';
 import {MessagesRequestBuilderGetRequestConfiguration} from './messagesRequestBuilderGetRequestConfiguration';
 import {MessagesRequestBuilderPostRequestConfiguration} from './messagesRequestBuilderPostRequestConfiguration';
-import {BaseRequestBuilder, getPathParameters, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages
@@ -22,7 +23,7 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
     }
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.childFolders.item.messages.item collection
-     * @param messageId Unique identifier of the item
+     * @param messageId The unique identifier of message
      * @returns a MessageItemRequestBuilder
      */
     public byMessageId(messageId: string) : MessageItemRequestBuilder {
@@ -43,7 +44,7 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/mailfolder-list-messages?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/mailfolder-list-messages?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: MessagesRequestBuilderGetRequestConfiguration | undefined) : Promise<MessageCollectionResponse | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -56,10 +57,9 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of Message
-     * @see {@link https://docs.microsoft.com/graph/api/mailfolder-post-messages?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/mailfolder-post-messages?view=graph-rest-1.0|Find more info here}
      */
-    public post(body: Message | undefined, requestConfiguration?: MessagesRequestBuilderPostRequestConfiguration | undefined) : Promise<Message | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public post(body: Message, requestConfiguration?: MessagesRequestBuilderPostRequestConfiguration | undefined) : Promise<Message | undefined> {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
@@ -89,7 +89,7 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPostRequestInformation(body: Message | undefined, requestConfiguration?: MessagesRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
+    public toPostRequestInformation(body: Message, requestConfiguration?: MessagesRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -100,7 +100,7 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeMessage);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessage);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
index 2969bfc61..73034f00f 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {MessagesRequestBuilderGetQueryParameters} from './messagesRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessagesRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
index 120df47b8..a6d72f7d2 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessagesRequestBuilderPostRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilder.ts
index 88f37ea55..36e6e80a1 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilder.ts
@@ -1,6 +1,6 @@
 import {createMailFolderFromDiscriminatorValue} from '../../../../models/createMailFolderFromDiscriminatorValue';
 import {deserializeIntoMailFolder} from '../../../../models/deserializeIntoMailFolder';
-import {MailFolder} from '../../../../models/mailFolder';
+import type {MailFolder} from '../../../../models/mailFolder';
 import {serializeMailFolder} from '../../../../models/serializeMailFolder';
 import {ChildFoldersRequestBuilder} from './childFolders/childFoldersRequestBuilder';
 import {MailFolderItemRequestBuilderDeleteRequestConfiguration} from './mailFolderItemRequestBuilderDeleteRequestConfiguration';
@@ -8,7 +8,8 @@ import {MailFolderItemRequestBuilderGetRequestConfiguration} from './mailFolderI
 import {MailFolderItemRequestBuilderPatchRequestConfiguration} from './mailFolderItemRequestBuilderPatchRequestConfiguration';
 import {MessageRulesRequestBuilder} from './messageRules/messageRulesRequestBuilder';
 import {MessagesRequestBuilder} from './messages/messagesRequestBuilder';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}
@@ -44,7 +45,7 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/mailfolder-delete?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/mailfolder-delete?view=graph-rest-1.0|Find more info here}
      */
     public delete(requestConfiguration?: MailFolderItemRequestBuilderDeleteRequestConfiguration | undefined) : Promise<ArrayBuffer | undefined> {
         const requestInfo = this.toDeleteRequestInformation(
@@ -56,7 +57,7 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/mailfolder-get?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/mailfolder-get?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: MailFolderItemRequestBuilderGetRequestConfiguration | undefined) : Promise<MailFolder | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -69,10 +70,9 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of MailFolder
-     * @see {@link https://docs.microsoft.com/graph/api/mailsearchfolder-update?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/mailsearchfolder-update?view=graph-rest-1.0|Find more info here}
      */
-    public patch(body: MailFolder | undefined, requestConfiguration?: MailFolderItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<MailFolder | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public patch(body: MailFolder, requestConfiguration?: MailFolderItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<MailFolder | undefined> {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
@@ -118,7 +118,7 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPatchRequestInformation(body: MailFolder | undefined, requestConfiguration?: MailFolderItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
+    public toPatchRequestInformation(body: MailFolder, requestConfiguration?: MailFolderItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -129,7 +129,7 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeMailFolder);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMailFolder);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderDeleteRequestConfiguration.ts
index 9fcf8c952..db075adce 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderDeleteRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderDeleteRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MailFolderItemRequestBuilderDeleteRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderGetRequestConfiguration.ts
index 8598ed633..2bad54a29 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {MailFolderItemRequestBuilderGetQueryParameters} from './mailFolderItemRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MailFolderItemRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderPatchRequestConfiguration.ts
index 8d7752edf..fe2821123 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderPatchRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderPatchRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MailFolderItemRequestBuilderPatchRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilder.ts
index c88e13c40..e9d4b7dce 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilder.ts
@@ -1,5 +1,6 @@
 import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules/$count
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilderGetRequestConfiguration.ts
index 9d7ff3183..8aee05dfa 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface CountRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilder.ts
index 82ad499e6..f2a5f28e3 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilder.ts
@@ -1,11 +1,12 @@
 import {createMessageRuleFromDiscriminatorValue} from '../../../../../../models/createMessageRuleFromDiscriminatorValue';
 import {deserializeIntoMessageRule} from '../../../../../../models/deserializeIntoMessageRule';
-import {MessageRule} from '../../../../../../models/messageRule';
+import type {MessageRule} from '../../../../../../models/messageRule';
 import {serializeMessageRule} from '../../../../../../models/serializeMessageRule';
 import {MessageRuleItemRequestBuilderDeleteRequestConfiguration} from './messageRuleItemRequestBuilderDeleteRequestConfiguration';
 import {MessageRuleItemRequestBuilderGetRequestConfiguration} from './messageRuleItemRequestBuilderGetRequestConfiguration';
 import {MessageRuleItemRequestBuilderPatchRequestConfiguration} from './messageRuleItemRequestBuilderPatchRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules/{messageRule-id}
@@ -23,7 +24,7 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
      * Delete the specified messageRule object.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of ArrayBuffer
-     * @see {@link https://docs.microsoft.com/graph/api/messagerule-delete?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/messagerule-delete?view=graph-rest-1.0|Find more info here}
      */
     public delete(requestConfiguration?: MessageRuleItemRequestBuilderDeleteRequestConfiguration | undefined) : Promise<ArrayBuffer | undefined> {
         const requestInfo = this.toDeleteRequestInformation(
@@ -35,7 +36,7 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/messagerule-get?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/messagerule-get?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: MessageRuleItemRequestBuilderGetRequestConfiguration | undefined) : Promise<MessageRule | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -48,10 +49,9 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of MessageRule
-     * @see {@link https://docs.microsoft.com/graph/api/messagerule-update?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/messagerule-update?view=graph-rest-1.0|Find more info here}
      */
-    public patch(body: MessageRule | undefined, requestConfiguration?: MessageRuleItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<MessageRule | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public patch(body: MessageRule, requestConfiguration?: MessageRuleItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<MessageRule | undefined> {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
@@ -97,7 +97,7 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPatchRequestInformation(body: MessageRule | undefined, requestConfiguration?: MessageRuleItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
+    public toPatchRequestInformation(body: MessageRule, requestConfiguration?: MessageRuleItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -108,7 +108,7 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeMessageRule);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessageRule);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderDeleteRequestConfiguration.ts
index 26b3a6896..2f71af4a3 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderDeleteRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderDeleteRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageRuleItemRequestBuilderDeleteRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderGetRequestConfiguration.ts
index 3fb2e5102..bd5c6d537 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {MessageRuleItemRequestBuilderGetQueryParameters} from './messageRuleItemRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageRuleItemRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderPatchRequestConfiguration.ts
index 33552db25..fb4e6f881 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderPatchRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderPatchRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageRuleItemRequestBuilderPatchRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts
index a0e1d79d4..b6290e218 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts
@@ -2,13 +2,14 @@ import {MessageRuleCollectionResponse} from '../../../../../models/';
 import {createMessageRuleCollectionResponseFromDiscriminatorValue} from '../../../../../models/createMessageRuleCollectionResponseFromDiscriminatorValue';
 import {createMessageRuleFromDiscriminatorValue} from '../../../../../models/createMessageRuleFromDiscriminatorValue';
 import {deserializeIntoMessageRule} from '../../../../../models/deserializeIntoMessageRule';
-import {MessageRule} from '../../../../../models/messageRule';
+import type {MessageRule} from '../../../../../models/messageRule';
 import {serializeMessageRule} from '../../../../../models/serializeMessageRule';
 import {CountRequestBuilder} from './count/countRequestBuilder';
 import {MessageRuleItemRequestBuilder} from './item/messageRuleItemRequestBuilder';
 import {MessageRulesRequestBuilderGetRequestConfiguration} from './messageRulesRequestBuilderGetRequestConfiguration';
 import {MessageRulesRequestBuilderPostRequestConfiguration} from './messageRulesRequestBuilderPostRequestConfiguration';
-import {BaseRequestBuilder, getPathParameters, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules
@@ -22,7 +23,7 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
     }
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.messageRules.item collection
-     * @param messageRuleId Unique identifier of the item
+     * @param messageRuleId The unique identifier of messageRule
      * @returns a MessageRuleItemRequestBuilder
      */
     public byMessageRuleId(messageRuleId: string) : MessageRuleItemRequestBuilder {
@@ -43,7 +44,7 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/mailfolder-list-messagerules?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/mailfolder-list-messagerules?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: MessageRulesRequestBuilderGetRequestConfiguration | undefined) : Promise<MessageRuleCollectionResponse | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -56,10 +57,9 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of MessageRule
-     * @see {@link https://docs.microsoft.com/graph/api/mailfolder-post-messagerules?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/mailfolder-post-messagerules?view=graph-rest-1.0|Find more info here}
      */
-    public post(body: MessageRule | undefined, requestConfiguration?: MessageRulesRequestBuilderPostRequestConfiguration | undefined) : Promise<MessageRule | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public post(body: MessageRule, requestConfiguration?: MessageRulesRequestBuilderPostRequestConfiguration | undefined) : Promise<MessageRule | undefined> {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
@@ -89,7 +89,7 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPostRequestInformation(body: MessageRule | undefined, requestConfiguration?: MessageRulesRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
+    public toPostRequestInformation(body: MessageRule, requestConfiguration?: MessageRulesRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -100,7 +100,7 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeMessageRule);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessageRule);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderGetRequestConfiguration.ts
index 827a17bcb..3f039e72b 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {MessageRulesRequestBuilderGetQueryParameters} from './messageRulesRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageRulesRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderPostRequestConfiguration.ts
index 91094930d..1c42756e9 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderPostRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderPostRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageRulesRequestBuilderPostRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilder.ts
index d52a68043..a5cd680e3 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilder.ts
@@ -1,5 +1,6 @@
 import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/$count
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
index 9d7ff3183..8aee05dfa 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface CountRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts
index fe246416f..731350e55 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts
@@ -1,5 +1,5 @@
 import {AttachmentCollectionResponse} from '../../../../../../../models/';
-import {Attachment} from '../../../../../../../models/attachment';
+import type {Attachment} from '../../../../../../../models/attachment';
 import {createAttachmentCollectionResponseFromDiscriminatorValue} from '../../../../../../../models/createAttachmentCollectionResponseFromDiscriminatorValue';
 import {createAttachmentFromDiscriminatorValue} from '../../../../../../../models/createAttachmentFromDiscriminatorValue';
 import {deserializeIntoAttachment} from '../../../../../../../models/deserializeIntoAttachment';
@@ -8,7 +8,8 @@ import {AttachmentsRequestBuilderGetRequestConfiguration} from './attachmentsReq
 import {AttachmentsRequestBuilderPostRequestConfiguration} from './attachmentsRequestBuilderPostRequestConfiguration';
 import {CountRequestBuilder} from './count/countRequestBuilder';
 import {AttachmentItemRequestBuilder} from './item/attachmentItemRequestBuilder';
-import {BaseRequestBuilder, getPathParameters, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments
@@ -22,7 +23,7 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
     }
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.messages.item.attachments.item collection
-     * @param attachmentId Unique identifier of the item
+     * @param attachmentId The unique identifier of attachment
      * @returns a AttachmentItemRequestBuilder
      */
     public byAttachmentId(attachmentId: string) : AttachmentItemRequestBuilder {
@@ -43,7 +44,7 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
      * Retrieve a list of attachment objects.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of AttachmentCollectionResponse
-     * @see {@link https://docs.microsoft.com/graph/api/eventmessage-list-attachments?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/eventmessage-list-attachments?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: AttachmentsRequestBuilderGetRequestConfiguration | undefined) : Promise<AttachmentCollectionResponse | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -56,10 +57,9 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of Attachment
-     * @see {@link https://docs.microsoft.com/graph/api/message-post-attachments?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/message-post-attachments?view=graph-rest-1.0|Find more info here}
      */
-    public post(body: Attachment | undefined, requestConfiguration?: AttachmentsRequestBuilderPostRequestConfiguration | undefined) : Promise<Attachment | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public post(body: Attachment, requestConfiguration?: AttachmentsRequestBuilderPostRequestConfiguration | undefined) : Promise<Attachment | undefined> {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
@@ -89,7 +89,7 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPostRequestInformation(body: Attachment | undefined, requestConfiguration?: AttachmentsRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
+    public toPostRequestInformation(body: Attachment, requestConfiguration?: AttachmentsRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -100,7 +100,7 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeAttachment);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeAttachment);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
index 9aadf62f1..e486e1cfb 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {AttachmentsRequestBuilderGetQueryParameters} from './attachmentsRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface AttachmentsRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
index 5ede62796..404d93fc7 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface AttachmentsRequestBuilderPostRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilder.ts
index 3ff148d6e..3db573462 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilder.ts
@@ -1,5 +1,6 @@
 import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments/$count
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
index 9d7ff3183..8aee05dfa 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface CountRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
index e731854a4..b10698796 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
@@ -2,7 +2,8 @@ import {Attachment} from '../../../../../../../../models/';
 import {createAttachmentFromDiscriminatorValue} from '../../../../../../../../models/createAttachmentFromDiscriminatorValue';
 import {AttachmentItemRequestBuilderDeleteRequestConfiguration} from './attachmentItemRequestBuilderDeleteRequestConfiguration';
 import {AttachmentItemRequestBuilderGetRequestConfiguration} from './attachmentItemRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments/{attachment-id}
@@ -31,7 +32,7 @@ export class AttachmentItemRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/attachment-get?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/attachment-get?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: AttachmentItemRequestBuilderGetRequestConfiguration | undefined) : Promise<Attachment | undefined> {
         const requestInfo = this.toGetRequestInformation(
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
index 5077ef3cd..3538f5b72 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface AttachmentItemRequestBuilderDeleteRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
index 63b42911b..a62b74418 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {AttachmentItemRequestBuilderGetQueryParameters} from './attachmentItemRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface AttachmentItemRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilder.ts
index 3784f887f..5949b1569 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilder.ts
@@ -1,5 +1,6 @@
 import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions/$count
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
index 9d7ff3183..8aee05dfa 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface CountRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts
index a95497ad8..084c8c224 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts
@@ -2,13 +2,14 @@ import {ExtensionCollectionResponse} from '../../../../../../../models/';
 import {createExtensionCollectionResponseFromDiscriminatorValue} from '../../../../../../../models/createExtensionCollectionResponseFromDiscriminatorValue';
 import {createExtensionFromDiscriminatorValue} from '../../../../../../../models/createExtensionFromDiscriminatorValue';
 import {deserializeIntoExtension} from '../../../../../../../models/deserializeIntoExtension';
-import {Extension} from '../../../../../../../models/extension';
+import type {Extension} from '../../../../../../../models/extension';
 import {serializeExtension} from '../../../../../../../models/serializeExtension';
 import {CountRequestBuilder} from './count/countRequestBuilder';
 import {ExtensionsRequestBuilderGetRequestConfiguration} from './extensionsRequestBuilderGetRequestConfiguration';
 import {ExtensionsRequestBuilderPostRequestConfiguration} from './extensionsRequestBuilderPostRequestConfiguration';
 import {ExtensionItemRequestBuilder} from './item/extensionItemRequestBuilder';
-import {BaseRequestBuilder, getPathParameters, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions
@@ -22,7 +23,7 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
     }
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.messages.item.extensions.item collection
-     * @param extensionId Unique identifier of the item
+     * @param extensionId The unique identifier of extension
      * @returns a ExtensionItemRequestBuilder
      */
     public byExtensionId(extensionId: string) : ExtensionItemRequestBuilder {
@@ -51,14 +52,13 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
         return this.requestAdapter.sendAsync<ExtensionCollectionResponse>(requestInfo, createExtensionCollectionResponseFromDiscriminatorValue, 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. See known limitations of open extensions for more information. The table in the Permissions section lists the resources that support open extensions.
+     * 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
-     * @see {@link https://docs.microsoft.com/graph/api/opentypeextension-post-opentypeextension?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-post-opentypeextension?view=graph-rest-1.0|Find more info here}
      */
-    public post(body: Extension | undefined, requestConfiguration?: ExtensionsRequestBuilderPostRequestConfiguration | undefined) : Promise<Extension | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public post(body: Extension, requestConfiguration?: ExtensionsRequestBuilderPostRequestConfiguration | undefined) : Promise<Extension | undefined> {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
@@ -83,12 +83,12 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
         return requestInfo;
     };
     /**
-     * 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. See known limitations of open extensions for more information. The table in the Permissions section lists the resources that support open extensions.
+     * 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
      */
-    public toPostRequestInformation(body: Extension | undefined, requestConfiguration?: ExtensionsRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
+    public toPostRequestInformation(body: Extension, requestConfiguration?: ExtensionsRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -99,7 +99,7 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeExtension);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeExtension);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
index 86a733a06..296d2e099 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {ExtensionsRequestBuilderGetQueryParameters} from './extensionsRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ExtensionsRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
index 269015385..2d639a33d 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ExtensionsRequestBuilderPostRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
index d191ab975..e06f3a1eb 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
@@ -1,11 +1,12 @@
 import {createExtensionFromDiscriminatorValue} from '../../../../../../../../models/createExtensionFromDiscriminatorValue';
 import {deserializeIntoExtension} from '../../../../../../../../models/deserializeIntoExtension';
-import {Extension} from '../../../../../../../../models/extension';
+import type {Extension} from '../../../../../../../../models/extension';
 import {serializeExtension} from '../../../../../../../../models/serializeExtension';
 import {ExtensionItemRequestBuilderDeleteRequestConfiguration} from './extensionItemRequestBuilderDeleteRequestConfiguration';
 import {ExtensionItemRequestBuilderGetRequestConfiguration} from './extensionItemRequestBuilderGetRequestConfiguration';
 import {ExtensionItemRequestBuilderPatchRequestConfiguration} from './extensionItemRequestBuilderPatchRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions/{extension-id}
@@ -20,10 +21,10 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
         super(pathParameters, requestAdapter, "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}/extensions/{extension%2Did}{?%24select,%24expand}");
     };
     /**
-     * Delete an open extension (openTypeExtension object) from the specified instance of a resource.  See the table in the Permissions section for the list of resources that support open extensions.
+     * 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
-     * @see {@link https://docs.microsoft.com/graph/api/opentypeextension-delete?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-delete?view=graph-rest-1.0|Find more info here}
      */
     public delete(requestConfiguration?: ExtensionItemRequestBuilderDeleteRequestConfiguration | undefined) : Promise<ArrayBuffer | undefined> {
         const requestInfo = this.toDeleteRequestInformation(
@@ -35,7 +36,7 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/opentypeextension-get?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-get?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: ExtensionItemRequestBuilderGetRequestConfiguration | undefined) : Promise<Extension | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -49,15 +50,14 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of Extension
      */
-    public patch(body: Extension | undefined, requestConfiguration?: ExtensionItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<Extension | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public patch(body: Extension, requestConfiguration?: ExtensionItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<Extension | undefined> {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
         return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, undefined);
     };
     /**
-     * Delete an open extension (openTypeExtension object) from the specified instance of a resource.  See the table in the Permissions section for the list of resources that support open extensions.
+     * 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
      */
@@ -96,7 +96,7 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPatchRequestInformation(body: Extension | undefined, requestConfiguration?: ExtensionItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
+    public toPatchRequestInformation(body: Extension, requestConfiguration?: ExtensionItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -107,7 +107,7 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeExtension);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeExtension);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
index b3efa8083..dab7a050d 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ExtensionItemRequestBuilderDeleteRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
index fdbede22c..9929a4faf 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {ExtensionItemRequestBuilderGetQueryParameters} from './extensionItemRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ExtensionItemRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
index 47383016b..c46dbb966 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ExtensionItemRequestBuilderPatchRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilder.ts
index 95e423c32..d4624a97e 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilder.ts
@@ -1,6 +1,6 @@
 import {createMessageFromDiscriminatorValue} from '../../../../../../models/createMessageFromDiscriminatorValue';
 import {deserializeIntoMessage} from '../../../../../../models/deserializeIntoMessage';
-import {Message} from '../../../../../../models/message';
+import type {Message} from '../../../../../../models/message';
 import {serializeMessage} from '../../../../../../models/serializeMessage';
 import {AttachmentsRequestBuilder} from './attachments/attachmentsRequestBuilder';
 import {ExtensionsRequestBuilder} from './extensions/extensionsRequestBuilder';
@@ -8,7 +8,8 @@ import {MessageItemRequestBuilderDeleteRequestConfiguration} from './messageItem
 import {MessageItemRequestBuilderGetRequestConfiguration} from './messageItemRequestBuilderGetRequestConfiguration';
 import {MessageItemRequestBuilderPatchRequestConfiguration} from './messageItemRequestBuilderPatchRequestConfiguration';
 import {ContentRequestBuilder} from './value/contentRequestBuilder';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}
@@ -68,8 +69,7 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of Message
      */
-    public patch(body: Message | undefined, requestConfiguration?: MessageItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<Message | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public patch(body: Message, requestConfiguration?: MessageItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<Message | undefined> {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
@@ -115,7 +115,7 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPatchRequestInformation(body: Message | undefined, requestConfiguration?: MessageItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
+    public toPatchRequestInformation(body: Message, requestConfiguration?: MessageItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -126,7 +126,7 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeMessage);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessage);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
index 6c964b34b..502dc2f91 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageItemRequestBuilderDeleteRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
index 5a2809576..a659064b4 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {MessageItemRequestBuilderGetQueryParameters} from './messageItemRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageItemRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
index c37f315b5..00baca8f7 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageItemRequestBuilderPatchRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts
index 769d8a523..363bfd3b4 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts
@@ -1,6 +1,7 @@
 import {ContentRequestBuilderGetRequestConfiguration} from './contentRequestBuilderGetRequestConfiguration';
 import {ContentRequestBuilderPutRequestConfiguration} from './contentRequestBuilderPutRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/$value
@@ -18,7 +19,7 @@ export class ContentRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/mailfolder-list-messages?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/mailfolder-list-messages?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: ContentRequestBuilderGetRequestConfiguration | undefined) : Promise<ArrayBuffer | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -33,7 +34,6 @@ export class ContentRequestBuilder extends BaseRequestBuilder {
      * @returns a Promise of ArrayBuffer
      */
     public put(body: ArrayBuffer | undefined, requestConfiguration?: ContentRequestBuilderPutRequestConfiguration | undefined) : Promise<ArrayBuffer | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
         const requestInfo = this.toPutRequestInformation(
             body, requestConfiguration
         );
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
index 63588eb43..10e67530a 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ContentRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
index b5d42481f..8a61d2a6d 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ContentRequestBuilderPutRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilder.ts
index 728bbd766..a4c187557 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilder.ts
@@ -2,13 +2,14 @@ import {MessageCollectionResponse} from '../../../../../models/';
 import {createMessageCollectionResponseFromDiscriminatorValue} from '../../../../../models/createMessageCollectionResponseFromDiscriminatorValue';
 import {createMessageFromDiscriminatorValue} from '../../../../../models/createMessageFromDiscriminatorValue';
 import {deserializeIntoMessage} from '../../../../../models/deserializeIntoMessage';
-import {Message} from '../../../../../models/message';
+import type {Message} from '../../../../../models/message';
 import {serializeMessage} from '../../../../../models/serializeMessage';
 import {CountRequestBuilder} from './count/countRequestBuilder';
 import {MessageItemRequestBuilder} from './item/messageItemRequestBuilder';
 import {MessagesRequestBuilderGetRequestConfiguration} from './messagesRequestBuilderGetRequestConfiguration';
 import {MessagesRequestBuilderPostRequestConfiguration} from './messagesRequestBuilderPostRequestConfiguration';
-import {BaseRequestBuilder, getPathParameters, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages
@@ -22,7 +23,7 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
     }
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item.messages.item collection
-     * @param messageId Unique identifier of the item
+     * @param messageId The unique identifier of message
      * @returns a MessageItemRequestBuilder
      */
     public byMessageId(messageId: string) : MessageItemRequestBuilder {
@@ -43,7 +44,7 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/mailfolder-list-messages?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/mailfolder-list-messages?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: MessagesRequestBuilderGetRequestConfiguration | undefined) : Promise<MessageCollectionResponse | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -56,10 +57,9 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of Message
-     * @see {@link https://docs.microsoft.com/graph/api/mailfolder-post-messages?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/mailfolder-post-messages?view=graph-rest-1.0|Find more info here}
      */
-    public post(body: Message | undefined, requestConfiguration?: MessagesRequestBuilderPostRequestConfiguration | undefined) : Promise<Message | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public post(body: Message, requestConfiguration?: MessagesRequestBuilderPostRequestConfiguration | undefined) : Promise<Message | undefined> {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
@@ -89,7 +89,7 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPostRequestInformation(body: Message | undefined, requestConfiguration?: MessagesRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
+    public toPostRequestInformation(body: Message, requestConfiguration?: MessagesRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -100,7 +100,7 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeMessage);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessage);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
index 2969bfc61..73034f00f 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {MessagesRequestBuilderGetQueryParameters} from './messagesRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessagesRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
index 120df47b8..a6d72f7d2 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessagesRequestBuilderPostRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilder.ts
index ca85a4122..c89ad8ea1 100644
--- a/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilder.ts
@@ -2,13 +2,14 @@ import {MailFolderCollectionResponse} from '../../../models/';
 import {createMailFolderCollectionResponseFromDiscriminatorValue} from '../../../models/createMailFolderCollectionResponseFromDiscriminatorValue';
 import {createMailFolderFromDiscriminatorValue} from '../../../models/createMailFolderFromDiscriminatorValue';
 import {deserializeIntoMailFolder} from '../../../models/deserializeIntoMailFolder';
-import {MailFolder} from '../../../models/mailFolder';
+import type {MailFolder} from '../../../models/mailFolder';
 import {serializeMailFolder} from '../../../models/serializeMailFolder';
 import {CountRequestBuilder} from './count/countRequestBuilder';
 import {MailFolderItemRequestBuilder} from './item/mailFolderItemRequestBuilder';
 import {MailFoldersRequestBuilderGetRequestConfiguration} from './mailFoldersRequestBuilderGetRequestConfiguration';
 import {MailFoldersRequestBuilderPostRequestConfiguration} from './mailFoldersRequestBuilderPostRequestConfiguration';
-import {BaseRequestBuilder, getPathParameters, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders
@@ -22,7 +23,7 @@ export class MailFoldersRequestBuilder extends BaseRequestBuilder {
     }
     /**
      * Gets an item from the ApiSdk.users.item.mailFolders.item collection
-     * @param mailFolderId Unique identifier of the item
+     * @param mailFolderId The unique identifier of mailFolder
      * @returns a MailFolderItemRequestBuilder
      */
     public byMailFolderId(mailFolderId: string) : MailFolderItemRequestBuilder {
@@ -43,7 +44,7 @@ export class MailFoldersRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/user-list-mailfolders?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/user-list-mailfolders?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: MailFoldersRequestBuilderGetRequestConfiguration | undefined) : Promise<MailFolderCollectionResponse | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -52,14 +53,13 @@ export class MailFoldersRequestBuilder extends BaseRequestBuilder {
         return this.requestAdapter.sendAsync<MailFolderCollectionResponse>(requestInfo, createMailFolderCollectionResponseFromDiscriminatorValue, undefined);
     };
     /**
-     * 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.
+     * 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
-     * @see {@link https://docs.microsoft.com/graph/api/user-post-mailfolders?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/user-post-mailfolders?view=graph-rest-1.0|Find more info here}
      */
-    public post(body: MailFolder | undefined, requestConfiguration?: MailFoldersRequestBuilderPostRequestConfiguration | undefined) : Promise<MailFolder | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public post(body: MailFolder, requestConfiguration?: MailFoldersRequestBuilderPostRequestConfiguration | undefined) : Promise<MailFolder | undefined> {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
@@ -84,12 +84,12 @@ export class MailFoldersRequestBuilder extends BaseRequestBuilder {
         return requestInfo;
     };
     /**
-     * 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.
+     * 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
      */
-    public toPostRequestInformation(body: MailFolder | undefined, requestConfiguration?: MailFoldersRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
+    public toPostRequestInformation(body: MailFolder, requestConfiguration?: MailFoldersRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -100,7 +100,7 @@ export class MailFoldersRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeMailFolder);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMailFolder);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderGetRequestConfiguration.ts
index edf9c0b4e..858b256ae 100644
--- a/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {MailFoldersRequestBuilderGetQueryParameters} from './mailFoldersRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MailFoldersRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderPostRequestConfiguration.ts
index 725fae80c..05d945d05 100644
--- a/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderPostRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderPostRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MailFoldersRequestBuilderPostRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/count/countRequestBuilder.ts
index c538a4c37..028c6f1c0 100644
--- a/packages/test/generatedCode/users/item/messages/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/count/countRequestBuilder.ts
@@ -1,5 +1,6 @@
 import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/$count
diff --git a/packages/test/generatedCode/users/item/messages/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
index 9d7ff3183..8aee05dfa 100644
--- a/packages/test/generatedCode/users/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface CountRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilder.ts
index a3cb00838..52ebaa466 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilder.ts
@@ -1,5 +1,5 @@
 import {AttachmentCollectionResponse} from '../../../../../models/';
-import {Attachment} from '../../../../../models/attachment';
+import type {Attachment} from '../../../../../models/attachment';
 import {createAttachmentCollectionResponseFromDiscriminatorValue} from '../../../../../models/createAttachmentCollectionResponseFromDiscriminatorValue';
 import {createAttachmentFromDiscriminatorValue} from '../../../../../models/createAttachmentFromDiscriminatorValue';
 import {deserializeIntoAttachment} from '../../../../../models/deserializeIntoAttachment';
@@ -8,7 +8,8 @@ import {AttachmentsRequestBuilderGetRequestConfiguration} from './attachmentsReq
 import {AttachmentsRequestBuilderPostRequestConfiguration} from './attachmentsRequestBuilderPostRequestConfiguration';
 import {CountRequestBuilder} from './count/countRequestBuilder';
 import {AttachmentItemRequestBuilder} from './item/attachmentItemRequestBuilder';
-import {BaseRequestBuilder, getPathParameters, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments
@@ -22,7 +23,7 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
     }
     /**
      * Gets an item from the ApiSdk.users.item.messages.item.attachments.item collection
-     * @param attachmentId Unique identifier of the item
+     * @param attachmentId The unique identifier of attachment
      * @returns a AttachmentItemRequestBuilder
      */
     public byAttachmentId(attachmentId: string) : AttachmentItemRequestBuilder {
@@ -43,7 +44,7 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
      * Retrieve a list of attachment objects.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of AttachmentCollectionResponse
-     * @see {@link https://docs.microsoft.com/graph/api/eventmessage-list-attachments?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/eventmessage-list-attachments?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: AttachmentsRequestBuilderGetRequestConfiguration | undefined) : Promise<AttachmentCollectionResponse | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -56,10 +57,9 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of Attachment
-     * @see {@link https://docs.microsoft.com/graph/api/message-post-attachments?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/message-post-attachments?view=graph-rest-1.0|Find more info here}
      */
-    public post(body: Attachment | undefined, requestConfiguration?: AttachmentsRequestBuilderPostRequestConfiguration | undefined) : Promise<Attachment | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public post(body: Attachment, requestConfiguration?: AttachmentsRequestBuilderPostRequestConfiguration | undefined) : Promise<Attachment | undefined> {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
@@ -89,7 +89,7 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPostRequestInformation(body: Attachment | undefined, requestConfiguration?: AttachmentsRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
+    public toPostRequestInformation(body: Attachment, requestConfiguration?: AttachmentsRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -100,7 +100,7 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeAttachment);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeAttachment);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
index 9aadf62f1..e486e1cfb 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {AttachmentsRequestBuilderGetQueryParameters} from './attachmentsRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface AttachmentsRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
index 5ede62796..404d93fc7 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface AttachmentsRequestBuilderPostRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilder.ts
index 84e0535ef..4a4335dc7 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilder.ts
@@ -1,5 +1,6 @@
 import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments/$count
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
index 9d7ff3183..8aee05dfa 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface CountRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
index 0ecfb63cb..917fddd3a 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
@@ -2,7 +2,8 @@ import {Attachment} from '../../../../../../models/';
 import {createAttachmentFromDiscriminatorValue} from '../../../../../../models/createAttachmentFromDiscriminatorValue';
 import {AttachmentItemRequestBuilderDeleteRequestConfiguration} from './attachmentItemRequestBuilderDeleteRequestConfiguration';
 import {AttachmentItemRequestBuilderGetRequestConfiguration} from './attachmentItemRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments/{attachment-id}
@@ -31,7 +32,7 @@ export class AttachmentItemRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/attachment-get?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/attachment-get?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: AttachmentItemRequestBuilderGetRequestConfiguration | undefined) : Promise<Attachment | undefined> {
         const requestInfo = this.toGetRequestInformation(
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
index 5077ef3cd..3538f5b72 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface AttachmentItemRequestBuilderDeleteRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
index 63b42911b..a62b74418 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {AttachmentItemRequestBuilderGetQueryParameters} from './attachmentItemRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface AttachmentItemRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilder.ts
index 68a01eb6a..d7c01a6db 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilder.ts
@@ -1,5 +1,6 @@
 import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions/$count
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
index 9d7ff3183..8aee05dfa 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface CountRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilder.ts
index ce20ec96b..c31985a55 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilder.ts
@@ -2,13 +2,14 @@ import {ExtensionCollectionResponse} from '../../../../../models/';
 import {createExtensionCollectionResponseFromDiscriminatorValue} from '../../../../../models/createExtensionCollectionResponseFromDiscriminatorValue';
 import {createExtensionFromDiscriminatorValue} from '../../../../../models/createExtensionFromDiscriminatorValue';
 import {deserializeIntoExtension} from '../../../../../models/deserializeIntoExtension';
-import {Extension} from '../../../../../models/extension';
+import type {Extension} from '../../../../../models/extension';
 import {serializeExtension} from '../../../../../models/serializeExtension';
 import {CountRequestBuilder} from './count/countRequestBuilder';
 import {ExtensionsRequestBuilderGetRequestConfiguration} from './extensionsRequestBuilderGetRequestConfiguration';
 import {ExtensionsRequestBuilderPostRequestConfiguration} from './extensionsRequestBuilderPostRequestConfiguration';
 import {ExtensionItemRequestBuilder} from './item/extensionItemRequestBuilder';
-import {BaseRequestBuilder, getPathParameters, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions
@@ -22,7 +23,7 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
     }
     /**
      * Gets an item from the ApiSdk.users.item.messages.item.extensions.item collection
-     * @param extensionId Unique identifier of the item
+     * @param extensionId The unique identifier of extension
      * @returns a ExtensionItemRequestBuilder
      */
     public byExtensionId(extensionId: string) : ExtensionItemRequestBuilder {
@@ -51,14 +52,13 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
         return this.requestAdapter.sendAsync<ExtensionCollectionResponse>(requestInfo, createExtensionCollectionResponseFromDiscriminatorValue, 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. See known limitations of open extensions for more information. The table in the Permissions section lists the resources that support open extensions.
+     * 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
-     * @see {@link https://docs.microsoft.com/graph/api/opentypeextension-post-opentypeextension?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-post-opentypeextension?view=graph-rest-1.0|Find more info here}
      */
-    public post(body: Extension | undefined, requestConfiguration?: ExtensionsRequestBuilderPostRequestConfiguration | undefined) : Promise<Extension | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public post(body: Extension, requestConfiguration?: ExtensionsRequestBuilderPostRequestConfiguration | undefined) : Promise<Extension | undefined> {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
@@ -83,12 +83,12 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
         return requestInfo;
     };
     /**
-     * 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. See known limitations of open extensions for more information. The table in the Permissions section lists the resources that support open extensions.
+     * 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
      */
-    public toPostRequestInformation(body: Extension | undefined, requestConfiguration?: ExtensionsRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
+    public toPostRequestInformation(body: Extension, requestConfiguration?: ExtensionsRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -99,7 +99,7 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeExtension);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeExtension);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
index 86a733a06..296d2e099 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {ExtensionsRequestBuilderGetQueryParameters} from './extensionsRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ExtensionsRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
index 269015385..2d639a33d 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ExtensionsRequestBuilderPostRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
index 26f6a5323..d3911cedd 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
@@ -1,11 +1,12 @@
 import {createExtensionFromDiscriminatorValue} from '../../../../../../models/createExtensionFromDiscriminatorValue';
 import {deserializeIntoExtension} from '../../../../../../models/deserializeIntoExtension';
-import {Extension} from '../../../../../../models/extension';
+import type {Extension} from '../../../../../../models/extension';
 import {serializeExtension} from '../../../../../../models/serializeExtension';
 import {ExtensionItemRequestBuilderDeleteRequestConfiguration} from './extensionItemRequestBuilderDeleteRequestConfiguration';
 import {ExtensionItemRequestBuilderGetRequestConfiguration} from './extensionItemRequestBuilderGetRequestConfiguration';
 import {ExtensionItemRequestBuilderPatchRequestConfiguration} from './extensionItemRequestBuilderPatchRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions/{extension-id}
@@ -20,10 +21,10 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
         super(pathParameters, requestAdapter, "{+baseurl}/users/{user%2Did}/messages/{message%2Did}/extensions/{extension%2Did}{?%24select,%24expand}");
     };
     /**
-     * Delete an open extension (openTypeExtension object) from the specified instance of a resource.  See the table in the Permissions section for the list of resources that support open extensions.
+     * 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
-     * @see {@link https://docs.microsoft.com/graph/api/opentypeextension-delete?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-delete?view=graph-rest-1.0|Find more info here}
      */
     public delete(requestConfiguration?: ExtensionItemRequestBuilderDeleteRequestConfiguration | undefined) : Promise<ArrayBuffer | undefined> {
         const requestInfo = this.toDeleteRequestInformation(
@@ -35,7 +36,7 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/opentypeextension-get?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-get?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: ExtensionItemRequestBuilderGetRequestConfiguration | undefined) : Promise<Extension | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -49,15 +50,14 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of Extension
      */
-    public patch(body: Extension | undefined, requestConfiguration?: ExtensionItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<Extension | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public patch(body: Extension, requestConfiguration?: ExtensionItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<Extension | undefined> {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
         return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, undefined);
     };
     /**
-     * Delete an open extension (openTypeExtension object) from the specified instance of a resource.  See the table in the Permissions section for the list of resources that support open extensions.
+     * 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
      */
@@ -96,7 +96,7 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPatchRequestInformation(body: Extension | undefined, requestConfiguration?: ExtensionItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
+    public toPatchRequestInformation(body: Extension, requestConfiguration?: ExtensionItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -107,7 +107,7 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeExtension);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeExtension);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
index b3efa8083..dab7a050d 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ExtensionItemRequestBuilderDeleteRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
index fdbede22c..9929a4faf 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {ExtensionItemRequestBuilderGetQueryParameters} from './extensionItemRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ExtensionItemRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
index 47383016b..c46dbb966 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ExtensionItemRequestBuilderPatchRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilder.ts
index 80ea04c3f..67f6c9807 100644
--- a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilder.ts
@@ -1,6 +1,6 @@
 import {createMessageFromDiscriminatorValue} from '../../../../models/createMessageFromDiscriminatorValue';
 import {deserializeIntoMessage} from '../../../../models/deserializeIntoMessage';
-import {Message} from '../../../../models/message';
+import type {Message} from '../../../../models/message';
 import {serializeMessage} from '../../../../models/serializeMessage';
 import {AttachmentsRequestBuilder} from './attachments/attachmentsRequestBuilder';
 import {ExtensionsRequestBuilder} from './extensions/extensionsRequestBuilder';
@@ -8,7 +8,8 @@ import {MessageItemRequestBuilderDeleteRequestConfiguration} from './messageItem
 import {MessageItemRequestBuilderGetRequestConfiguration} from './messageItemRequestBuilderGetRequestConfiguration';
 import {MessageItemRequestBuilderPatchRequestConfiguration} from './messageItemRequestBuilderPatchRequestConfiguration';
 import {ContentRequestBuilder} from './value/contentRequestBuilder';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}
@@ -44,7 +45,7 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/message-delete?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/message-delete?view=graph-rest-1.0|Find more info here}
      */
     public delete(requestConfiguration?: MessageItemRequestBuilderDeleteRequestConfiguration | undefined) : Promise<ArrayBuffer | undefined> {
         const requestInfo = this.toDeleteRequestInformation(
@@ -56,7 +57,7 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/opentypeextension-get?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/singlevaluelegacyextendedproperty-get?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: MessageItemRequestBuilderGetRequestConfiguration | undefined) : Promise<Message | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -69,10 +70,9 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of Message
-     * @see {@link https://docs.microsoft.com/graph/api/message-update?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/message-update?view=graph-rest-1.0|Find more info here}
      */
-    public patch(body: Message | undefined, requestConfiguration?: MessageItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<Message | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public patch(body: Message, requestConfiguration?: MessageItemRequestBuilderPatchRequestConfiguration | undefined) : Promise<Message | undefined> {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
@@ -118,7 +118,7 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
-    public toPatchRequestInformation(body: Message | undefined, requestConfiguration?: MessageItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
+    public toPatchRequestInformation(body: Message, requestConfiguration?: MessageItemRequestBuilderPatchRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -129,7 +129,7 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeMessage);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessage);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
index 6c964b34b..502dc2f91 100644
--- a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageItemRequestBuilderDeleteRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
index 5a2809576..a659064b4 100644
--- a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {MessageItemRequestBuilderGetQueryParameters} from './messageItemRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageItemRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
index c37f315b5..00baca8f7 100644
--- a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessageItemRequestBuilderPatchRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilder.ts
index 18868eb8b..a6f320a79 100644
--- a/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilder.ts
@@ -1,6 +1,7 @@
 import {ContentRequestBuilderGetRequestConfiguration} from './contentRequestBuilderGetRequestConfiguration';
 import {ContentRequestBuilderPutRequestConfiguration} from './contentRequestBuilderPutRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/$value
@@ -18,7 +19,7 @@ export class ContentRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/opentypeextension-get?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/user-list-messages?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: ContentRequestBuilderGetRequestConfiguration | undefined) : Promise<ArrayBuffer | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -33,7 +34,6 @@ export class ContentRequestBuilder extends BaseRequestBuilder {
      * @returns a Promise of ArrayBuffer
      */
     public put(body: ArrayBuffer | undefined, requestConfiguration?: ContentRequestBuilderPutRequestConfiguration | undefined) : Promise<ArrayBuffer | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
         const requestInfo = this.toPutRequestInformation(
             body, requestConfiguration
         );
diff --git a/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
index 63588eb43..10e67530a 100644
--- a/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ContentRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
index b5d42481f..8a61d2a6d 100644
--- a/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface ContentRequestBuilderPutRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/messagesRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/messagesRequestBuilder.ts
index f5241c06d..62125bf44 100644
--- a/packages/test/generatedCode/users/item/messages/messagesRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/messagesRequestBuilder.ts
@@ -2,13 +2,14 @@ import {MessageCollectionResponse} from '../../../models/';
 import {createMessageCollectionResponseFromDiscriminatorValue} from '../../../models/createMessageCollectionResponseFromDiscriminatorValue';
 import {createMessageFromDiscriminatorValue} from '../../../models/createMessageFromDiscriminatorValue';
 import {deserializeIntoMessage} from '../../../models/deserializeIntoMessage';
-import {Message} from '../../../models/message';
+import type {Message} from '../../../models/message';
 import {serializeMessage} from '../../../models/serializeMessage';
 import {CountRequestBuilder} from './count/countRequestBuilder';
 import {MessageItemRequestBuilder} from './item/messageItemRequestBuilder';
 import {MessagesRequestBuilderGetRequestConfiguration} from './messagesRequestBuilderGetRequestConfiguration';
 import {MessagesRequestBuilderPostRequestConfiguration} from './messagesRequestBuilderPostRequestConfiguration';
-import {BaseRequestBuilder, getPathParameters, HttpMethod, Parsable, ParsableFactory, RequestAdapter, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions';
+import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages
@@ -22,7 +23,7 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
     }
     /**
      * Gets an item from the ApiSdk.users.item.messages.item collection
-     * @param messageId Unique identifier of the item
+     * @param messageId The unique identifier of message
      * @returns a MessageItemRequestBuilder
      */
     public byMessageId(messageId: string) : MessageItemRequestBuilder {
@@ -43,7 +44,7 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://docs.microsoft.com/graph/api/opentypeextension-get?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/user-list-messages?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: MessagesRequestBuilderGetRequestConfiguration | undefined) : Promise<MessageCollectionResponse | undefined> {
         const requestInfo = this.toGetRequestInformation(
@@ -52,14 +53,13 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
         return this.requestAdapter.sendAsync<MessageCollectionResponse>(requestInfo, createMessageCollectionResponseFromDiscriminatorValue, 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. See known limitations of open extensions for more information. The table in the Permissions section lists the resources that support open extensions.
+     * 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
-     * @see {@link https://docs.microsoft.com/graph/api/opentypeextension-post-opentypeextension?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/user-post-messages?view=graph-rest-1.0|Find more info here}
      */
-    public post(body: Message | undefined, requestConfiguration?: MessagesRequestBuilderPostRequestConfiguration | undefined) : Promise<Message | undefined> {
-        if(!body) throw new Error("body cannot be undefined");
+    public post(body: Message, requestConfiguration?: MessagesRequestBuilderPostRequestConfiguration | undefined) : Promise<Message | undefined> {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
@@ -84,12 +84,12 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
         return requestInfo;
     };
     /**
-     * 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. See known limitations of open extensions for more information. The table in the Permissions section lists the resources that support open extensions.
+     * 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
      */
-    public toPostRequestInformation(body: Message | undefined, requestConfiguration?: MessagesRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
+    public toPostRequestInformation(body: Message, requestConfiguration?: MessagesRequestBuilderPostRequestConfiguration | undefined) : RequestInformation {
         if(!body) throw new Error("body cannot be undefined");
         const requestInfo = new RequestInformation();
         requestInfo.urlTemplate = this.urlTemplate;
@@ -100,7 +100,7 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
             requestInfo.addRequestHeaders(requestConfiguration.headers);
             requestInfo.addRequestOptions(requestConfiguration.options);
         }
-        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body as any, serializeMessage);
+        requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessage);
         return requestInfo;
     };
 }
diff --git a/packages/test/generatedCode/users/item/messages/messagesRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
index 2969bfc61..73034f00f 100644
--- a/packages/test/generatedCode/users/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
@@ -1,5 +1,5 @@
 import {MessagesRequestBuilderGetQueryParameters} from './messagesRequestBuilderGetQueryParameters';
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessagesRequestBuilderGetRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/messages/messagesRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
index 120df47b8..a6d72f7d2 100644
--- a/packages/test/generatedCode/users/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
+++ b/packages/test/generatedCode/users/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
@@ -1,4 +1,4 @@
-import {RequestOption} from '@microsoft/kiota-abstractions';
+import type {RequestOption} from '@microsoft/kiota-abstractions';
 
 export interface MessagesRequestBuilderPostRequestConfiguration {
     /**
diff --git a/packages/test/generatedCode/users/item/userItemRequestBuilder.ts b/packages/test/generatedCode/users/item/userItemRequestBuilder.ts
index 5a201bc3a..270b213d9 100644
--- a/packages/test/generatedCode/users/item/userItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/userItemRequestBuilder.ts
@@ -1,7 +1,8 @@
 import {InferenceClassificationRequestBuilder} from './inferenceClassification/inferenceClassificationRequestBuilder';
 import {MailFoldersRequestBuilder} from './mailFolders/mailFoldersRequestBuilder';
 import {MessagesRequestBuilder} from './messages/messagesRequestBuilder';
-import {BaseRequestBuilder, RequestAdapter} from '@microsoft/kiota-abstractions';
+import type {RequestAdapter} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}
diff --git a/packages/test/generatedCode/users/usersRequestBuilder.ts b/packages/test/generatedCode/users/usersRequestBuilder.ts
index 507e99a33..60d42aac5 100644
--- a/packages/test/generatedCode/users/usersRequestBuilder.ts
+++ b/packages/test/generatedCode/users/usersRequestBuilder.ts
@@ -1,5 +1,6 @@
 import {UserItemRequestBuilder} from './item/userItemRequestBuilder';
-import {BaseRequestBuilder, getPathParameters, RequestAdapter} from '@microsoft/kiota-abstractions';
+import {BaseRequestBuilder, getPathParameters} from '@microsoft/kiota-abstractions';
+import type {RequestAdapter} from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users

From ba9cf17298ed62bef537c7ab0323341f76e56b49 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 14 Aug 2023 14:49:31 -0400
Subject: [PATCH 02/11] - adds headers inspection

Signed-off-by: Vincent Biret <vibiret@microsoft.com>
---
 packages/abstractions/src/index.ts            |  1 +
 .../abstractions/src/requestInformation.ts    |  3 +-
 packages/http/fetch/src/browser/index.ts      |  2 +
 packages/http/fetch/src/index.ts              |  2 +
 .../middlewares/browser/middlewareFactory.ts  |  3 +-
 .../middlewares/headersInspectionHandler.ts   | 70 +++++++++++++++++++
 .../src/middlewares/middlewareFactory.ts      |  3 +-
 .../options/headersInspectionOptions.ts       | 46 ++++++++++++
 .../http/fetch/test/browser/httpClient.ts     | 10 +--
 .../fetch/test/browser/middlewareFactory.ts   |  6 +-
 .../middleware/headersInspectionHandler.ts    | 66 +++++++++++++++++
 .../http/fetch/test/node/MiddlewareFactory.ts |  7 +-
 .../http/fetch/test/node/RedirectHandler.ts   |  6 +-
 packages/http/fetch/test/node/httpClient.ts   |  8 ++-
 14 files changed, 215 insertions(+), 18 deletions(-)
 create mode 100644 packages/http/fetch/src/middlewares/headersInspectionHandler.ts
 create mode 100644 packages/http/fetch/src/middlewares/options/headersInspectionOptions.ts
 create mode 100644 packages/http/fetch/test/common/middleware/headersInspectionHandler.ts

diff --git a/packages/abstractions/src/index.ts b/packages/abstractions/src/index.ts
index c69a7977a..c00d064bb 100644
--- a/packages/abstractions/src/index.ts
+++ b/packages/abstractions/src/index.ts
@@ -17,4 +17,5 @@ export * from "./serialization";
 export * from "./store";
 export * from "./timeOnly";
 export * from "./utils";
+export * from "./recordWithCaseInsensitiveKeys";
 export * from "./responseHandlerOptions";
diff --git a/packages/abstractions/src/requestInformation.ts b/packages/abstractions/src/requestInformation.ts
index 7769f051e..4fae7be4a 100644
--- a/packages/abstractions/src/requestInformation.ts
+++ b/packages/abstractions/src/requestInformation.ts
@@ -75,7 +75,8 @@ export class RequestInformation {
     string | number | boolean | undefined
   >();
   /** The Request Headers. */
-  public headers: Record<string, string[]> = {};
+  public headers: Record<string, string[]> =
+    createRecordWithCaseInsensitiveKeys<string[]>();
   private _requestOptions: Record<string, RequestOption> =
     createRecordWithCaseInsensitiveKeys<RequestOption>();
   /** Gets the request options for the request. */
diff --git a/packages/http/fetch/src/browser/index.ts b/packages/http/fetch/src/browser/index.ts
index b284a699f..9275e83d4 100644
--- a/packages/http/fetch/src/browser/index.ts
+++ b/packages/http/fetch/src/browser/index.ts
@@ -12,9 +12,11 @@ export * from "../fetchRequestAdapter";
 export * from "../httpClient";
 export * from "../middlewares/middleware";
 export * from "../middlewares/customFetchHandler";
+export * from "../middlewares/headersInspectionHandler";
 export * from "../middlewares/parametersNameDecodingHandler";
 export * from "../middlewares/retryHandler";
 export * from "../middlewares/userAgentHandler";
+export * from "../middlewares/options/headersInspectionOptions";
 export * from "../middlewares/options/parametersNameDecodingOptions";
 export * from "../middlewares/options/retryHandlerOptions";
 export * from "../middlewares/options/telemetryHandlerOptions";
diff --git a/packages/http/fetch/src/index.ts b/packages/http/fetch/src/index.ts
index 9d6cbf414..bce259c10 100644
--- a/packages/http/fetch/src/index.ts
+++ b/packages/http/fetch/src/index.ts
@@ -13,12 +13,14 @@ export * from "./httpClient";
 export * from "./middlewares/middleware";
 export * from "./middlewares/chaosHandler";
 export * from "./middlewares/customFetchHandler";
+export * from "./middlewares/headersInspectionHandler";
 export * from "./middlewares/parametersNameDecodingHandler";
 export * from "./middlewares/redirectHandler";
 export * from "./middlewares/retryHandler";
 export * from "./middlewares/userAgentHandler";
 export * from "./middlewares/options/chaosHandlerOptions";
 export * from "./middlewares/options/chaosStrategy";
+export * from "./middlewares/options/headersInspectionOptions";
 export * from "./middlewares/options/parametersNameDecodingOptions";
 export * from "./middlewares/options/redirectHandlerOptions";
 export * from "./middlewares/options/retryHandlerOptions";
diff --git a/packages/http/fetch/src/middlewares/browser/middlewareFactory.ts b/packages/http/fetch/src/middlewares/browser/middlewareFactory.ts
index 2668051a4..8334faada 100644
--- a/packages/http/fetch/src/middlewares/browser/middlewareFactory.ts
+++ b/packages/http/fetch/src/middlewares/browser/middlewareFactory.ts
@@ -10,6 +10,7 @@
  */
 
 import { CustomFetchHandler } from "../customFetchHandler";
+import { HeadersInspectionHandler } from "../headersInspectionHandler";
 import type { Middleware } from "../middleware";
 import { ParametersNameDecodingHandler } from "../parametersNameDecodingHandler";
 import { RetryHandler } from "../retryHandler";
@@ -30,7 +31,7 @@ export class MiddlewareFactory {
 	public static getDefaultMiddlewareChain(customFetch: (request: string, init: RequestInit) => Promise<Response> = fetch as any): Middleware[] {
 		// Browsers handles redirection automatically and do not require the redirectionHandler
 
-		const middlewareArray: Middleware[] = [new RetryHandler(), new ParametersNameDecodingHandler(), new UserAgentHandler(), new CustomFetchHandler(customFetch)];
+		const middlewareArray: Middleware[] = [new RetryHandler(), new ParametersNameDecodingHandler(), new UserAgentHandler(), new HeadersInspectionHandler(), new CustomFetchHandler(customFetch)];
 		return middlewareArray;
 	}
 }
diff --git a/packages/http/fetch/src/middlewares/headersInspectionHandler.ts b/packages/http/fetch/src/middlewares/headersInspectionHandler.ts
new file mode 100644
index 000000000..ae6516827
--- /dev/null
+++ b/packages/http/fetch/src/middlewares/headersInspectionHandler.ts
@@ -0,0 +1,70 @@
+/**
+ * -------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.
+ * See License in the project root for license information.
+ * -------------------------------------------------------------------------------------------
+ */
+
+import { RequestOption } from "@microsoft/kiota-abstractions";
+import { trace } from "@opentelemetry/api";
+
+import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
+import type { Middleware } from "./middleware";
+import { HeadersInspectionOptions, HeadersInspectionOptionsKey } from "./options/headersInspectionOptions";
+
+/**
+ * @class
+ * @implements Middleware
+ * Inspects the headers of the request and response
+ */
+export class HeadersInspectionHandler implements Middleware {
+	/**
+	 * @constructor
+	 * @public
+	 * Creates new instance of HeadersInspectionHandler
+	 * @param {HeadersInspectionOptions} _options The options for inspecting the headers
+	 */
+	public constructor(private readonly _options: HeadersInspectionOptions = new HeadersInspectionOptions()) {}
+	/**
+	 * @private
+	 * The next middleware in the middleware chain
+	 */
+	next: Middleware | undefined;
+	public execute(url: string, requestInit: RequestInit, requestOptions?: Record<string, RequestOption> | undefined): Promise<Response> {
+		let currentOptions = this._options;
+		if (requestOptions?.[HeadersInspectionOptionsKey]) {
+			currentOptions = requestOptions[HeadersInspectionOptionsKey] as HeadersInspectionOptions;
+		}
+		const obsOptions = getObservabilityOptionsFromRequest(requestOptions);
+		if (obsOptions) {
+			return trace.getTracer(obsOptions.getTracerInstrumentationName()).startActiveSpan("retryHandler - execute", (span) => {
+				try {
+					span.setAttribute("com.microsoft.kiota.handler.headersInspection.enable", true);
+					return this.executeInternal(url, requestInit, requestOptions, currentOptions);
+				} finally {
+					span.end();
+				}
+			});
+		}
+		return this.executeInternal(url, requestInit, requestOptions, currentOptions);
+	}
+	private async executeInternal(url: string, requestInit: RequestInit, requestOptions: Record<string, RequestOption> | undefined, currentOptions: HeadersInspectionOptions): Promise<Response> {
+		if (!this.next) {
+			throw new Error("next middleware is undefined.");
+		}
+		if (currentOptions.inspectRequestHeaders && requestInit.headers) {
+			for (const [key, value] of requestInit.headers as [string, string][]) {
+				currentOptions.getRequestHeaders()[key] = [value];
+			}
+		}
+
+		const response = await this.next.execute(url, requestInit, requestOptions);
+		if (currentOptions.inspectResponseHeaders && response.headers) {
+			for (const [key, value] of response.headers.entries()) {
+				currentOptions.getResponseHeaders()[key] = [value];
+			}
+		}
+
+		return response;
+	}
+}
diff --git a/packages/http/fetch/src/middlewares/middlewareFactory.ts b/packages/http/fetch/src/middlewares/middlewareFactory.ts
index c5dc26e9a..cdf5cea1e 100644
--- a/packages/http/fetch/src/middlewares/middlewareFactory.ts
+++ b/packages/http/fetch/src/middlewares/middlewareFactory.ts
@@ -16,6 +16,7 @@ import { ParametersNameDecodingHandler } from "./parametersNameDecodingHandler";
 import { RedirectHandler } from "./redirectHandler";
 import { RetryHandler } from "./retryHandler";
 import { UserAgentHandler } from "./userAgentHandler";
+import { HeadersInspectionHandler } from "./headersInspectionHandler";
 
 /**
  * @class
@@ -30,7 +31,7 @@ export class MiddlewareFactory {
 	 * @returns an array of the middleware handlers of the default middleware chain
 	 */
 	public static getDefaultMiddlewareChain(customFetch: (request: string, init: RequestInit) => Promise<Response> = fetch as any): Middleware[] {
-		const middlewareArray: Middleware[] = [new RetryHandler(), new RedirectHandler(), new ParametersNameDecodingHandler(), new UserAgentHandler(), new CustomFetchHandler(customFetch)];
+		const middlewareArray: Middleware[] = [new RetryHandler(), new RedirectHandler(), new ParametersNameDecodingHandler(), new UserAgentHandler(), new HeadersInspectionHandler(), new CustomFetchHandler(customFetch)];
 
 		return middlewareArray;
 	}
diff --git a/packages/http/fetch/src/middlewares/options/headersInspectionOptions.ts b/packages/http/fetch/src/middlewares/options/headersInspectionOptions.ts
new file mode 100644
index 000000000..3099a94cd
--- /dev/null
+++ b/packages/http/fetch/src/middlewares/options/headersInspectionOptions.ts
@@ -0,0 +1,46 @@
+import type { RequestOption } from "@microsoft/kiota-abstractions";
+import { createRecordWithCaseInsensitiveKeys } from "@microsoft/kiota-abstractions";
+export const HeadersInspectionOptionsKey = "HeadersInspectionOptionsKey";
+/**
+ * @class
+ * @implements RequestOption
+ * Options
+ * Options to inspect headers
+ */
+export class HeadersInspectionOptions implements RequestOption {
+	private readonly requestHeaders = createRecordWithCaseInsensitiveKeys<string[]>();
+	private readonly responseHeaders = createRecordWithCaseInsensitiveKeys<string[]>();
+	/**
+	 * @public
+	 * @getter
+	 * Gets the request headers
+	 * @returns the request headers
+	 */
+	public getRequestHeaders() {
+		return this.requestHeaders;
+	}
+	/**
+	 * @public
+	 * @getter
+	 * Gets the response headers
+	 * @returns the response headers
+	 */
+	public getResponseHeaders() {
+		return this.responseHeaders;
+	}
+	/**
+	 * @public
+	 * @constructor
+	 * To create an instance of HeadersInspectionOptions
+	 * @param {boolean} [inspectRequestHeaders = false] - Whether to inspect request headers
+	 * @param {boolean} [inspectResponseHeaders = false] - Whether to inspect response headers
+	 * @returns An instance of HeadersInspectionOptions
+	 */
+	public constructor(
+		public inspectRequestHeaders = false,
+		public inspectResponseHeaders = false,
+	) {}
+	public getKey(): string {
+		return HeadersInspectionOptionsKey;
+	}
+}
diff --git a/packages/http/fetch/test/browser/httpClient.ts b/packages/http/fetch/test/browser/httpClient.ts
index 5a4e7eee1..cb0d99b7d 100644
--- a/packages/http/fetch/test/browser/httpClient.ts
+++ b/packages/http/fetch/test/browser/httpClient.ts
@@ -7,7 +7,7 @@
 
 import { assert } from "chai";
 
-import { CustomFetchHandler, HttpClient, ParametersNameDecodingHandler, RetryHandler, UserAgentHandler } from "../../src";
+import { CustomFetchHandler, HeadersInspectionHandler, HttpClient, ParametersNameDecodingHandler, RetryHandler, UserAgentHandler } from "../../src";
 import { DummyFetchHandler } from "../common/middleware/dummyFetchHandler";
 
 describe("browser - HTTPClient.ts", () => {
@@ -38,7 +38,8 @@ describe("browser - HTTPClient.ts", () => {
 			assert.isTrue(client["middleware"] instanceof RetryHandler);
 			assert.isTrue(next instanceof ParametersNameDecodingHandler);
 			assert.isTrue(next?.next instanceof UserAgentHandler);
-			assert.isTrue(next?.next?.next instanceof CustomFetchHandler);
+			assert.isTrue(next?.next?.next instanceof HeadersInspectionHandler);
+			assert.isTrue(next?.next?.next?.next instanceof CustomFetchHandler);
 		});
 
 		it("Should set default middleware array with customFetchHandler if middleware parameter is undefined && customFetch is defined", () => {
@@ -52,7 +53,8 @@ describe("browser - HTTPClient.ts", () => {
 			assert.isTrue(client["middleware"] instanceof RetryHandler);
 			assert.isTrue(next instanceof ParametersNameDecodingHandler);
 			assert.isTrue(next?.next instanceof UserAgentHandler);
-			assert.isTrue(next?.next?.next instanceof CustomFetchHandler);
+			assert.isTrue(next?.next?.next instanceof HeadersInspectionHandler);
+			assert.isTrue(next?.next?.next?.next instanceof CustomFetchHandler);
 		});
 
 		it("Should set to default fetch handler middleware array if middleware parameter is null && customFetch is undefined", () => {
@@ -68,7 +70,7 @@ describe("browser - HTTPClient.ts", () => {
 
 			assert.isDefined(client["middleware"]);
 			assert.equal(client["customFetch"], dummyCustomFetch);
-			assert.isTrue(client["middleware"].next?.next?.next instanceof CustomFetchHandler);
+			assert.isTrue(client["middleware"].next?.next?.next?.next instanceof CustomFetchHandler);
 		});
 	});
 });
diff --git a/packages/http/fetch/test/browser/middlewareFactory.ts b/packages/http/fetch/test/browser/middlewareFactory.ts
index 8634c05b3..565c36988 100644
--- a/packages/http/fetch/test/browser/middlewareFactory.ts
+++ b/packages/http/fetch/test/browser/middlewareFactory.ts
@@ -7,16 +7,18 @@
 
 import { assert } from "chai";
 
+import { HeadersInspectionHandler } from "../../src";
 import { CustomFetchHandler, MiddlewareFactory, ParametersNameDecodingHandler, RetryHandler, UserAgentHandler } from "../../src/browser";
 
 describe("browser - MiddlewareFactory", () => {
 	it("Should return the default pipeline", () => {
 		const defaultMiddleWareArray = MiddlewareFactory.getDefaultMiddlewareChain();
 
-		assert.equal(defaultMiddleWareArray.length, 4);
+		assert.equal(defaultMiddleWareArray.length, 5);
 		assert.isTrue(defaultMiddleWareArray[0] instanceof RetryHandler);
 		assert.isTrue(defaultMiddleWareArray[1] instanceof ParametersNameDecodingHandler);
 		assert.isTrue(defaultMiddleWareArray[2] instanceof UserAgentHandler);
-		assert.isTrue(defaultMiddleWareArray[3] instanceof CustomFetchHandler);
+		assert.isTrue(defaultMiddleWareArray[3] instanceof HeadersInspectionHandler);
+		assert.isTrue(defaultMiddleWareArray[4] instanceof CustomFetchHandler);
 	});
 });
diff --git a/packages/http/fetch/test/common/middleware/headersInspectionHandler.ts b/packages/http/fetch/test/common/middleware/headersInspectionHandler.ts
new file mode 100644
index 000000000..bb0ff80ce
--- /dev/null
+++ b/packages/http/fetch/test/common/middleware/headersInspectionHandler.ts
@@ -0,0 +1,66 @@
+/**
+ * -------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.
+ * See License in the project root for license information.
+ * -------------------------------------------------------------------------------------------
+ */
+
+import { assert } from "chai";
+import { Response } from "node-fetch";
+
+import { HeadersInspectionHandler, HeadersInspectionOptions } from "../../../src";
+import { DummyFetchHandler } from "./dummyFetchHandler";
+const defaultOptions = new HeadersInspectionOptions();
+describe("HeadersInspectionHandler.ts", () => {
+	describe("constructor", () => {
+		it("Should create an instance with given options", () => {
+			const handler = new HeadersInspectionHandler(defaultOptions);
+			assert.isDefined(handler["_options"]);
+		});
+
+		it("Should create an instance with default set of options", () => {
+			const handler = new HeadersInspectionHandler();
+			assert.isDefined(handler["_options"]);
+		});
+	});
+	describe("gets request headers", () => {
+		it("Should return request headers", async () => {
+			const options = new HeadersInspectionOptions(true);
+			const handler = new HeadersInspectionHandler(options);
+			const dummyFetchHandler = new DummyFetchHandler();
+			dummyFetchHandler.setResponses([
+				new Response(undefined, {
+					headers: {
+						["test"]: "test",
+					},
+					status: 200,
+				}),
+			] as any);
+			handler.next = dummyFetchHandler;
+			await handler.execute("https://graph.microsoft.com/v1.0/me", { headers: [["test", "test"]] });
+			const headers = options.getRequestHeaders();
+			assert.isDefined(headers);
+			assert.isEmpty(options.getResponseHeaders());
+			assert.equal(headers["test"][0], "test");
+		});
+		it("Should return response headers", async () => {
+			const options = new HeadersInspectionOptions(false, true);
+			const handler = new HeadersInspectionHandler(options);
+			const dummyFetchHandler = new DummyFetchHandler();
+			dummyFetchHandler.setResponses([
+				new Response(undefined, {
+					headers: {
+						["test"]: "test",
+					},
+					status: 200,
+				}),
+			] as any);
+			handler.next = dummyFetchHandler;
+			await handler.execute("https://graph.microsoft.com/v1.0/me", { headers: [["test", "test"]] });
+			const headers = options.getResponseHeaders();
+			assert.isDefined(headers);
+			assert.isEmpty(options.getRequestHeaders());
+			assert.equal(headers["test"][0], "test");
+		});
+	});
+});
diff --git a/packages/http/fetch/test/node/MiddlewareFactory.ts b/packages/http/fetch/test/node/MiddlewareFactory.ts
index 9cfbcb105..43602f684 100644
--- a/packages/http/fetch/test/node/MiddlewareFactory.ts
+++ b/packages/http/fetch/test/node/MiddlewareFactory.ts
@@ -7,17 +7,18 @@
 
 import { assert } from "chai";
 
-import { CustomFetchHandler, MiddlewareFactory, ParametersNameDecodingHandler, RedirectHandler, RetryHandler, UserAgentHandler } from "../../src";
+import { CustomFetchHandler, HeadersInspectionHandler, MiddlewareFactory, ParametersNameDecodingHandler, RedirectHandler, RetryHandler, UserAgentHandler } from "../../src";
 
 describe("node - MiddlewareFactory", () => {
 	it("Should return the default pipeline", () => {
 		const defaultMiddleWareArray = MiddlewareFactory.getDefaultMiddlewareChain();
-		assert.equal(defaultMiddleWareArray.length, 5);
+		assert.equal(defaultMiddleWareArray.length, 6);
 
 		assert.isTrue(defaultMiddleWareArray[0] instanceof RetryHandler);
 		assert.isTrue(defaultMiddleWareArray[1] instanceof RedirectHandler);
 		assert.isTrue(defaultMiddleWareArray[2] instanceof ParametersNameDecodingHandler);
 		assert.isTrue(defaultMiddleWareArray[3] instanceof UserAgentHandler);
-		assert.isTrue(defaultMiddleWareArray[4] instanceof CustomFetchHandler);
+		assert.isTrue(defaultMiddleWareArray[4] instanceof HeadersInspectionHandler);
+		assert.isTrue(defaultMiddleWareArray[5] instanceof CustomFetchHandler);
 	});
 });
diff --git a/packages/http/fetch/test/node/RedirectHandler.ts b/packages/http/fetch/test/node/RedirectHandler.ts
index 37307e5a2..3f79fdd76 100644
--- a/packages/http/fetch/test/node/RedirectHandler.ts
+++ b/packages/http/fetch/test/node/RedirectHandler.ts
@@ -182,13 +182,13 @@ describe("RedirectHandler.ts", () => {
 			};
 
 			dummyFetchHandler.setResponses([
-				new Response(null, {
+				new Response(undefined, {
 					status: 301,
 					headers: {
 						[RedirectHandler["LOCATION_HEADER"]]: "/location",
 					},
 				}),
-				new Response(null, {
+				new Response(undefined, {
 					status: 301,
 					headers: {
 						[RedirectHandler["LOCATION_HEADER"]]: "/location",
@@ -220,7 +220,7 @@ describe("RedirectHandler.ts", () => {
 			};
 			const arr = [];
 			for (let i = 0; i < 5; i++) {
-				arr[i] = new Response(null, {
+				arr[i] = new Response(undefined, {
 					status: 301,
 					headers: {
 						[RedirectHandler["LOCATION_HEADER"]]: "/location",
diff --git a/packages/http/fetch/test/node/httpClient.ts b/packages/http/fetch/test/node/httpClient.ts
index 2769f30bc..bbb36229f 100644
--- a/packages/http/fetch/test/node/httpClient.ts
+++ b/packages/http/fetch/test/node/httpClient.ts
@@ -7,7 +7,7 @@
 
 import { assert } from "chai";
 
-import { CustomFetchHandler, HttpClient, ParametersNameDecodingHandler, RedirectHandler, RetryHandler, UserAgentHandler } from "../../src";
+import { CustomFetchHandler, HeadersInspectionHandler, HttpClient, ParametersNameDecodingHandler, RedirectHandler, RetryHandler, UserAgentHandler } from "../../src";
 import { DummyFetchHandler } from "../common/middleware/dummyFetchHandler";
 
 describe("node - HTTPClient.ts", () => {
@@ -39,7 +39,8 @@ describe("node - HTTPClient.ts", () => {
 			assert.isTrue(next instanceof RedirectHandler);
 			assert.isTrue(next?.next instanceof ParametersNameDecodingHandler);
 			assert.isTrue(next?.next?.next instanceof UserAgentHandler);
-			assert.isTrue(next?.next?.next?.next instanceof CustomFetchHandler);
+			assert.isTrue(next?.next?.next?.next instanceof HeadersInspectionHandler);
+			assert.isTrue(next?.next?.next?.next?.next instanceof CustomFetchHandler);
 		});
 
 		it("Should set default middleware array with customFetchHandler if middleware parameter is undefined && customFetch is defined", () => {
@@ -54,7 +55,8 @@ describe("node - HTTPClient.ts", () => {
 			assert.isTrue(next instanceof RedirectHandler);
 			assert.isTrue(next?.next instanceof ParametersNameDecodingHandler);
 			assert.isTrue(next?.next?.next instanceof UserAgentHandler);
-			assert.isTrue(next?.next?.next?.next instanceof CustomFetchHandler);
+			assert.isTrue(next?.next?.next?.next instanceof HeadersInspectionHandler);
+			assert.isTrue(next?.next?.next?.next?.next instanceof CustomFetchHandler);
 		});
 
 		it("Should set to default fetch handler middleware array if middleware parameter is null && customFetch is undefined", () => {

From 88640a9eaf528f7d2755dc78d93fb91378bf14d9 Mon Sep 17 00:00:00 2001
From: koros <korosmatick@gmail.com>
Date: Tue, 29 Aug 2023 11:34:02 +0300
Subject: [PATCH 03/11] fix eslint warnings

---
 packages/abstractions/.eslintrc.json          |  1 +
 .../src/authentication/accessTokenProvider.ts |  2 +-
 .../authentication/authenticationProvider.ts  |  2 +-
 .../abstractions/src/nativeResponseHandler.ts |  3 +-
 .../abstractions/src/nativeResponseWrapper.ts |  2 +-
 packages/abstractions/src/requestAdapter.ts   |  4 +-
 .../abstractions/src/requestInformation.ts    |  4 +-
 packages/abstractions/src/responseHandler.ts  |  3 +-
 .../src/serialization/parsableFactory.ts      |  2 +-
 .../src/serialization/parseNode.ts            | 11 +++---
 .../src/serialization/serializationWriter.ts  | 11 +++---
 .../abstractions/src/store/backedModel.ts     |  2 +-
 packages/test/.eslintignore                   |  6 +++
 packages/test/.eslintrc.js                    | 38 +++++++++++++++++++
 14 files changed, 66 insertions(+), 25 deletions(-)
 create mode 100644 packages/test/.eslintignore
 create mode 100644 packages/test/.eslintrc.js

diff --git a/packages/abstractions/.eslintrc.json b/packages/abstractions/.eslintrc.json
index e73e74ab4..80ab9b397 100644
--- a/packages/abstractions/.eslintrc.json
+++ b/packages/abstractions/.eslintrc.json
@@ -18,6 +18,7 @@
         "@typescript-eslint/no-unused-vars": "error",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/explicit-module-boundary-types": "off",
+        "@typescript-eslint/consistent-type-imports": "error",
         "prettier/prettier": [
             "error",
             {
diff --git a/packages/abstractions/src/authentication/accessTokenProvider.ts b/packages/abstractions/src/authentication/accessTokenProvider.ts
index 8ac83b2b1..10716b6fa 100644
--- a/packages/abstractions/src/authentication/accessTokenProvider.ts
+++ b/packages/abstractions/src/authentication/accessTokenProvider.ts
@@ -1,4 +1,4 @@
-import { AllowedHostsValidator } from "./allowedHostsValidator";
+import type { AllowedHostsValidator } from "./allowedHostsValidator";
 
 /**
  * @interface
diff --git a/packages/abstractions/src/authentication/authenticationProvider.ts b/packages/abstractions/src/authentication/authenticationProvider.ts
index d671283d3..00d615d43 100644
--- a/packages/abstractions/src/authentication/authenticationProvider.ts
+++ b/packages/abstractions/src/authentication/authenticationProvider.ts
@@ -1,4 +1,4 @@
-import { RequestInformation } from "../requestInformation";
+import type { RequestInformation } from "../requestInformation";
 
 /**
  * @interface
diff --git a/packages/abstractions/src/nativeResponseHandler.ts b/packages/abstractions/src/nativeResponseHandler.ts
index a1f9ca90f..31890b3c1 100644
--- a/packages/abstractions/src/nativeResponseHandler.ts
+++ b/packages/abstractions/src/nativeResponseHandler.ts
@@ -1,6 +1,5 @@
 import type { ResponseHandler } from "./responseHandler";
-import { ParsableFactory } from "./serialization";
-import type { Parsable } from "./serialization";
+import type { Parsable, ParsableFactory } from "./serialization";
 
 /** Default response handler to access the native response object. */
 export class NativeResponseHandler implements ResponseHandler {
diff --git a/packages/abstractions/src/nativeResponseWrapper.ts b/packages/abstractions/src/nativeResponseWrapper.ts
index 61487ce26..72d5e12fd 100644
--- a/packages/abstractions/src/nativeResponseWrapper.ts
+++ b/packages/abstractions/src/nativeResponseWrapper.ts
@@ -1,5 +1,5 @@
 import { NativeResponseHandler } from "./nativeResponseHandler";
-import { RequestOption } from "./requestOption";
+import type { RequestOption } from "./requestOption";
 import type { ResponseHandler } from "./responseHandler";
 
 type originalCallType<modelType, queryParametersType, headersType> = (
diff --git a/packages/abstractions/src/requestAdapter.ts b/packages/abstractions/src/requestAdapter.ts
index 521157272..5c142aa0f 100644
--- a/packages/abstractions/src/requestAdapter.ts
+++ b/packages/abstractions/src/requestAdapter.ts
@@ -1,5 +1,5 @@
-import { RequestInformation } from "./requestInformation";
-import { ParsableFactory } from "./serialization";
+import type { RequestInformation } from "./requestInformation";
+import type { ParsableFactory } from "./serialization";
 import type { Parsable, SerializationWriterFactory } from "./serialization";
 import type { BackingStoreFactory } from "./store";
 
diff --git a/packages/abstractions/src/requestInformation.ts b/packages/abstractions/src/requestInformation.ts
index 7769f051e..8780b5a61 100644
--- a/packages/abstractions/src/requestInformation.ts
+++ b/packages/abstractions/src/requestInformation.ts
@@ -3,12 +3,12 @@ import * as Template from "uri-template-lite";
 
 import { DateOnly } from "./dateOnly";
 import { Duration } from "./duration";
-import { HttpMethod } from "./httpMethod";
+import type { HttpMethod } from "./httpMethod";
 import { MultipartBody } from "./multipartBody";
 import { createRecordWithCaseInsensitiveKeys } from "./recordWithCaseInsensitiveKeys";
 import type { RequestAdapter } from "./requestAdapter";
 import type { RequestOption } from "./requestOption";
-import {
+import type {
   ModelSerializerFunction,
 } from "./serialization";
 import type { Parsable, SerializationWriter } from "./serialization";
diff --git a/packages/abstractions/src/responseHandler.ts b/packages/abstractions/src/responseHandler.ts
index df19d5b81..256107dc6 100644
--- a/packages/abstractions/src/responseHandler.ts
+++ b/packages/abstractions/src/responseHandler.ts
@@ -1,5 +1,4 @@
-import { ParsableFactory } from "./serialization";
-import type { Parsable } from "./serialization";
+import type { Parsable, ParsableFactory } from "./serialization";
 
 /** Defines the contract for a response handler. */
 export interface ResponseHandler {
diff --git a/packages/abstractions/src/serialization/parsableFactory.ts b/packages/abstractions/src/serialization/parsableFactory.ts
index f86f169df..216ae4c2a 100644
--- a/packages/abstractions/src/serialization/parsableFactory.ts
+++ b/packages/abstractions/src/serialization/parsableFactory.ts
@@ -1,6 +1,6 @@
 import type { Parsable } from "./parsable";
 import type { ParseNode } from "./parseNode";
-import { DeserializeIntoModelFunction } from "./serializationFunctionTypes";
+import type { DeserializeIntoModelFunction } from "./serializationFunctionTypes";
 
 /**
  * Defines the factory to get the deserializers constructing the parsable models.
diff --git a/packages/abstractions/src/serialization/parseNode.ts b/packages/abstractions/src/serialization/parseNode.ts
index 5e670875e..916909948 100644
--- a/packages/abstractions/src/serialization/parseNode.ts
+++ b/packages/abstractions/src/serialization/parseNode.ts
@@ -1,10 +1,9 @@
-import { Guid } from "guid-typescript";
-
-import { DateOnly } from "../dateOnly";
-import { Duration } from "../duration";
-import { TimeOnly } from "../timeOnly";
+import type { Guid } from "guid-typescript";
+import type { DateOnly } from "../dateOnly";
+import type { Duration } from "../duration";
+import type { TimeOnly } from "../timeOnly";
 import type { Parsable } from "./parsable";
-import { ParsableFactory } from "./parsableFactory";
+import type { ParsableFactory } from "./parsableFactory";
 
 /**
  * Interface for a deserialization node in a parse tree. This interface provides an abstraction layer over serialization formats, libraries and implementations.
diff --git a/packages/abstractions/src/serialization/serializationWriter.ts b/packages/abstractions/src/serialization/serializationWriter.ts
index f69d90a46..a27991848 100644
--- a/packages/abstractions/src/serialization/serializationWriter.ts
+++ b/packages/abstractions/src/serialization/serializationWriter.ts
@@ -1,10 +1,9 @@
-import { Guid } from "guid-typescript";
-
-import { DateOnly } from "../dateOnly";
-import { Duration } from "../duration";
-import { TimeOnly } from "../timeOnly";
+import type { Guid } from "guid-typescript";
+import type { DateOnly } from "../dateOnly";
+import type { Duration } from "../duration";
+import type { TimeOnly } from "../timeOnly";
 import type { Parsable } from "./parsable";
-import { ModelSerializerFunction } from "./serializationFunctionTypes";
+import type { ModelSerializerFunction } from "./serializationFunctionTypes";
 
 /** Defines an interface for serialization of objects to a stream. */
 export interface SerializationWriter {
diff --git a/packages/abstractions/src/store/backedModel.ts b/packages/abstractions/src/store/backedModel.ts
index fb357126a..fb603432b 100644
--- a/packages/abstractions/src/store/backedModel.ts
+++ b/packages/abstractions/src/store/backedModel.ts
@@ -1,4 +1,4 @@
-import { BackingStore } from "./backingStore";
+import type { BackingStore } from "./backingStore";
 
 /** Defines the contracts for a model that is backed by a store. */
 export interface BackedModel {
diff --git a/packages/test/.eslintignore b/packages/test/.eslintignore
new file mode 100644
index 000000000..9ec10207b
--- /dev/null
+++ b/packages/test/.eslintignore
@@ -0,0 +1,6 @@
+*.js
+*.js.map
+*.d.ts
+
+node_modules
+dist
\ No newline at end of file
diff --git a/packages/test/.eslintrc.js b/packages/test/.eslintrc.js
new file mode 100644
index 000000000..b0204e88c
--- /dev/null
+++ b/packages/test/.eslintrc.js
@@ -0,0 +1,38 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "es2021": true,
+        "node": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended"
+    ],
+    "overrides": [
+        {
+            "env": {
+                "node": true
+            },
+            "files": [
+                ".eslintrc.{js,cjs}"
+            ],
+            "parserOptions": {
+                "sourceType": "script"
+            }
+        }
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "plugins": [
+        "@typescript-eslint"
+    ],
+    "rules": {
+        "@typescript-eslint/consistent-type-imports": "error",
+        "no-unused-vars": "warn",
+        "@typescript-eslint/no-unused-vars": "warn",
+        "no-extra-semi" : "warn"
+    }
+}

From 92396d79eb9d11805ee7e6ee827aee11e587f631 Mon Sep 17 00:00:00 2001
From: koros <korosmatick@gmail.com>
Date: Wed, 30 Aug 2023 12:34:19 +0300
Subject: [PATCH 04/11] fix imports

---
 packages/abstractions/.eslintrc.json               |  2 +-
 packages/abstractions/src/apiClientBuilder.ts      |  8 +++-----
 .../src/authentication/accessTokenProvider.ts      |  2 +-
 .../src/authentication/authenticationProvider.ts   |  2 +-
 packages/abstractions/src/multipartBody.ts         |  6 +-----
 packages/abstractions/src/requestAdapter.ts        |  5 ++---
 packages/abstractions/src/requestInformation.ts    |  7 ++-----
 .../abstractions/src/serialization/parseNode.ts    |  8 ++++----
 .../src/serialization/serializationWriter.ts       |  8 ++++----
 .../src/store/backingStoreParseNodeFactory.ts      |  3 +--
 .../backingStoreSerializationWriterProxyFactory.ts |  3 +--
 .../abstractions/test/common/requestInformation.ts | 14 ++++++--------
 .../azure/src/azureIdentityAccessTokenProvider.ts  |  4 +---
 .../src/azureIdentityAuthenticationProvider.ts     |  4 +---
 .../spfx/src/azureAdSpfxAccessTokenProvider.ts     |  4 +---
 .../spfx/src/azureAdSpfxAuthenticationProvider.ts  |  3 +--
 packages/http/fetch/src/fetchRequestAdapter.ts     |  9 +++------
 packages/http/fetch/src/httpClient.ts              |  1 -
 packages/http/fetch/src/kiotaClientFactory.ts      |  1 -
 .../http/fetch/src/middlewares/chaosHandler.ts     |  1 -
 .../src/middlewares/headersInspectionHandler.ts    |  3 +--
 .../fetch/src/middlewares/middlewareFactory.ts     |  1 -
 .../options/headersInspectionOptions.ts            |  3 +--
 .../src/middlewares/options/retryHandlerOptions.ts |  1 -
 .../middlewares/options/userAgentHandlerOptions.ts |  2 --
 .../middlewares/parametersNameDecodingHandler.ts   |  1 -
 .../http/fetch/src/middlewares/redirectHandler.ts  |  1 -
 .../http/fetch/src/middlewares/retryHandler.ts     |  5 ++---
 .../http/fetch/src/middlewares/telemetryHandler.ts |  1 -
 .../http/fetch/src/middlewares/userAgentHandler.ts |  1 -
 .../http/fetch/test/common/fetchRequestAdapter.ts  |  4 +---
 .../common/middleware/testCallBackMiddleware.ts    |  1 -
 .../http/fetch/test/common/mockParseNodeFactory.ts |  3 +--
 packages/serialization/form/src/formParseNode.ts   |  3 ++-
 .../serialization/form/src/formParseNodeFactory.ts |  1 -
 .../form/src/formSerializationWriter.ts            |  3 ++-
 packages/serialization/form/test/testEntity.ts     | 10 ++++------
 .../json/src/jsonSerializationWriter.ts            |  6 ++----
 .../multipart/src/multipartSerializationWriter.ts  |  6 ++----
 packages/serialization/text/src/textParseNode.ts   |  3 ++-
 .../text/src/textSerializationWriter.ts            |  3 ++-
 packages/test/.eslintrc.js                         |  2 +-
 42 files changed, 57 insertions(+), 102 deletions(-)

diff --git a/packages/abstractions/.eslintrc.json b/packages/abstractions/.eslintrc.json
index 80ab9b397..48436fc8a 100644
--- a/packages/abstractions/.eslintrc.json
+++ b/packages/abstractions/.eslintrc.json
@@ -18,7 +18,7 @@
         "@typescript-eslint/no-unused-vars": "error",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/explicit-module-boundary-types": "off",
-        "@typescript-eslint/consistent-type-imports": "error",
+        "@typescript-eslint/consistent-type-imports": "warn",
         "prettier/prettier": [
             "error",
             {
diff --git a/packages/abstractions/src/apiClientBuilder.ts b/packages/abstractions/src/apiClientBuilder.ts
index a46ce6a81..7fdb45ecc 100644
--- a/packages/abstractions/src/apiClientBuilder.ts
+++ b/packages/abstractions/src/apiClientBuilder.ts
@@ -1,10 +1,8 @@
 import {
+  type ParseNodeFactory,
   ParseNodeFactoryRegistry,
-  SerializationWriterFactoryRegistry,
-} from "./serialization";
-import type {
-  ParseNodeFactory,
-  SerializationWriterFactory
+  type SerializationWriterFactory,
+  SerializationWriterFactoryRegistry
 } from "./serialization";
 import {
   BackingStoreParseNodeFactory,
diff --git a/packages/abstractions/src/authentication/accessTokenProvider.ts b/packages/abstractions/src/authentication/accessTokenProvider.ts
index 10716b6fa..8ac83b2b1 100644
--- a/packages/abstractions/src/authentication/accessTokenProvider.ts
+++ b/packages/abstractions/src/authentication/accessTokenProvider.ts
@@ -1,4 +1,4 @@
-import type { AllowedHostsValidator } from "./allowedHostsValidator";
+import { AllowedHostsValidator } from "./allowedHostsValidator";
 
 /**
  * @interface
diff --git a/packages/abstractions/src/authentication/authenticationProvider.ts b/packages/abstractions/src/authentication/authenticationProvider.ts
index 00d615d43..d671283d3 100644
--- a/packages/abstractions/src/authentication/authenticationProvider.ts
+++ b/packages/abstractions/src/authentication/authenticationProvider.ts
@@ -1,4 +1,4 @@
-import type { RequestInformation } from "../requestInformation";
+import { RequestInformation } from "../requestInformation";
 
 /**
  * @interface
diff --git a/packages/abstractions/src/multipartBody.ts b/packages/abstractions/src/multipartBody.ts
index 2a256bd43..ae2ef2303 100644
--- a/packages/abstractions/src/multipartBody.ts
+++ b/packages/abstractions/src/multipartBody.ts
@@ -1,10 +1,6 @@
 import { Guid } from "guid-typescript";
-
 import type { RequestAdapter } from "./requestAdapter";
-import type {
-  ModelSerializerFunction,
-} from "./serialization";
-import type { Parsable, ParseNode, SerializationWriter } from "./serialization";
+import type { ModelSerializerFunction, Parsable, ParseNode, SerializationWriter } from "./serialization";
 /**
  * Defines an interface for a multipart body for request or response.
  */
diff --git a/packages/abstractions/src/requestAdapter.ts b/packages/abstractions/src/requestAdapter.ts
index 5c142aa0f..e34212207 100644
--- a/packages/abstractions/src/requestAdapter.ts
+++ b/packages/abstractions/src/requestAdapter.ts
@@ -1,6 +1,5 @@
-import type { RequestInformation } from "./requestInformation";
-import type { ParsableFactory } from "./serialization";
-import type { Parsable, SerializationWriterFactory } from "./serialization";
+import { RequestInformation } from "./requestInformation";
+import type { Parsable, ParsableFactory, SerializationWriterFactory } from "./serialization";
 import type { BackingStoreFactory } from "./store";
 
 /** Service responsible for translating abstract Request Info into concrete native HTTP requests. */
diff --git a/packages/abstractions/src/requestInformation.ts b/packages/abstractions/src/requestInformation.ts
index 876a70bc6..9ffb44068 100644
--- a/packages/abstractions/src/requestInformation.ts
+++ b/packages/abstractions/src/requestInformation.ts
@@ -3,15 +3,12 @@ import * as Template from "uri-template-lite";
 
 import { DateOnly } from "./dateOnly";
 import { Duration } from "./duration";
-import type { HttpMethod } from "./httpMethod";
+import { HttpMethod } from "./httpMethod";
 import { MultipartBody } from "./multipartBody";
 import { createRecordWithCaseInsensitiveKeys } from "./recordWithCaseInsensitiveKeys";
 import type { RequestAdapter } from "./requestAdapter";
 import type { RequestOption } from "./requestOption";
-import type {
-  ModelSerializerFunction,
-} from "./serialization";
-import type { Parsable, SerializationWriter } from "./serialization";
+import type { ModelSerializerFunction, Parsable, SerializationWriter } from "./serialization";
 import { TimeOnly } from "./timeOnly";
 
 /** This class represents an abstract HTTP request. */
diff --git a/packages/abstractions/src/serialization/parseNode.ts b/packages/abstractions/src/serialization/parseNode.ts
index 916909948..fe1a8a459 100644
--- a/packages/abstractions/src/serialization/parseNode.ts
+++ b/packages/abstractions/src/serialization/parseNode.ts
@@ -1,7 +1,7 @@
-import type { Guid } from "guid-typescript";
-import type { DateOnly } from "../dateOnly";
-import type { Duration } from "../duration";
-import type { TimeOnly } from "../timeOnly";
+import { Guid } from "guid-typescript";
+import { DateOnly } from "../dateOnly";
+import { Duration } from "../duration";
+import { TimeOnly } from "../timeOnly";
 import type { Parsable } from "./parsable";
 import type { ParsableFactory } from "./parsableFactory";
 
diff --git a/packages/abstractions/src/serialization/serializationWriter.ts b/packages/abstractions/src/serialization/serializationWriter.ts
index a27991848..3be67dd80 100644
--- a/packages/abstractions/src/serialization/serializationWriter.ts
+++ b/packages/abstractions/src/serialization/serializationWriter.ts
@@ -1,7 +1,7 @@
-import type { Guid } from "guid-typescript";
-import type { DateOnly } from "../dateOnly";
-import type { Duration } from "../duration";
-import type { TimeOnly } from "../timeOnly";
+import { Guid } from "guid-typescript";
+import { DateOnly } from "../dateOnly";
+import { Duration } from "../duration";
+import { TimeOnly } from "../timeOnly";
 import type { Parsable } from "./parsable";
 import type { ModelSerializerFunction } from "./serializationFunctionTypes";
 
diff --git a/packages/abstractions/src/store/backingStoreParseNodeFactory.ts b/packages/abstractions/src/store/backingStoreParseNodeFactory.ts
index cba7bf8ca..98b03cedd 100644
--- a/packages/abstractions/src/store/backingStoreParseNodeFactory.ts
+++ b/packages/abstractions/src/store/backingStoreParseNodeFactory.ts
@@ -1,5 +1,4 @@
-import { ParseNodeProxyFactory } from "../serialization";
-import type { ParseNodeFactory } from "../serialization";
+import { type ParseNodeFactory, ParseNodeProxyFactory } from "../serialization";
 import type { BackedModel } from "./backedModel";
 
 /** Proxy implementation of ParseNodeFactory for the backing store that automatically sets the state of the backing store when deserializing. */
diff --git a/packages/abstractions/src/store/backingStoreSerializationWriterProxyFactory.ts b/packages/abstractions/src/store/backingStoreSerializationWriterProxyFactory.ts
index 3e0f2ba94..2d34c0050 100644
--- a/packages/abstractions/src/store/backingStoreSerializationWriterProxyFactory.ts
+++ b/packages/abstractions/src/store/backingStoreSerializationWriterProxyFactory.ts
@@ -1,5 +1,4 @@
-import { SerializationWriterProxyFactory } from "../serialization";
-import type { SerializationWriterFactory } from "../serialization";
+import { type SerializationWriterFactory, SerializationWriterProxyFactory } from "../serialization";
 import type { BackedModel } from "./backedModel";
 
 /**Proxy implementation of SerializationWriterFactory for the backing store that automatically sets the state of the backing store when serializing. */
diff --git a/packages/abstractions/test/common/requestInformation.ts b/packages/abstractions/test/common/requestInformation.ts
index f69c1544a..4098dc053 100644
--- a/packages/abstractions/test/common/requestInformation.ts
+++ b/packages/abstractions/test/common/requestInformation.ts
@@ -10,15 +10,13 @@ import { URL } from "url";
 
 const assert = chai.assert;
 
-import {
+import { 
   HttpMethod,
-  RequestInformation
-} from "../../src";
-import type { 
-  RequestAdapter,
-  Parsable,
-  SerializationWriter,
-  SerializationWriterFactory
+  type RequestAdapter,
+  RequestInformation,
+  type Parsable,
+  type SerializationWriter,
+  type SerializationWriterFactory
 } from "../../src";
 import { MultipartBody } from "../../src/multipartBody";
 
diff --git a/packages/authentication/azure/src/azureIdentityAccessTokenProvider.ts b/packages/authentication/azure/src/azureIdentityAccessTokenProvider.ts
index ccf894025..807095797 100644
--- a/packages/authentication/azure/src/azureIdentityAccessTokenProvider.ts
+++ b/packages/authentication/azure/src/azureIdentityAccessTokenProvider.ts
@@ -5,9 +5,7 @@ import {
 } from "@microsoft/kiota-abstractions";
 import type { AccessTokenProvider } from "@microsoft/kiota-abstractions";
 import { Span, trace } from "@opentelemetry/api";
-
-import { ObservabilityOptionsImpl } from "./observabilityOptions";
-import type { ObservabilityOptions } from "./observabilityOptions";
+import { type ObservabilityOptions, ObservabilityOptionsImpl } from "./observabilityOptions";
 
 /** Access token provider that leverages the Azure Identity library to retrieve an access token. */
 export class AzureIdentityAccessTokenProvider implements AccessTokenProvider {
diff --git a/packages/authentication/azure/src/azureIdentityAuthenticationProvider.ts b/packages/authentication/azure/src/azureIdentityAuthenticationProvider.ts
index 000a2c643..959cf66bc 100644
--- a/packages/authentication/azure/src/azureIdentityAuthenticationProvider.ts
+++ b/packages/authentication/azure/src/azureIdentityAuthenticationProvider.ts
@@ -1,9 +1,7 @@
 import { GetTokenOptions, TokenCredential } from "@azure/core-auth";
 import { BaseBearerTokenAuthenticationProvider } from "@microsoft/kiota-abstractions";
-
 import { AzureIdentityAccessTokenProvider } from "./azureIdentityAccessTokenProvider";
-import { ObservabilityOptionsImpl } from "./observabilityOptions";
-import type { ObservabilityOptions } from "./observabilityOptions";
+import { type ObservabilityOptions, ObservabilityOptionsImpl } from "./observabilityOptions";
 
 export class AzureIdentityAuthenticationProvider extends BaseBearerTokenAuthenticationProvider {
   /**
diff --git a/packages/authentication/spfx/src/azureAdSpfxAccessTokenProvider.ts b/packages/authentication/spfx/src/azureAdSpfxAccessTokenProvider.ts
index 9023ab9ee..52d2fb4f2 100644
--- a/packages/authentication/spfx/src/azureAdSpfxAccessTokenProvider.ts
+++ b/packages/authentication/spfx/src/azureAdSpfxAccessTokenProvider.ts
@@ -5,9 +5,7 @@ import {
 import type { AccessTokenProvider } from "@microsoft/kiota-abstractions";
 import { AadTokenProvider } from "@microsoft/sp-http";
 import { Span, trace } from "@opentelemetry/api";
-
-import { ObservabilityOptionsImpl } from "./observabilityOptions";
-import type { ObservabilityOptions } from "./observabilityOptions";
+import { type ObservabilityOptions, ObservabilityOptionsImpl } from "./observabilityOptions";
 
 export class AzureAdSpfxAccessTokenProvider implements AccessTokenProvider {
   private readonly allowedHostsValidator: AllowedHostsValidator;
diff --git a/packages/authentication/spfx/src/azureAdSpfxAuthenticationProvider.ts b/packages/authentication/spfx/src/azureAdSpfxAuthenticationProvider.ts
index 1ec8ce14f..cad4d4c6c 100644
--- a/packages/authentication/spfx/src/azureAdSpfxAuthenticationProvider.ts
+++ b/packages/authentication/spfx/src/azureAdSpfxAuthenticationProvider.ts
@@ -1,8 +1,7 @@
 import { BaseBearerTokenAuthenticationProvider } from "@microsoft/kiota-abstractions";
 import { AadTokenProvider } from "@microsoft/sp-http";
 import { AzureAdSpfxAccessTokenProvider } from "./azureAdSpfxAccessTokenProvider";
-import { ObservabilityOptionsImpl } from "./observabilityOptions";
-import type { ObservabilityOptions } from "./observabilityOptions";
+import { type ObservabilityOptions, ObservabilityOptionsImpl } from "./observabilityOptions";
 
 export class AzureAdSpfxAuthenticationProvider extends BaseBearerTokenAuthenticationProvider {
   /**
diff --git a/packages/http/fetch/src/fetchRequestAdapter.ts b/packages/http/fetch/src/fetchRequestAdapter.ts
index a3c414b65..b0413f6c2 100644
--- a/packages/http/fetch/src/fetchRequestAdapter.ts
+++ b/packages/http/fetch/src/fetchRequestAdapter.ts
@@ -1,11 +1,8 @@
-import { BackingStoreFactorySingleton, DateOnly, DefaultApiError, Duration, enableBackingStoreForParseNodeFactory, enableBackingStoreForSerializationWriterFactory, ParsableFactory, ParseNodeFactoryRegistry, RequestInformation, ResponseHandlerOption, ResponseHandlerOptionKey, SerializationWriterFactoryRegistry, TimeOnly } from "@microsoft/kiota-abstractions";
-import type { AuthenticationProvider, BackingStoreFactory, Parsable, ParseNode, ParseNodeFactory, SerializationWriterFactory } from "@microsoft/kiota-abstractions";
+import { type AuthenticationProvider, type BackingStoreFactory, BackingStoreFactorySingleton, DateOnly, DefaultApiError, Duration, enableBackingStoreForParseNodeFactory, enableBackingStoreForSerializationWriterFactory, type Parsable, type ParsableFactory, type ParseNode, type ParseNodeFactory, ParseNodeFactoryRegistry, RequestInformation, ResponseHandlerOption, ResponseHandlerOptionKey, type SerializationWriterFactory, SerializationWriterFactoryRegistry, TimeOnly } from "@microsoft/kiota-abstractions";
 import type { ApiError, RequestAdapter, ResponseHandler } from "@microsoft/kiota-abstractions";
-import { Span, SpanStatusCode, trace } from "@opentelemetry/api";
-
+import { type Span, SpanStatusCode, trace } from "@opentelemetry/api";
 import { HttpClient } from "./httpClient";
-import { ObservabilityOptionsImpl } from "./observabilityOptions";
-import type { ObservabilityOptions } from "./observabilityOptions";
+import { type ObservabilityOptions, ObservabilityOptionsImpl } from "./observabilityOptions";
 
 export class FetchRequestAdapter implements RequestAdapter {
 	/** The base url for every request. */
diff --git a/packages/http/fetch/src/httpClient.ts b/packages/http/fetch/src/httpClient.ts
index 134283b8e..a0e26d2c9 100644
--- a/packages/http/fetch/src/httpClient.ts
+++ b/packages/http/fetch/src/httpClient.ts
@@ -6,7 +6,6 @@
  */
 
 import type { RequestOption } from "@microsoft/kiota-abstractions";
-
 import { CustomFetchHandler } from "./middlewares/customFetchHandler";
 import type { Middleware } from "./middlewares/middleware";
 import { MiddlewareFactory } from "./middlewares/middlewareFactory";
diff --git a/packages/http/fetch/src/kiotaClientFactory.ts b/packages/http/fetch/src/kiotaClientFactory.ts
index 5ebcd4ba5..11a7c2373 100644
--- a/packages/http/fetch/src/kiotaClientFactory.ts
+++ b/packages/http/fetch/src/kiotaClientFactory.ts
@@ -1,5 +1,4 @@
 import type { Middleware } from "./middlewares/middleware";
-import { MiddlewareFactory } from "./middlewares/middlewareFactory";
 
 /**
  * Gets the default middlewares in use for the client.
diff --git a/packages/http/fetch/src/middlewares/chaosHandler.ts b/packages/http/fetch/src/middlewares/chaosHandler.ts
index d26f83293..e63a6c0f3 100644
--- a/packages/http/fetch/src/middlewares/chaosHandler.ts
+++ b/packages/http/fetch/src/middlewares/chaosHandler.ts
@@ -12,7 +12,6 @@
 import { HttpMethod } from "@microsoft/kiota-abstractions";
 import type { RequestOption } from "@microsoft/kiota-abstractions";
 import { Span, trace } from "@opentelemetry/api";
-
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
 import { FetchHeaders, FetchRequestInit } from "../utils/fetchDefinitions";
 import type { Middleware } from "./middleware";
diff --git a/packages/http/fetch/src/middlewares/headersInspectionHandler.ts b/packages/http/fetch/src/middlewares/headersInspectionHandler.ts
index ae6516827..ef98d4c41 100644
--- a/packages/http/fetch/src/middlewares/headersInspectionHandler.ts
+++ b/packages/http/fetch/src/middlewares/headersInspectionHandler.ts
@@ -5,9 +5,8 @@
  * -------------------------------------------------------------------------------------------
  */
 
-import { RequestOption } from "@microsoft/kiota-abstractions";
+import { type RequestOption } from "@microsoft/kiota-abstractions";
 import { trace } from "@opentelemetry/api";
-
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
 import type { Middleware } from "./middleware";
 import { HeadersInspectionOptions, HeadersInspectionOptionsKey } from "./options/headersInspectionOptions";
diff --git a/packages/http/fetch/src/middlewares/middlewareFactory.ts b/packages/http/fetch/src/middlewares/middlewareFactory.ts
index cdf5cea1e..6990a36e6 100644
--- a/packages/http/fetch/src/middlewares/middlewareFactory.ts
+++ b/packages/http/fetch/src/middlewares/middlewareFactory.ts
@@ -9,7 +9,6 @@
  * @module MiddlewareFactory
  */
 import fetch from "node-fetch";
-
 import { CustomFetchHandler } from "./customFetchHandler";
 import type { Middleware } from "./middleware";
 import { ParametersNameDecodingHandler } from "./parametersNameDecodingHandler";
diff --git a/packages/http/fetch/src/middlewares/options/headersInspectionOptions.ts b/packages/http/fetch/src/middlewares/options/headersInspectionOptions.ts
index 3099a94cd..19e53454c 100644
--- a/packages/http/fetch/src/middlewares/options/headersInspectionOptions.ts
+++ b/packages/http/fetch/src/middlewares/options/headersInspectionOptions.ts
@@ -1,5 +1,4 @@
-import type { RequestOption } from "@microsoft/kiota-abstractions";
-import { createRecordWithCaseInsensitiveKeys } from "@microsoft/kiota-abstractions";
+import { createRecordWithCaseInsensitiveKeys, type RequestOption } from "@microsoft/kiota-abstractions";
 export const HeadersInspectionOptionsKey = "HeadersInspectionOptionsKey";
 /**
  * @class
diff --git a/packages/http/fetch/src/middlewares/options/retryHandlerOptions.ts b/packages/http/fetch/src/middlewares/options/retryHandlerOptions.ts
index 9a83f6ffa..dd26b3c13 100644
--- a/packages/http/fetch/src/middlewares/options/retryHandlerOptions.ts
+++ b/packages/http/fetch/src/middlewares/options/retryHandlerOptions.ts
@@ -10,7 +10,6 @@
  */
 
 import type { RequestOption } from "@microsoft/kiota-abstractions";
-
 import { FetchResponse } from "../../utils/fetchDefinitions";
 
 /**
diff --git a/packages/http/fetch/src/middlewares/options/userAgentHandlerOptions.ts b/packages/http/fetch/src/middlewares/options/userAgentHandlerOptions.ts
index 358b9be8e..9925f69ea 100644
--- a/packages/http/fetch/src/middlewares/options/userAgentHandlerOptions.ts
+++ b/packages/http/fetch/src/middlewares/options/userAgentHandlerOptions.ts
@@ -6,9 +6,7 @@
  */
 
 import type { RequestOption } from "@microsoft/kiota-abstractions";
-
 import { libraryVersion } from "./version";
-
 export const UserAgentHandlerOptionsKey = "UserAgentHandlerOptionKey";
 
 export class UserAgentHandlerOptions implements RequestOption {
diff --git a/packages/http/fetch/src/middlewares/parametersNameDecodingHandler.ts b/packages/http/fetch/src/middlewares/parametersNameDecodingHandler.ts
index 1827fdc02..8d1f46444 100644
--- a/packages/http/fetch/src/middlewares/parametersNameDecodingHandler.ts
+++ b/packages/http/fetch/src/middlewares/parametersNameDecodingHandler.ts
@@ -7,7 +7,6 @@
 
 import type { RequestOption } from "@microsoft/kiota-abstractions";
 import { trace } from "@opentelemetry/api";
-
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
 import type { Middleware } from "./middleware";
 import { ParametersNameDecodingHandlerOptions, ParametersNameDecodingHandlerOptionsKey } from "./options/parametersNameDecodingOptions";
diff --git a/packages/http/fetch/src/middlewares/redirectHandler.ts b/packages/http/fetch/src/middlewares/redirectHandler.ts
index 470635d78..788170679 100644
--- a/packages/http/fetch/src/middlewares/redirectHandler.ts
+++ b/packages/http/fetch/src/middlewares/redirectHandler.ts
@@ -12,7 +12,6 @@
 import { HttpMethod } from "@microsoft/kiota-abstractions";
 import type { RequestOption } from "@microsoft/kiota-abstractions";
 import { trace } from "@opentelemetry/api";
-
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
 import { FetchRequestInit, FetchResponse } from "../utils/fetchDefinitions";
 import type { Middleware } from "./middleware";
diff --git a/packages/http/fetch/src/middlewares/retryHandler.ts b/packages/http/fetch/src/middlewares/retryHandler.ts
index daa7b1675..1b6c60d55 100644
--- a/packages/http/fetch/src/middlewares/retryHandler.ts
+++ b/packages/http/fetch/src/middlewares/retryHandler.ts
@@ -10,13 +10,12 @@
  */
 
 import { HttpMethod } from "@microsoft/kiota-abstractions";
-import type { RequestOption } from "@microsoft/kiota-abstractions";
+import { type RequestOption } from "@microsoft/kiota-abstractions";
 import { trace } from "@opentelemetry/api";
-
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
 import { FetchRequestInit, FetchResponse } from "../utils/fetchDefinitions";
 import { getRequestHeader, setRequestHeader } from "../utils/headersUtil";
-import type { Middleware } from "./middleware";
+import { type Middleware } from "./middleware";
 import { RetryHandlerOptionKey, RetryHandlerOptions } from "./options/retryHandlerOptions";
 
 /**
diff --git a/packages/http/fetch/src/middlewares/telemetryHandler.ts b/packages/http/fetch/src/middlewares/telemetryHandler.ts
index a2104f6f0..cc19fd8de 100644
--- a/packages/http/fetch/src/middlewares/telemetryHandler.ts
+++ b/packages/http/fetch/src/middlewares/telemetryHandler.ts
@@ -5,7 +5,6 @@
  * -------------------------------------------------------------------------------------------
  */
 import type { RequestOption } from "@microsoft/kiota-abstractions";
-
 import type { Middleware } from "./middleware";
 import type { TelemetryHandlerOptions } from "./options/telemetryHandlerOptions";
 
diff --git a/packages/http/fetch/src/middlewares/userAgentHandler.ts b/packages/http/fetch/src/middlewares/userAgentHandler.ts
index ca6e9a2fe..1fea9ffd8 100644
--- a/packages/http/fetch/src/middlewares/userAgentHandler.ts
+++ b/packages/http/fetch/src/middlewares/userAgentHandler.ts
@@ -11,7 +11,6 @@
 
 import type { RequestOption } from "@microsoft/kiota-abstractions";
 import { trace } from "@opentelemetry/api";
-
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
 import { FetchRequestInit } from "../utils/fetchDefinitions";
 import { appendRequestHeader, getRequestHeader } from "../utils/headersUtil";
diff --git a/packages/http/fetch/test/common/fetchRequestAdapter.ts b/packages/http/fetch/test/common/fetchRequestAdapter.ts
index 664a80b3e..391d652fe 100644
--- a/packages/http/fetch/test/common/fetchRequestAdapter.ts
+++ b/packages/http/fetch/test/common/fetchRequestAdapter.ts
@@ -5,10 +5,8 @@
  * -------------------------------------------------------------------------------------------
  */
 /* eslint-disable @typescript-eslint/no-unused-vars*/
-import { AnonymousAuthenticationProvider, HttpMethod, RequestInformation } from "@microsoft/kiota-abstractions";
-import type { RequestOption } from "@microsoft/kiota-abstractions";
+import { AnonymousAuthenticationProvider, HttpMethod, RequestInformation, type RequestOption } from "@microsoft/kiota-abstractions";
 import { assert } from "chai";
-
 import { FetchRequestAdapter } from "../../src/fetchRequestAdapter";
 import { HttpClient } from "../../src/httpClient";
 import { getResponse } from "../testUtils";
diff --git a/packages/http/fetch/test/common/middleware/testCallBackMiddleware.ts b/packages/http/fetch/test/common/middleware/testCallBackMiddleware.ts
index f2e593474..3c3a0ed90 100644
--- a/packages/http/fetch/test/common/middleware/testCallBackMiddleware.ts
+++ b/packages/http/fetch/test/common/middleware/testCallBackMiddleware.ts
@@ -1,5 +1,4 @@
 import type { RequestOption } from "@microsoft/kiota-abstractions";
-
 import type { Middleware } from "../../../src/middlewares/middleware";
 import { DummyFetchHandler } from "./dummyFetchHandler";
 import { getResponse } from "../../testUtils";
diff --git a/packages/http/fetch/test/common/mockParseNodeFactory.ts b/packages/http/fetch/test/common/mockParseNodeFactory.ts
index d857974dd..20022b3fd 100644
--- a/packages/http/fetch/test/common/mockParseNodeFactory.ts
+++ b/packages/http/fetch/test/common/mockParseNodeFactory.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { DateOnly, Duration, ParsableFactory, TimeOnly } from "@microsoft/kiota-abstractions";
-import type { Parsable, ParseNode, ParseNodeFactory } from "@microsoft/kiota-abstractions";
+import { DateOnly, Duration, type Parsable, type ParseNode, ParsableFactory, type ParseNodeFactory, TimeOnly } from "@microsoft/kiota-abstractions";
 import { Guid } from "guid-typescript";
 
 export class MockParseNodeFactory implements ParseNodeFactory {
diff --git a/packages/serialization/form/src/formParseNode.ts b/packages/serialization/form/src/formParseNode.ts
index 01b56760d..9ef5a479a 100644
--- a/packages/serialization/form/src/formParseNode.ts
+++ b/packages/serialization/form/src/formParseNode.ts
@@ -1,12 +1,13 @@
 import {
   DateOnly,
   Duration,
+  type Parsable,
+  type ParseNode,
   ParsableFactory,
   parseGuidString,
   TimeOnly,
   toFirstCharacterUpper,
 } from "@microsoft/kiota-abstractions";
-import type { Parsable, ParseNode } from "@microsoft/kiota-abstractions";
 
 export class FormParseNode implements ParseNode {
   private readonly _fields: Record<string, string> = {};
diff --git a/packages/serialization/form/src/formParseNodeFactory.ts b/packages/serialization/form/src/formParseNodeFactory.ts
index 92d3610be..43a1a4074 100644
--- a/packages/serialization/form/src/formParseNodeFactory.ts
+++ b/packages/serialization/form/src/formParseNodeFactory.ts
@@ -1,6 +1,5 @@
 import type { ParseNode, ParseNodeFactory} from "@microsoft/kiota-abstractions";
 import { TextDecoder } from "util";
-
 import { FormParseNode } from "./formParseNode";
 
 export class FormParseNodeFactory implements ParseNodeFactory {
diff --git a/packages/serialization/form/src/formSerializationWriter.ts b/packages/serialization/form/src/formSerializationWriter.ts
index db5a573d9..d73ad4498 100644
--- a/packages/serialization/form/src/formSerializationWriter.ts
+++ b/packages/serialization/form/src/formSerializationWriter.ts
@@ -3,9 +3,10 @@ import {
   DateOnly,
   Duration,
   ModelSerializerFunction,
+  type Parsable,
+  type SerializationWriter,
   TimeOnly,
 } from "@microsoft/kiota-abstractions";
-import type { Parsable, SerializationWriter } from "@microsoft/kiota-abstractions";
 import { Guid } from "guid-typescript";
 
 export class FormSerializationWriter implements SerializationWriter {
diff --git a/packages/serialization/form/test/testEntity.ts b/packages/serialization/form/test/testEntity.ts
index 554cafdc6..c3abbcd2f 100644
--- a/packages/serialization/form/test/testEntity.ts
+++ b/packages/serialization/form/test/testEntity.ts
@@ -1,14 +1,12 @@
 import {
+  type AdditionalDataHolder,
   DateOnly,
   Duration,
+  type Parsable,
+  type ParseNode,
+  type SerializationWriter,
   TimeOnly,
 } from "@microsoft/kiota-abstractions";
-import type { 
-  AdditionalDataHolder,
-  Parsable,
-  ParseNode,
-  SerializationWriter
-} from "@microsoft/kiota-abstractions";
 
 export interface TestEntity extends Parsable, AdditionalDataHolder {
   id?: string;
diff --git a/packages/serialization/json/src/jsonSerializationWriter.ts b/packages/serialization/json/src/jsonSerializationWriter.ts
index a9c91b8d0..fc7534ff3 100644
--- a/packages/serialization/json/src/jsonSerializationWriter.ts
+++ b/packages/serialization/json/src/jsonSerializationWriter.ts
@@ -3,11 +3,9 @@ import {
   DateOnly,
   Duration,
   ModelSerializerFunction,
+  type Parsable,
   TimeOnly,
-} from "@microsoft/kiota-abstractions";
-import type {
-  Parsable,
-  SerializationWriter
+  type SerializationWriter
 } from "@microsoft/kiota-abstractions";
 import { Guid } from "guid-typescript";
 
diff --git a/packages/serialization/multipart/src/multipartSerializationWriter.ts b/packages/serialization/multipart/src/multipartSerializationWriter.ts
index 9dc2db36a..723fab5c6 100644
--- a/packages/serialization/multipart/src/multipartSerializationWriter.ts
+++ b/packages/serialization/multipart/src/multipartSerializationWriter.ts
@@ -3,13 +3,11 @@ import {
   DateOnly,
   Duration,
   ModelSerializerFunction,
+  type Parsable,
   MultipartBody,
+  type SerializationWriter,
   TimeOnly,
 } from "@microsoft/kiota-abstractions";
-import type {
-  Parsable,
-  SerializationWriter
-} from "@microsoft/kiota-abstractions";
 import { Guid } from "guid-typescript";
 
 /** Serialization writer for multipart/form-data */
diff --git a/packages/serialization/text/src/textParseNode.ts b/packages/serialization/text/src/textParseNode.ts
index d5eece3b6..e0e248cf3 100644
--- a/packages/serialization/text/src/textParseNode.ts
+++ b/packages/serialization/text/src/textParseNode.ts
@@ -1,12 +1,13 @@
 import {
   DateOnly,
   Duration,
+  type Parsable,
   ParsableFactory,
+  type ParseNode,
   parseGuidString,
   TimeOnly,
   toFirstCharacterUpper,
 } from "@microsoft/kiota-abstractions";
-import type { Parsable, ParseNode } from "@microsoft/kiota-abstractions";
 
 export class TextParseNode implements ParseNode {
   private static noStructuredDataMessage =
diff --git a/packages/serialization/text/src/textSerializationWriter.ts b/packages/serialization/text/src/textSerializationWriter.ts
index 325e9b37e..e6baf503a 100644
--- a/packages/serialization/text/src/textSerializationWriter.ts
+++ b/packages/serialization/text/src/textSerializationWriter.ts
@@ -3,9 +3,10 @@ import {
   DateOnly,
   Duration,
   ModelSerializerFunction,
+  type Parsable,
+  type SerializationWriter,
   TimeOnly,
 } from "@microsoft/kiota-abstractions";
-import type { Parsable, SerializationWriter } from "@microsoft/kiota-abstractions";
 import { Guid } from "guid-typescript";
 
 export class TextSerializationWriter implements SerializationWriter {
diff --git a/packages/test/.eslintrc.js b/packages/test/.eslintrc.js
index b0204e88c..27b92b075 100644
--- a/packages/test/.eslintrc.js
+++ b/packages/test/.eslintrc.js
@@ -30,7 +30,7 @@ module.exports = {
         "@typescript-eslint"
     ],
     "rules": {
-        "@typescript-eslint/consistent-type-imports": "error",
+        "@typescript-eslint/consistent-type-imports": "warn",
         "no-unused-vars": "warn",
         "@typescript-eslint/no-unused-vars": "warn",
         "no-extra-semi" : "warn"

From 2be61a13db828e63e42b937b97a175f211ae7fe7 Mon Sep 17 00:00:00 2001
From: koros <korosmatick@gmail.com>
Date: Wed, 30 Aug 2023 13:26:09 +0300
Subject: [PATCH 05/11] fix import statements

---
 .../azure/src/azureIdentityAccessTokenProvider.ts      |  4 ++--
 .../spfx/src/azureAdSpfxAccessTokenProvider.ts         |  2 +-
 packages/http/fetch/src/fetchRequestAdapter.ts         |  3 +--
 packages/http/fetch/src/middlewares/chaosHandler.ts    |  5 ++---
 packages/http/fetch/src/middlewares/redirectHandler.ts |  3 +--
 packages/serialization/json/src/jsonParseNode.ts       |  3 ++-
 .../json/test/common/jsonSerializationWriter.ts        |  4 +---
 packages/serialization/multipart/test/testEntity.ts    | 10 ++++------
 8 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/packages/authentication/azure/src/azureIdentityAccessTokenProvider.ts b/packages/authentication/azure/src/azureIdentityAccessTokenProvider.ts
index 807095797..a25212bdc 100644
--- a/packages/authentication/azure/src/azureIdentityAccessTokenProvider.ts
+++ b/packages/authentication/azure/src/azureIdentityAccessTokenProvider.ts
@@ -1,10 +1,10 @@
 import { GetTokenOptions, TokenCredential } from "@azure/core-auth";
 import {
+  type AccessTokenProvider,
   AllowedHostsValidator,
   validateProtocol,
 } from "@microsoft/kiota-abstractions";
-import type { AccessTokenProvider } from "@microsoft/kiota-abstractions";
-import { Span, trace } from "@opentelemetry/api";
+import { type Span, trace } from "@opentelemetry/api";
 import { type ObservabilityOptions, ObservabilityOptionsImpl } from "./observabilityOptions";
 
 /** Access token provider that leverages the Azure Identity library to retrieve an access token. */
diff --git a/packages/authentication/spfx/src/azureAdSpfxAccessTokenProvider.ts b/packages/authentication/spfx/src/azureAdSpfxAccessTokenProvider.ts
index 52d2fb4f2..5e2488607 100644
--- a/packages/authentication/spfx/src/azureAdSpfxAccessTokenProvider.ts
+++ b/packages/authentication/spfx/src/azureAdSpfxAccessTokenProvider.ts
@@ -1,8 +1,8 @@
 import {
+  type AccessTokenProvider,
   AllowedHostsValidator,
   validateProtocol,
 } from "@microsoft/kiota-abstractions";
-import type { AccessTokenProvider } from "@microsoft/kiota-abstractions";
 import { AadTokenProvider } from "@microsoft/sp-http";
 import { Span, trace } from "@opentelemetry/api";
 import { type ObservabilityOptions, ObservabilityOptionsImpl } from "./observabilityOptions";
diff --git a/packages/http/fetch/src/fetchRequestAdapter.ts b/packages/http/fetch/src/fetchRequestAdapter.ts
index b0413f6c2..101e8a049 100644
--- a/packages/http/fetch/src/fetchRequestAdapter.ts
+++ b/packages/http/fetch/src/fetchRequestAdapter.ts
@@ -1,5 +1,4 @@
-import { type AuthenticationProvider, type BackingStoreFactory, BackingStoreFactorySingleton, DateOnly, DefaultApiError, Duration, enableBackingStoreForParseNodeFactory, enableBackingStoreForSerializationWriterFactory, type Parsable, type ParsableFactory, type ParseNode, type ParseNodeFactory, ParseNodeFactoryRegistry, RequestInformation, ResponseHandlerOption, ResponseHandlerOptionKey, type SerializationWriterFactory, SerializationWriterFactoryRegistry, TimeOnly } from "@microsoft/kiota-abstractions";
-import type { ApiError, RequestAdapter, ResponseHandler } from "@microsoft/kiota-abstractions";
+import { type ApiError, type AuthenticationProvider, type BackingStoreFactory, BackingStoreFactorySingleton, DateOnly, DefaultApiError, Duration, enableBackingStoreForParseNodeFactory, enableBackingStoreForSerializationWriterFactory, type Parsable, type ParsableFactory, type ParseNode, type ParseNodeFactory, ParseNodeFactoryRegistry, type RequestAdapter, RequestInformation, type ResponseHandler, ResponseHandlerOption, ResponseHandlerOptionKey, type SerializationWriterFactory, SerializationWriterFactoryRegistry, TimeOnly } from "@microsoft/kiota-abstractions";
 import { type Span, SpanStatusCode, trace } from "@opentelemetry/api";
 import { HttpClient } from "./httpClient";
 import { type ObservabilityOptions, ObservabilityOptionsImpl } from "./observabilityOptions";
diff --git a/packages/http/fetch/src/middlewares/chaosHandler.ts b/packages/http/fetch/src/middlewares/chaosHandler.ts
index e63a6c0f3..51c81f200 100644
--- a/packages/http/fetch/src/middlewares/chaosHandler.ts
+++ b/packages/http/fetch/src/middlewares/chaosHandler.ts
@@ -9,9 +9,8 @@
  * @module ChaosHandler
  */
 
-import { HttpMethod } from "@microsoft/kiota-abstractions";
-import type { RequestOption } from "@microsoft/kiota-abstractions";
-import { Span, trace } from "@opentelemetry/api";
+import { HttpMethod, type RequestOption } from "@microsoft/kiota-abstractions";
+import { type Span, trace } from "@opentelemetry/api";
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
 import { FetchHeaders, FetchRequestInit } from "../utils/fetchDefinitions";
 import type { Middleware } from "./middleware";
diff --git a/packages/http/fetch/src/middlewares/redirectHandler.ts b/packages/http/fetch/src/middlewares/redirectHandler.ts
index 788170679..1cdff7e7e 100644
--- a/packages/http/fetch/src/middlewares/redirectHandler.ts
+++ b/packages/http/fetch/src/middlewares/redirectHandler.ts
@@ -9,8 +9,7 @@
  * @module RedirectHandler
  */
 
-import { HttpMethod } from "@microsoft/kiota-abstractions";
-import type { RequestOption } from "@microsoft/kiota-abstractions";
+import { HttpMethod, type RequestOption } from "@microsoft/kiota-abstractions";
 import { trace } from "@opentelemetry/api";
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
 import { FetchRequestInit, FetchResponse } from "../utils/fetchDefinitions";
diff --git a/packages/serialization/json/src/jsonParseNode.ts b/packages/serialization/json/src/jsonParseNode.ts
index 31c62bbed..2f8556e3b 100644
--- a/packages/serialization/json/src/jsonParseNode.ts
+++ b/packages/serialization/json/src/jsonParseNode.ts
@@ -1,12 +1,13 @@
 import {
   DateOnly,
   Duration,
+  type Parsable,
   ParsableFactory,
+  type ParseNode,
   parseGuidString,
   TimeOnly,
   toFirstCharacterUpper,
 } from "@microsoft/kiota-abstractions";
-import type { Parsable, ParseNode } from "@microsoft/kiota-abstractions";
 
 export class JsonParseNode implements ParseNode {
   /**
diff --git a/packages/serialization/json/test/common/jsonSerializationWriter.ts b/packages/serialization/json/test/common/jsonSerializationWriter.ts
index 5270c2ae9..a4d32c02c 100644
--- a/packages/serialization/json/test/common/jsonSerializationWriter.ts
+++ b/packages/serialization/json/test/common/jsonSerializationWriter.ts
@@ -4,9 +4,7 @@ import { JsonParseNode, JsonSerializationWriter } from "../../src/index";
 import {
   createTestParserFromDiscriminatorValue,
   serializeTestParser,
-} from "./testEntity";
-import type {
-  TestParser
+  type TestParser
 } from "./testEntity";
 
 describe("JsonParseNode", () => {
diff --git a/packages/serialization/multipart/test/testEntity.ts b/packages/serialization/multipart/test/testEntity.ts
index 554cafdc6..c3abbcd2f 100644
--- a/packages/serialization/multipart/test/testEntity.ts
+++ b/packages/serialization/multipart/test/testEntity.ts
@@ -1,14 +1,12 @@
 import {
+  type AdditionalDataHolder,
   DateOnly,
   Duration,
+  type Parsable,
+  type ParseNode,
+  type SerializationWriter,
   TimeOnly,
 } from "@microsoft/kiota-abstractions";
-import type { 
-  AdditionalDataHolder,
-  Parsable,
-  ParseNode,
-  SerializationWriter
-} from "@microsoft/kiota-abstractions";
 
 export interface TestEntity extends Parsable, AdditionalDataHolder {
   id?: string;

From 6110c499ce2ecffaf043fd367038ded3d8765482 Mon Sep 17 00:00:00 2001
From: koros <korosmatick@gmail.com>
Date: Wed, 6 Sep 2023 15:35:05 +0300
Subject: [PATCH 06/11] fix lint import type errors in the abstraction library

---
 .eslintignore                                 |  6 ++++
 .eslintrc.js                                  | 35 +++++++++++++++++++
 package.json                                  |  4 ++-
 packages/abstractions/.eslintrc.json          |  2 +-
 .../src/authentication/accessTokenProvider.ts |  2 +-
 .../anonymousAuthenticationProvider.ts        |  4 +--
 .../apiKeyAuthenticationProvider.ts           |  2 +-
 .../authentication/authenticationProvider.ts  |  2 +-
 .../baseBearerTokenAuthenticationProvider.ts  |  2 +-
 packages/abstractions/src/requestAdapter.ts   |  4 +--
 .../abstractions/src/requestInformation.ts    |  2 +-
 .../src/serialization/parseNode.ts            |  8 ++---
 .../src/serialization/serializationWriter.ts  |  8 ++---
 packages/test/.eslintignore                   |  2 +-
 packages/test/.eslintrc.js                    |  2 +-
 packages/test/tests/getTest.ts                |  2 +-
 packages/test/tests/postTest.ts               |  2 +-
 17 files changed, 66 insertions(+), 23 deletions(-)
 create mode 100644 .eslintignore
 create mode 100644 .eslintrc.js

diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 000000000..1f80e8eea
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,6 @@
+*.js
+*.js.map
+*.d.ts
+
+node_modules
+dist
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 000000000..517dcd695
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,35 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "es2021": true,
+        "node": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended"
+    ],
+    "overrides": [
+        {
+            "env": {
+                "node": true
+            },
+            "files": [
+                ".eslintrc.{js,cjs}"
+            ],
+            "parserOptions": {
+                "sourceType": "script"
+            }
+        }
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "plugins": [
+        "@typescript-eslint"
+    ],
+    "rules": {
+        "@typescript-eslint/consistent-type-imports": "error"
+    }
+}
diff --git a/package.json b/package.json
index c0025da31..00af7ace1 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,8 @@
     "build:sdk:cjs": "tsc -b packages/test/tsconfig.sdk.cjs.json",
     "build:watch:es": "tsc -b packages/test/tsconfig.es.json -w",
     "test": "lerna run test --parallel",
-    "tsc:version": "tsc --version"
+    "tsc:version": "tsc --version",
+    "lint": "eslint . --ext .ts",
+    "lint:fix": "eslint . --ext .ts --fix"
   }
 }
diff --git a/packages/abstractions/.eslintrc.json b/packages/abstractions/.eslintrc.json
index 48436fc8a..80ab9b397 100644
--- a/packages/abstractions/.eslintrc.json
+++ b/packages/abstractions/.eslintrc.json
@@ -18,7 +18,7 @@
         "@typescript-eslint/no-unused-vars": "error",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/explicit-module-boundary-types": "off",
-        "@typescript-eslint/consistent-type-imports": "warn",
+        "@typescript-eslint/consistent-type-imports": "error",
         "prettier/prettier": [
             "error",
             {
diff --git a/packages/abstractions/src/authentication/accessTokenProvider.ts b/packages/abstractions/src/authentication/accessTokenProvider.ts
index 8ac83b2b1..50ec0ebb2 100644
--- a/packages/abstractions/src/authentication/accessTokenProvider.ts
+++ b/packages/abstractions/src/authentication/accessTokenProvider.ts
@@ -1,4 +1,4 @@
-import { AllowedHostsValidator } from "./allowedHostsValidator";
+import { type AllowedHostsValidator } from "./allowedHostsValidator";
 
 /**
  * @interface
diff --git a/packages/abstractions/src/authentication/anonymousAuthenticationProvider.ts b/packages/abstractions/src/authentication/anonymousAuthenticationProvider.ts
index 5c2026f83..ebff44f7c 100644
--- a/packages/abstractions/src/authentication/anonymousAuthenticationProvider.ts
+++ b/packages/abstractions/src/authentication/anonymousAuthenticationProvider.ts
@@ -1,5 +1,5 @@
-import { RequestInformation } from "../requestInformation";
-import type { AuthenticationProvider } from "./authenticationProvider";
+import { type RequestInformation } from "../requestInformation";
+import { type AuthenticationProvider } from "./authenticationProvider";
 
 /** This authentication provider does not perform any authentication.   */
 export class AnonymousAuthenticationProvider implements AuthenticationProvider {
diff --git a/packages/abstractions/src/authentication/apiKeyAuthenticationProvider.ts b/packages/abstractions/src/authentication/apiKeyAuthenticationProvider.ts
index dca8e455b..87817a721 100644
--- a/packages/abstractions/src/authentication/apiKeyAuthenticationProvider.ts
+++ b/packages/abstractions/src/authentication/apiKeyAuthenticationProvider.ts
@@ -1,4 +1,4 @@
-import { RequestInformation } from "../requestInformation";
+import { type RequestInformation } from "../requestInformation";
 import { AllowedHostsValidator } from "./allowedHostsValidator";
 import type { AuthenticationProvider } from "./authenticationProvider";
 import { validateProtocol } from "./validateProtocol";
diff --git a/packages/abstractions/src/authentication/authenticationProvider.ts b/packages/abstractions/src/authentication/authenticationProvider.ts
index d671283d3..f2c16b553 100644
--- a/packages/abstractions/src/authentication/authenticationProvider.ts
+++ b/packages/abstractions/src/authentication/authenticationProvider.ts
@@ -1,4 +1,4 @@
-import { RequestInformation } from "../requestInformation";
+import { type RequestInformation } from "../requestInformation";
 
 /**
  * @interface
diff --git a/packages/abstractions/src/authentication/baseBearerTokenAuthenticationProvider.ts b/packages/abstractions/src/authentication/baseBearerTokenAuthenticationProvider.ts
index 48114ede0..d92e39bc2 100644
--- a/packages/abstractions/src/authentication/baseBearerTokenAuthenticationProvider.ts
+++ b/packages/abstractions/src/authentication/baseBearerTokenAuthenticationProvider.ts
@@ -1,4 +1,4 @@
-import { RequestInformation } from "../requestInformation";
+import { type RequestInformation } from "../requestInformation";
 import type { AccessTokenProvider } from "./accessTokenProvider";
 import type { AuthenticationProvider } from "./authenticationProvider";
 
diff --git a/packages/abstractions/src/requestAdapter.ts b/packages/abstractions/src/requestAdapter.ts
index e34212207..46af47b13 100644
--- a/packages/abstractions/src/requestAdapter.ts
+++ b/packages/abstractions/src/requestAdapter.ts
@@ -1,6 +1,6 @@
-import { RequestInformation } from "./requestInformation";
+import { type RequestInformation } from "./requestInformation";
 import type { Parsable, ParsableFactory, SerializationWriterFactory } from "./serialization";
-import type { BackingStoreFactory } from "./store";
+import { type BackingStoreFactory } from "./store";
 
 /** Service responsible for translating abstract Request Info into concrete native HTTP requests. */
 export interface RequestAdapter {
diff --git a/packages/abstractions/src/requestInformation.ts b/packages/abstractions/src/requestInformation.ts
index 9ffb44068..263f5c8eb 100644
--- a/packages/abstractions/src/requestInformation.ts
+++ b/packages/abstractions/src/requestInformation.ts
@@ -3,7 +3,7 @@ import * as Template from "uri-template-lite";
 
 import { DateOnly } from "./dateOnly";
 import { Duration } from "./duration";
-import { HttpMethod } from "./httpMethod";
+import { type HttpMethod } from "./httpMethod";
 import { MultipartBody } from "./multipartBody";
 import { createRecordWithCaseInsensitiveKeys } from "./recordWithCaseInsensitiveKeys";
 import type { RequestAdapter } from "./requestAdapter";
diff --git a/packages/abstractions/src/serialization/parseNode.ts b/packages/abstractions/src/serialization/parseNode.ts
index fe1a8a459..916909948 100644
--- a/packages/abstractions/src/serialization/parseNode.ts
+++ b/packages/abstractions/src/serialization/parseNode.ts
@@ -1,7 +1,7 @@
-import { Guid } from "guid-typescript";
-import { DateOnly } from "../dateOnly";
-import { Duration } from "../duration";
-import { TimeOnly } from "../timeOnly";
+import type { Guid } from "guid-typescript";
+import type { DateOnly } from "../dateOnly";
+import type { Duration } from "../duration";
+import type { TimeOnly } from "../timeOnly";
 import type { Parsable } from "./parsable";
 import type { ParsableFactory } from "./parsableFactory";
 
diff --git a/packages/abstractions/src/serialization/serializationWriter.ts b/packages/abstractions/src/serialization/serializationWriter.ts
index 3be67dd80..a27991848 100644
--- a/packages/abstractions/src/serialization/serializationWriter.ts
+++ b/packages/abstractions/src/serialization/serializationWriter.ts
@@ -1,7 +1,7 @@
-import { Guid } from "guid-typescript";
-import { DateOnly } from "../dateOnly";
-import { Duration } from "../duration";
-import { TimeOnly } from "../timeOnly";
+import type { Guid } from "guid-typescript";
+import type { DateOnly } from "../dateOnly";
+import type { Duration } from "../duration";
+import type { TimeOnly } from "../timeOnly";
 import type { Parsable } from "./parsable";
 import type { ModelSerializerFunction } from "./serializationFunctionTypes";
 
diff --git a/packages/test/.eslintignore b/packages/test/.eslintignore
index 9ec10207b..1f80e8eea 100644
--- a/packages/test/.eslintignore
+++ b/packages/test/.eslintignore
@@ -3,4 +3,4 @@
 *.d.ts
 
 node_modules
-dist
\ No newline at end of file
+dist
diff --git a/packages/test/.eslintrc.js b/packages/test/.eslintrc.js
index 27b92b075..b0204e88c 100644
--- a/packages/test/.eslintrc.js
+++ b/packages/test/.eslintrc.js
@@ -30,7 +30,7 @@ module.exports = {
         "@typescript-eslint"
     ],
     "rules": {
-        "@typescript-eslint/consistent-type-imports": "warn",
+        "@typescript-eslint/consistent-type-imports": "error",
         "no-unused-vars": "warn",
         "@typescript-eslint/no-unused-vars": "warn",
         "no-extra-semi" : "warn"
diff --git a/packages/test/tests/getTest.ts b/packages/test/tests/getTest.ts
index 2afc11f49..dab6ab549 100644
--- a/packages/test/tests/getTest.ts
+++ b/packages/test/tests/getTest.ts
@@ -1,7 +1,7 @@
 import { apiClient } from "./testClient";
 
 import { assert } from "chai";
-import { MessagesRequestBuilderGetQueryParameters } from "../generatedCode/users/item/messages/messagesRequestBuilderGetQueryParameters";
+import { type MessagesRequestBuilderGetQueryParameters } from "../generatedCode/users/item/messages/messagesRequestBuilderGetQueryParameters";
 
 describe("TestGet", () => {
 
diff --git a/packages/test/tests/postTest.ts b/packages/test/tests/postTest.ts
index 2e2cbe5be..eb8ced19f 100644
--- a/packages/test/tests/postTest.ts
+++ b/packages/test/tests/postTest.ts
@@ -1,7 +1,7 @@
 import { apiClient } from "./testClient";
 
 import { assert } from "chai";
-import { Message } from "../generatedCode/models";
+import { type Message } from "../generatedCode/models";
 
 describe("TestPost", () => {
 

From c689f623305d8a52e74fbba3464dd0dabf739586 Mon Sep 17 00:00:00 2001
From: koros <korosmatick@gmail.com>
Date: Fri, 6 Oct 2023 19:16:02 +0300
Subject: [PATCH 07/11] fix lint errors

---
 .../src/authentication/validateProtocol.ts    |  6 ++--
 packages/abstractions/src/multipartBody.ts    |  1 +
 .../src/serialization/parseNode.ts            |  1 +
 .../src/serialization/serializationWriter.ts  |  1 +
 .../abstractions/test/common/guidUtils.ts     |  5 +--
 .../recordWithCaseInsensitiveKeysTest.ts      |  1 +
 .../test/common/requestInformation.ts         |  4 +--
 .../abstractions/test/common/stringUtils.ts   |  1 +
 .../src/azureIdentityAccessTokenProvider.ts   |  3 +-
 .../azureIdentityAuthenticationProvider.ts    |  3 +-
 .../test/azureIdentityAuthenticationTest.ts   |  2 +-
 .../src/azureAdSpfxAccessTokenProvider.ts     |  5 +--
 .../src/azureAdSpfxAuthenticationProvider.ts  |  3 +-
 .../test/azureAdSpfxAuthenticationTest.ts     | 32 +++++++++----------
 .../http/fetch/src/fetchRequestAdapter.ts     |  3 +-
 packages/http/fetch/src/httpClient.ts         |  1 +
 .../fetch/src/middlewares/chaosHandler.ts     |  5 +--
 .../middlewares/headersInspectionHandler.ts   |  1 +
 .../src/middlewares/middlewareFactory.ts      |  3 +-
 .../options/chaosHandlerOptions.ts            |  4 +--
 .../options/headersInspectionOptions.ts       |  2 +-
 .../options/parametersNameDecodingOptions.ts  |  2 +-
 .../options/retryHandlerOptions.ts            |  3 +-
 .../options/userAgentHandlerOptions.ts        |  3 +-
 .../parametersNameDecodingHandler.ts          |  1 +
 .../fetch/src/middlewares/redirectHandler.ts  |  3 +-
 .../fetch/src/middlewares/retryHandler.ts     |  6 ++--
 .../fetch/src/middlewares/telemetryHandler.ts |  1 +
 .../fetch/src/middlewares/userAgentHandler.ts |  3 +-
 packages/http/fetch/src/utils/headersUtil.ts  |  2 +-
 .../http/fetch/test/common/ChaosHandler.ts    |  2 +-
 .../fetch/test/common/fetchRequestAdapter.ts  |  1 +
 .../common/middleware/dummyFetchHandler.ts    |  1 +
 .../test/common/middleware/headersUtil.ts     |  2 +-
 .../test/common/middleware/retryHandler.ts    |  4 +--
 .../common/middleware/retryHandlerOptions.ts  |  2 +-
 .../middleware/testCallBackMiddleware.ts      |  3 +-
 .../fetch/test/common/mockParseNodeFactory.ts |  4 +--
 .../form/src/browser/formParseNodeFactory.ts  |  1 +
 .../serialization/form/src/formParseNode.ts   |  4 +--
 .../form/src/formParseNodeFactory.ts          |  1 +
 .../form/src/formSerializationWriter.ts       |  4 +--
 .../form/test/common/formParseNode.ts         |  3 +-
 .../test/common/formSerializationWriter.ts    |  5 ++-
 .../serialization/form/test/testEntity.ts     | 10 +++---
 .../json/src/browser/jsonParseNodeFactory.ts  |  1 +
 .../serialization/json/src/jsonParseNode.ts   |  4 +--
 .../json/src/jsonSerializationWriter.ts       |  9 +++---
 .../json/test/common/JsonParseNode.ts         |  3 +-
 .../test/common/jsonSerializationWriter.ts    |  9 ++----
 .../json/test/common/testEntity.ts            |  2 +-
 .../src/multipartSerializationWriter.ts       | 13 ++++----
 .../common/multipartSerializationWriter.ts    |  5 ++-
 .../multipart/test/testEntity.ts              | 10 +++---
 .../text/src/browser/textParseNodeFactory.ts  |  1 +
 .../serialization/text/src/textParseNode.ts   |  5 +--
 .../text/src/textSerializationWriter.ts       |  8 ++---
 .../text/test/common/textParseNode.ts         |  3 +-
 58 files changed, 126 insertions(+), 105 deletions(-)

diff --git a/packages/abstractions/src/authentication/validateProtocol.ts b/packages/abstractions/src/authentication/validateProtocol.ts
index 67c763a04..8b07fb439 100644
--- a/packages/abstractions/src/authentication/validateProtocol.ts
+++ b/packages/abstractions/src/authentication/validateProtocol.ts
@@ -1,9 +1,9 @@
 export function validateProtocol(url: string): void {
-    if(!url.toLocaleLowerCase().startsWith('https://') && !windowUrlStartsWithHttps()) {
-        throw new Error('Authentication scheme can only be used with https requests');
+    if(!url.toLocaleLowerCase().startsWith("https://") && !windowUrlStartsWithHttps()) {
+        throw new Error("Authentication scheme can only be used with https requests");
     }
 }
 function windowUrlStartsWithHttps(): boolean {
     // @ts-ignore
-    return typeof window !== 'undefined' && typeof window.location !== 'undefined' && (window.location.protocol as string).toLowerCase() !== 'https:';
+    return typeof window !== "undefined" && typeof window.location !== "undefined" && (window.location.protocol as string).toLowerCase() !== "https:";
 }
diff --git a/packages/abstractions/src/multipartBody.ts b/packages/abstractions/src/multipartBody.ts
index ae2ef2303..d5a2d6679 100644
--- a/packages/abstractions/src/multipartBody.ts
+++ b/packages/abstractions/src/multipartBody.ts
@@ -1,4 +1,5 @@
 import { Guid } from "guid-typescript";
+
 import type { RequestAdapter } from "./requestAdapter";
 import type { ModelSerializerFunction, Parsable, ParseNode, SerializationWriter } from "./serialization";
 /**
diff --git a/packages/abstractions/src/serialization/parseNode.ts b/packages/abstractions/src/serialization/parseNode.ts
index 916909948..6098d09eb 100644
--- a/packages/abstractions/src/serialization/parseNode.ts
+++ b/packages/abstractions/src/serialization/parseNode.ts
@@ -1,4 +1,5 @@
 import type { Guid } from "guid-typescript";
+
 import type { DateOnly } from "../dateOnly";
 import type { Duration } from "../duration";
 import type { TimeOnly } from "../timeOnly";
diff --git a/packages/abstractions/src/serialization/serializationWriter.ts b/packages/abstractions/src/serialization/serializationWriter.ts
index a27991848..92951bcbc 100644
--- a/packages/abstractions/src/serialization/serializationWriter.ts
+++ b/packages/abstractions/src/serialization/serializationWriter.ts
@@ -1,4 +1,5 @@
 import type { Guid } from "guid-typescript";
+
 import type { DateOnly } from "../dateOnly";
 import type { Duration } from "../duration";
 import type { TimeOnly } from "../timeOnly";
diff --git a/packages/abstractions/test/common/guidUtils.ts b/packages/abstractions/test/common/guidUtils.ts
index 5803109cc..6ae3a7771 100644
--- a/packages/abstractions/test/common/guidUtils.ts
+++ b/packages/abstractions/test/common/guidUtils.ts
@@ -1,11 +1,12 @@
 import { assert } from "chai";
+import { v1 as uuidv1, v4 as uuidv4, v5 as uuidv5} from "uuid";
+
 import { parseGuidString } from "../../src/utils/guidUtils";
-import { v1 as uuidv1, v4 as uuidv4, v5 as uuidv5} from 'uuid';
 
 
 describe("ParseGuidString", () => {
   it("parses a guid string", () => {
-    var result = parseGuidString("");
+    let result = parseGuidString("");
     assert.isUndefined(result);
 
     result = parseGuidString(undefined);
diff --git a/packages/abstractions/test/common/recordWithCaseInsensitiveKeysTest.ts b/packages/abstractions/test/common/recordWithCaseInsensitiveKeysTest.ts
index a980ca994..321e30aa2 100644
--- a/packages/abstractions/test/common/recordWithCaseInsensitiveKeysTest.ts
+++ b/packages/abstractions/test/common/recordWithCaseInsensitiveKeysTest.ts
@@ -1,4 +1,5 @@
 import { assert } from "chai";
+
 import { createRecordWithCaseInsensitiveKeys } from "../../src/recordWithCaseInsensitiveKeys";
 
 describe("RecordWithCaseInsensitiveKeys", () => {
diff --git a/packages/abstractions/test/common/requestInformation.ts b/packages/abstractions/test/common/requestInformation.ts
index 04e630e44..6dc5415ad 100644
--- a/packages/abstractions/test/common/requestInformation.ts
+++ b/packages/abstractions/test/common/requestInformation.ts
@@ -10,11 +10,11 @@ import { URL } from "url";
 
 const assert = chai.assert;
 
-import { 
+import {
   HttpMethod,
+  type Parsable,
   type RequestAdapter,
   RequestInformation,
-  type Parsable,
   type SerializationWriter,
   type SerializationWriterFactory
 } from "../../src";
diff --git a/packages/abstractions/test/common/stringUtils.ts b/packages/abstractions/test/common/stringUtils.ts
index 95692df8c..1395422d5 100644
--- a/packages/abstractions/test/common/stringUtils.ts
+++ b/packages/abstractions/test/common/stringUtils.ts
@@ -1,4 +1,5 @@
 import { assert } from "chai";
+
 import { toFirstCharacterUpper } from "../../src/utils";
 
 
diff --git a/packages/authentication/azure/src/azureIdentityAccessTokenProvider.ts b/packages/authentication/azure/src/azureIdentityAccessTokenProvider.ts
index a25212bdc..e38533980 100644
--- a/packages/authentication/azure/src/azureIdentityAccessTokenProvider.ts
+++ b/packages/authentication/azure/src/azureIdentityAccessTokenProvider.ts
@@ -1,10 +1,11 @@
-import { GetTokenOptions, TokenCredential } from "@azure/core-auth";
+import type { GetTokenOptions, TokenCredential } from "@azure/core-auth";
 import {
   type AccessTokenProvider,
   AllowedHostsValidator,
   validateProtocol,
 } from "@microsoft/kiota-abstractions";
 import { type Span, trace } from "@opentelemetry/api";
+
 import { type ObservabilityOptions, ObservabilityOptionsImpl } from "./observabilityOptions";
 
 /** Access token provider that leverages the Azure Identity library to retrieve an access token. */
diff --git a/packages/authentication/azure/src/azureIdentityAuthenticationProvider.ts b/packages/authentication/azure/src/azureIdentityAuthenticationProvider.ts
index 959cf66bc..fd63b0b94 100644
--- a/packages/authentication/azure/src/azureIdentityAuthenticationProvider.ts
+++ b/packages/authentication/azure/src/azureIdentityAuthenticationProvider.ts
@@ -1,5 +1,6 @@
-import { GetTokenOptions, TokenCredential } from "@azure/core-auth";
+import type { GetTokenOptions, TokenCredential } from "@azure/core-auth";
 import { BaseBearerTokenAuthenticationProvider } from "@microsoft/kiota-abstractions";
+
 import { AzureIdentityAccessTokenProvider } from "./azureIdentityAccessTokenProvider";
 import { type ObservabilityOptions, ObservabilityOptionsImpl } from "./observabilityOptions";
 
diff --git a/packages/authentication/azure/test/azureIdentityAuthenticationTest.ts b/packages/authentication/azure/test/azureIdentityAuthenticationTest.ts
index 08bc4602e..affae5e15 100644
--- a/packages/authentication/azure/test/azureIdentityAuthenticationTest.ts
+++ b/packages/authentication/azure/test/azureIdentityAuthenticationTest.ts
@@ -5,7 +5,7 @@
  * -------------------------------------------------------------------------------------------
  */
 
-import { AccessToken, ClientSecretCredential } from "@azure/identity";
+import { type AccessToken, ClientSecretCredential } from "@azure/identity";
 import {
   BaseBearerTokenAuthenticationProvider,
   RequestInformation,
diff --git a/packages/authentication/spfx/src/azureAdSpfxAccessTokenProvider.ts b/packages/authentication/spfx/src/azureAdSpfxAccessTokenProvider.ts
index 5e2488607..7c17f64bf 100644
--- a/packages/authentication/spfx/src/azureAdSpfxAccessTokenProvider.ts
+++ b/packages/authentication/spfx/src/azureAdSpfxAccessTokenProvider.ts
@@ -3,8 +3,9 @@ import {
   AllowedHostsValidator,
   validateProtocol,
 } from "@microsoft/kiota-abstractions";
-import { AadTokenProvider } from "@microsoft/sp-http";
-import { Span, trace } from "@opentelemetry/api";
+import { type AadTokenProvider } from "@microsoft/sp-http";
+import { type Span, trace } from "@opentelemetry/api";
+
 import { type ObservabilityOptions, ObservabilityOptionsImpl } from "./observabilityOptions";
 
 export class AzureAdSpfxAccessTokenProvider implements AccessTokenProvider {
diff --git a/packages/authentication/spfx/src/azureAdSpfxAuthenticationProvider.ts b/packages/authentication/spfx/src/azureAdSpfxAuthenticationProvider.ts
index cad4d4c6c..cd345bf77 100644
--- a/packages/authentication/spfx/src/azureAdSpfxAuthenticationProvider.ts
+++ b/packages/authentication/spfx/src/azureAdSpfxAuthenticationProvider.ts
@@ -1,5 +1,6 @@
 import { BaseBearerTokenAuthenticationProvider } from "@microsoft/kiota-abstractions";
-import { AadTokenProvider } from "@microsoft/sp-http";
+import { type AadTokenProvider } from "@microsoft/sp-http";
+
 import { AzureAdSpfxAccessTokenProvider } from "./azureAdSpfxAccessTokenProvider";
 import { type ObservabilityOptions, ObservabilityOptionsImpl } from "./observabilityOptions";
 
diff --git a/packages/authentication/spfx/test/azureAdSpfxAuthenticationTest.ts b/packages/authentication/spfx/test/azureAdSpfxAuthenticationTest.ts
index c1958e6fd..1dac0449f 100644
--- a/packages/authentication/spfx/test/azureAdSpfxAuthenticationTest.ts
+++ b/packages/authentication/spfx/test/azureAdSpfxAuthenticationTest.ts
@@ -1,25 +1,25 @@
 import { RequestInformation } from "@microsoft/kiota-abstractions";
 import { assert } from "chai";
 
-import { AzureAdSpfxAuthenticationProvider, AzureAdSpfxAccessTokenProvider } from "../src";
+import { AzureAdSpfxAccessTokenProvider,AzureAdSpfxAuthenticationProvider } from "../src";
 import { MockAadTokenProvider } from "./mockAadTokenProvider";
 
 describe("Test authentication using SharePoint Framework", () => {
 
     it("AccessToken is returned correctly from getAuthorizationToken function", async () => {
-        const expectedToken: string = "dummy_valid_token"
-        const appIdUri: string = "api://api_client_id";
+        const expectedToken = "dummy_valid_token";
+        const appIdUri = "api://api_client_id";
         const allowedHosts: Set<string> = new Set<string>([
             "myapi.azurewebsites.net"
         ]);
 
         const mockTokenProvider = new MockAadTokenProvider(expectedToken);
-    
+
         const accessTokenProvider = new AzureAdSpfxAccessTokenProvider(
-            mockTokenProvider as any, 
+            mockTokenProvider as any,
             appIdUri,
             allowedHosts);
-        
+
         const accessToken: string = await accessTokenProvider.getAuthorizationToken(
             "https://myapi.azurewebsites.net/endpoint");
 
@@ -27,28 +27,28 @@ describe("Test authentication using SharePoint Framework", () => {
     });
 
     it("AccessToken is empty when requested URL is not in allowedHosts", async () => {
-        const expectedToken: string = "dummy_valid_token"
-        const appIdUri: string = "api://api_client_id";
+        const expectedToken = "dummy_valid_token";
+        const appIdUri = "api://api_client_id";
         const allowedHosts: Set<string> = new Set<string>([
             "myapi.azurewebsites.net"
         ]);
 
         const mockTokenProvider = new MockAadTokenProvider(expectedToken);
-    
+
         const accessTokenProvider = new AzureAdSpfxAccessTokenProvider(
-            mockTokenProvider as any, 
+            mockTokenProvider as any,
             appIdUri,
             allowedHosts);
-        
+
         const accessToken: string = await accessTokenProvider.getAuthorizationToken(
             "https://notallowedhost.azurewebsites.net/endpoint");
 
-        assert.equal('', accessToken);
-    });    
+        assert.equal("", accessToken);
+    });
 
-    it("AccessToken is appended correctly in header by AzureAdSpfxAuthenticationProvider", async () => {    
-        const expectedToken: string = "dummy_valid_token"
-        const appIdUri: string = "api://api_client_id";
+    it("AccessToken is appended correctly in header by AzureAdSpfxAuthenticationProvider", async () => {
+        const expectedToken = "dummy_valid_token";
+        const appIdUri = "api://api_client_id";
         const allowedHosts: Set<string> = new Set<string>([
             "myapi.azurewebsites.net"
         ]);
diff --git a/packages/http/fetch/src/fetchRequestAdapter.ts b/packages/http/fetch/src/fetchRequestAdapter.ts
index 101e8a049..229c5e438 100644
--- a/packages/http/fetch/src/fetchRequestAdapter.ts
+++ b/packages/http/fetch/src/fetchRequestAdapter.ts
@@ -1,5 +1,6 @@
-import { type ApiError, type AuthenticationProvider, type BackingStoreFactory, BackingStoreFactorySingleton, DateOnly, DefaultApiError, Duration, enableBackingStoreForParseNodeFactory, enableBackingStoreForSerializationWriterFactory, type Parsable, type ParsableFactory, type ParseNode, type ParseNodeFactory, ParseNodeFactoryRegistry, type RequestAdapter, RequestInformation, type ResponseHandler, ResponseHandlerOption, ResponseHandlerOptionKey, type SerializationWriterFactory, SerializationWriterFactoryRegistry, TimeOnly } from "@microsoft/kiota-abstractions";
+import { type ApiError, type AuthenticationProvider, type BackingStoreFactory, BackingStoreFactorySingleton, type DateOnly, DefaultApiError, type Duration, enableBackingStoreForParseNodeFactory, enableBackingStoreForSerializationWriterFactory,type Parsable, type ParsableFactory,type ParseNode, type ParseNodeFactory,ParseNodeFactoryRegistry, type RequestAdapter,type RequestInformation,type ResponseHandler,type ResponseHandlerOption, ResponseHandlerOptionKey, type SerializationWriterFactory, SerializationWriterFactoryRegistry, type TimeOnly } from "@microsoft/kiota-abstractions";
 import { type Span, SpanStatusCode, trace } from "@opentelemetry/api";
+
 import { HttpClient } from "./httpClient";
 import { type ObservabilityOptions, ObservabilityOptionsImpl } from "./observabilityOptions";
 
diff --git a/packages/http/fetch/src/httpClient.ts b/packages/http/fetch/src/httpClient.ts
index a0e26d2c9..134283b8e 100644
--- a/packages/http/fetch/src/httpClient.ts
+++ b/packages/http/fetch/src/httpClient.ts
@@ -6,6 +6,7 @@
  */
 
 import type { RequestOption } from "@microsoft/kiota-abstractions";
+
 import { CustomFetchHandler } from "./middlewares/customFetchHandler";
 import type { Middleware } from "./middlewares/middleware";
 import { MiddlewareFactory } from "./middlewares/middlewareFactory";
diff --git a/packages/http/fetch/src/middlewares/chaosHandler.ts b/packages/http/fetch/src/middlewares/chaosHandler.ts
index 51c81f200..72504eaf3 100644
--- a/packages/http/fetch/src/middlewares/chaosHandler.ts
+++ b/packages/http/fetch/src/middlewares/chaosHandler.ts
@@ -9,10 +9,11 @@
  * @module ChaosHandler
  */
 
-import { HttpMethod, type RequestOption } from "@microsoft/kiota-abstractions";
+import type { HttpMethod, RequestOption } from "@microsoft/kiota-abstractions";
 import { type Span, trace } from "@opentelemetry/api";
+
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
-import { FetchHeaders, FetchRequestInit } from "../utils/fetchDefinitions";
+import type { FetchHeaders, FetchRequestInit } from "../utils/fetchDefinitions";
 import type { Middleware } from "./middleware";
 import { httpStatusCode, methodStatusCode } from "./options/ChaosHandlerData";
 import type { ChaosHandlerOptions } from "./options/chaosHandlerOptions";
diff --git a/packages/http/fetch/src/middlewares/headersInspectionHandler.ts b/packages/http/fetch/src/middlewares/headersInspectionHandler.ts
index ef98d4c41..62c28db02 100644
--- a/packages/http/fetch/src/middlewares/headersInspectionHandler.ts
+++ b/packages/http/fetch/src/middlewares/headersInspectionHandler.ts
@@ -7,6 +7,7 @@
 
 import { type RequestOption } from "@microsoft/kiota-abstractions";
 import { trace } from "@opentelemetry/api";
+
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
 import type { Middleware } from "./middleware";
 import { HeadersInspectionOptions, HeadersInspectionOptionsKey } from "./options/headersInspectionOptions";
diff --git a/packages/http/fetch/src/middlewares/middlewareFactory.ts b/packages/http/fetch/src/middlewares/middlewareFactory.ts
index 6990a36e6..ac804224b 100644
--- a/packages/http/fetch/src/middlewares/middlewareFactory.ts
+++ b/packages/http/fetch/src/middlewares/middlewareFactory.ts
@@ -9,13 +9,14 @@
  * @module MiddlewareFactory
  */
 import fetch from "node-fetch";
+
 import { CustomFetchHandler } from "./customFetchHandler";
+import { HeadersInspectionHandler } from "./headersInspectionHandler";
 import type { Middleware } from "./middleware";
 import { ParametersNameDecodingHandler } from "./parametersNameDecodingHandler";
 import { RedirectHandler } from "./redirectHandler";
 import { RetryHandler } from "./retryHandler";
 import { UserAgentHandler } from "./userAgentHandler";
-import { HeadersInspectionHandler } from "./headersInspectionHandler";
 
 /**
  * @class
diff --git a/packages/http/fetch/src/middlewares/options/chaosHandlerOptions.ts b/packages/http/fetch/src/middlewares/options/chaosHandlerOptions.ts
index a8e5ca46e..4d348c786 100644
--- a/packages/http/fetch/src/middlewares/options/chaosHandlerOptions.ts
+++ b/packages/http/fetch/src/middlewares/options/chaosHandlerOptions.ts
@@ -9,8 +9,8 @@
  * @module ChaosHandlerOptions
  */
 
-import { FetchHeaders } from "../../utils/fetchDefinitions";
-import { ChaosStrategy } from "./chaosStrategy";
+import { type FetchHeaders } from "../../utils/fetchDefinitions";
+import { type ChaosStrategy } from "./chaosStrategy";
 
 export const ChaosHandlerOptionsKey = "ChaosHandlerOptionsKey";
 
diff --git a/packages/http/fetch/src/middlewares/options/headersInspectionOptions.ts b/packages/http/fetch/src/middlewares/options/headersInspectionOptions.ts
index 19e53454c..a9e510b93 100644
--- a/packages/http/fetch/src/middlewares/options/headersInspectionOptions.ts
+++ b/packages/http/fetch/src/middlewares/options/headersInspectionOptions.ts
@@ -1,4 +1,4 @@
-import { createRecordWithCaseInsensitiveKeys, type RequestOption } from "@microsoft/kiota-abstractions";
+import { createRecordWithCaseInsensitiveKeys,type RequestOption } from "@microsoft/kiota-abstractions";
 export const HeadersInspectionOptionsKey = "HeadersInspectionOptionsKey";
 /**
  * @class
diff --git a/packages/http/fetch/src/middlewares/options/parametersNameDecodingOptions.ts b/packages/http/fetch/src/middlewares/options/parametersNameDecodingOptions.ts
index 163d02604..436be621a 100644
--- a/packages/http/fetch/src/middlewares/options/parametersNameDecodingOptions.ts
+++ b/packages/http/fetch/src/middlewares/options/parametersNameDecodingOptions.ts
@@ -26,5 +26,5 @@ export class ParametersNameDecodingHandlerOptions implements RequestOption {
 	 * @param {boolean} [enable = true] - Whether to decode the specified characters in the request query parameters names
 	 * @param {string[]} [charactersToDecode = [".", "-", "~", "$"]] - The characters to decode
 	 */
-	public constructor(public enable: boolean = true, public charactersToDecode: string[] = [".", "-", "~", "$"]) {}
+	public constructor(public enable = true, public charactersToDecode: string[] = [".", "-", "~", "$"]) {}
 }
diff --git a/packages/http/fetch/src/middlewares/options/retryHandlerOptions.ts b/packages/http/fetch/src/middlewares/options/retryHandlerOptions.ts
index dd26b3c13..702d41f48 100644
--- a/packages/http/fetch/src/middlewares/options/retryHandlerOptions.ts
+++ b/packages/http/fetch/src/middlewares/options/retryHandlerOptions.ts
@@ -10,7 +10,8 @@
  */
 
 import type { RequestOption } from "@microsoft/kiota-abstractions";
-import { FetchResponse } from "../../utils/fetchDefinitions";
+
+import type { FetchResponse } from "../../utils/fetchDefinitions";
 
 /**
  * @type
diff --git a/packages/http/fetch/src/middlewares/options/userAgentHandlerOptions.ts b/packages/http/fetch/src/middlewares/options/userAgentHandlerOptions.ts
index 9925f69ea..f7af99138 100644
--- a/packages/http/fetch/src/middlewares/options/userAgentHandlerOptions.ts
+++ b/packages/http/fetch/src/middlewares/options/userAgentHandlerOptions.ts
@@ -6,6 +6,7 @@
  */
 
 import type { RequestOption } from "@microsoft/kiota-abstractions";
+
 import { libraryVersion } from "./version";
 export const UserAgentHandlerOptionsKey = "UserAgentHandlerOptionKey";
 
@@ -21,5 +22,5 @@ export class UserAgentHandlerOptions implements RequestOption {
 	 * @param {string} [productName = "kiota-typescript"] - The product name to be added to the user agent header
 	 * @param {string} [productVersion = "1.0.0-preview.12"] - The product version to be added to the user agent header
 	 */
-	public constructor(public enable: boolean = true, public productName: string = "kiota-typescript", public productVersion: string = libraryVersion) {}
+	public constructor(public enable = true, public productName = "kiota-typescript", public productVersion: string = libraryVersion) {}
 }
diff --git a/packages/http/fetch/src/middlewares/parametersNameDecodingHandler.ts b/packages/http/fetch/src/middlewares/parametersNameDecodingHandler.ts
index 8d1f46444..1827fdc02 100644
--- a/packages/http/fetch/src/middlewares/parametersNameDecodingHandler.ts
+++ b/packages/http/fetch/src/middlewares/parametersNameDecodingHandler.ts
@@ -7,6 +7,7 @@
 
 import type { RequestOption } from "@microsoft/kiota-abstractions";
 import { trace } from "@opentelemetry/api";
+
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
 import type { Middleware } from "./middleware";
 import { ParametersNameDecodingHandlerOptions, ParametersNameDecodingHandlerOptionsKey } from "./options/parametersNameDecodingOptions";
diff --git a/packages/http/fetch/src/middlewares/redirectHandler.ts b/packages/http/fetch/src/middlewares/redirectHandler.ts
index 1cdff7e7e..cbf8f119f 100644
--- a/packages/http/fetch/src/middlewares/redirectHandler.ts
+++ b/packages/http/fetch/src/middlewares/redirectHandler.ts
@@ -11,8 +11,9 @@
 
 import { HttpMethod, type RequestOption } from "@microsoft/kiota-abstractions";
 import { trace } from "@opentelemetry/api";
+
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
-import { FetchRequestInit, FetchResponse } from "../utils/fetchDefinitions";
+import type { FetchRequestInit, FetchResponse } from "../utils/fetchDefinitions";
 import type { Middleware } from "./middleware";
 import { RedirectHandlerOptionKey, RedirectHandlerOptions } from "./options/redirectHandlerOptions";
 
diff --git a/packages/http/fetch/src/middlewares/retryHandler.ts b/packages/http/fetch/src/middlewares/retryHandler.ts
index 1b6c60d55..5f08c1c19 100644
--- a/packages/http/fetch/src/middlewares/retryHandler.ts
+++ b/packages/http/fetch/src/middlewares/retryHandler.ts
@@ -9,11 +9,11 @@
  * @module RetryHandler
  */
 
-import { HttpMethod } from "@microsoft/kiota-abstractions";
-import { type RequestOption } from "@microsoft/kiota-abstractions";
+import { HttpMethod, type RequestOption } from "@microsoft/kiota-abstractions";
 import { trace } from "@opentelemetry/api";
+
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
-import { FetchRequestInit, FetchResponse } from "../utils/fetchDefinitions";
+import type { FetchRequestInit, FetchResponse } from "../utils/fetchDefinitions";
 import { getRequestHeader, setRequestHeader } from "../utils/headersUtil";
 import { type Middleware } from "./middleware";
 import { RetryHandlerOptionKey, RetryHandlerOptions } from "./options/retryHandlerOptions";
diff --git a/packages/http/fetch/src/middlewares/telemetryHandler.ts b/packages/http/fetch/src/middlewares/telemetryHandler.ts
index cc19fd8de..a2104f6f0 100644
--- a/packages/http/fetch/src/middlewares/telemetryHandler.ts
+++ b/packages/http/fetch/src/middlewares/telemetryHandler.ts
@@ -5,6 +5,7 @@
  * -------------------------------------------------------------------------------------------
  */
 import type { RequestOption } from "@microsoft/kiota-abstractions";
+
 import type { Middleware } from "./middleware";
 import type { TelemetryHandlerOptions } from "./options/telemetryHandlerOptions";
 
diff --git a/packages/http/fetch/src/middlewares/userAgentHandler.ts b/packages/http/fetch/src/middlewares/userAgentHandler.ts
index 1fea9ffd8..ef2c0eda6 100644
--- a/packages/http/fetch/src/middlewares/userAgentHandler.ts
+++ b/packages/http/fetch/src/middlewares/userAgentHandler.ts
@@ -11,8 +11,9 @@
 
 import type { RequestOption } from "@microsoft/kiota-abstractions";
 import { trace } from "@opentelemetry/api";
+
 import { getObservabilityOptionsFromRequest } from "../observabilityOptions";
-import { FetchRequestInit } from "../utils/fetchDefinitions";
+import type { FetchRequestInit } from "../utils/fetchDefinitions";
 import { appendRequestHeader, getRequestHeader } from "../utils/headersUtil";
 import type { Middleware } from "./middleware";
 import { UserAgentHandlerOptions, UserAgentHandlerOptionsKey } from "./options/userAgentHandlerOptions";
diff --git a/packages/http/fetch/src/utils/headersUtil.ts b/packages/http/fetch/src/utils/headersUtil.ts
index 67fc43102..63d04c28e 100644
--- a/packages/http/fetch/src/utils/headersUtil.ts
+++ b/packages/http/fetch/src/utils/headersUtil.ts
@@ -5,7 +5,7 @@
  * -------------------------------------------------------------------------------------------
  */
 
-import { FetchRequestInit } from "./fetchDefinitions";
+import type { FetchRequestInit } from "./fetchDefinitions";
 
 /**
  * @module MiddlewareUtil
diff --git a/packages/http/fetch/test/common/ChaosHandler.ts b/packages/http/fetch/test/common/ChaosHandler.ts
index 3c9a094bf..49715a915 100644
--- a/packages/http/fetch/test/common/ChaosHandler.ts
+++ b/packages/http/fetch/test/common/ChaosHandler.ts
@@ -9,7 +9,7 @@ import { HttpMethod } from "@microsoft/kiota-abstractions";
 import { assert } from "chai";
 import { Response } from "node-fetch";
 
-import { ChaosHandler, ChaosStrategy, FetchRequestInit } from "../../src";
+import { ChaosHandler, ChaosStrategy, type FetchRequestInit } from "../../src";
 import { DummyFetchHandler } from "./middleware/dummyFetchHandler";
 
 describe("ChaosHandler.ts", () => {
diff --git a/packages/http/fetch/test/common/fetchRequestAdapter.ts b/packages/http/fetch/test/common/fetchRequestAdapter.ts
index 391d652fe..9e9b123c8 100644
--- a/packages/http/fetch/test/common/fetchRequestAdapter.ts
+++ b/packages/http/fetch/test/common/fetchRequestAdapter.ts
@@ -7,6 +7,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars*/
 import { AnonymousAuthenticationProvider, HttpMethod, RequestInformation, type RequestOption } from "@microsoft/kiota-abstractions";
 import { assert } from "chai";
+
 import { FetchRequestAdapter } from "../../src/fetchRequestAdapter";
 import { HttpClient } from "../../src/httpClient";
 import { getResponse } from "../testUtils";
diff --git a/packages/http/fetch/test/common/middleware/dummyFetchHandler.ts b/packages/http/fetch/test/common/middleware/dummyFetchHandler.ts
index 01ae2bb9f..582b9bc80 100644
--- a/packages/http/fetch/test/common/middleware/dummyFetchHandler.ts
+++ b/packages/http/fetch/test/common/middleware/dummyFetchHandler.ts
@@ -10,6 +10,7 @@
  */
 
 import type { RequestOption } from "@microsoft/kiota-abstractions";
+
 import type { Middleware } from "../../../src/middlewares/middleware";
 
 /**
diff --git a/packages/http/fetch/test/common/middleware/headersUtil.ts b/packages/http/fetch/test/common/middleware/headersUtil.ts
index e41abd6e0..1d2f3b0ea 100644
--- a/packages/http/fetch/test/common/middleware/headersUtil.ts
+++ b/packages/http/fetch/test/common/middleware/headersUtil.ts
@@ -8,7 +8,7 @@
 
 import { assert } from "chai";
 
-import { FetchRequestInit } from "../../../src/utils/fetchDefinitions";
+import type { FetchRequestInit } from "../../../src/utils/fetchDefinitions";
 import { appendRequestHeader, getRequestHeader, setRequestHeader } from "../../../src/utils/headersUtil";
 
 describe("HeaderUtil", async () => {
diff --git a/packages/http/fetch/test/common/middleware/retryHandler.ts b/packages/http/fetch/test/common/middleware/retryHandler.ts
index 2f77bc0e5..bc4446853 100644
--- a/packages/http/fetch/test/common/middleware/retryHandler.ts
+++ b/packages/http/fetch/test/common/middleware/retryHandler.ts
@@ -6,9 +6,9 @@
  */
 import { assert } from "chai";
 
-import { RetryHandlerOptionKey, RetryHandlerOptions, ShouldRetry } from "../../../src/middlewares/options/retryHandlerOptions";
+import { RetryHandlerOptionKey, RetryHandlerOptions, type ShouldRetry } from "../../../src/middlewares/options/retryHandlerOptions";
 import { RetryHandler } from "../../../src/middlewares/retryHandler";
-import { FetchRequestInit } from "../../../src/utils/fetchDefinitions";
+import type { FetchRequestInit } from "../../../src/utils/fetchDefinitions";
 import { getResponse } from "../../testUtils";
 import { DummyFetchHandler } from "./dummyFetchHandler";
 
diff --git a/packages/http/fetch/test/common/middleware/retryHandlerOptions.ts b/packages/http/fetch/test/common/middleware/retryHandlerOptions.ts
index 28162e6fa..d350380b4 100644
--- a/packages/http/fetch/test/common/middleware/retryHandlerOptions.ts
+++ b/packages/http/fetch/test/common/middleware/retryHandlerOptions.ts
@@ -7,7 +7,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars*/
 import { assert } from "chai";
 
-import { RetryHandlerOptions, ShouldRetry } from "../../../src/middlewares/options/retryHandlerOptions";
+import { RetryHandlerOptions, type ShouldRetry } from "../../../src/middlewares/options/retryHandlerOptions";
 
 describe("RetryHandlerOptions.ts", () => {
 	describe("Constructor", () => {
diff --git a/packages/http/fetch/test/common/middleware/testCallBackMiddleware.ts b/packages/http/fetch/test/common/middleware/testCallBackMiddleware.ts
index 3c3a0ed90..7050cd7d6 100644
--- a/packages/http/fetch/test/common/middleware/testCallBackMiddleware.ts
+++ b/packages/http/fetch/test/common/middleware/testCallBackMiddleware.ts
@@ -1,7 +1,8 @@
 import type { RequestOption } from "@microsoft/kiota-abstractions";
+
 import type { Middleware } from "../../../src/middlewares/middleware";
-import { DummyFetchHandler } from "./dummyFetchHandler";
 import { getResponse } from "../../testUtils";
+import { DummyFetchHandler } from "./dummyFetchHandler";
 
 // eslint-disable-next-line no-var
 var Response = Response;
diff --git a/packages/http/fetch/test/common/mockParseNodeFactory.ts b/packages/http/fetch/test/common/mockParseNodeFactory.ts
index 20022b3fd..6408a718a 100644
--- a/packages/http/fetch/test/common/mockParseNodeFactory.ts
+++ b/packages/http/fetch/test/common/mockParseNodeFactory.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { DateOnly, Duration, type Parsable, type ParseNode, ParsableFactory, type ParseNodeFactory, TimeOnly } from "@microsoft/kiota-abstractions";
-import { Guid } from "guid-typescript";
+import type { DateOnly, Duration, Parsable, ParsableFactory, ParseNode, ParseNodeFactory, TimeOnly } from "@microsoft/kiota-abstractions";
+import type { Guid } from "guid-typescript";
 
 export class MockParseNodeFactory implements ParseNodeFactory {
 	parseNodeValue: ParseNode;
diff --git a/packages/serialization/form/src/browser/formParseNodeFactory.ts b/packages/serialization/form/src/browser/formParseNodeFactory.ts
index 48f5cf424..888c41be5 100644
--- a/packages/serialization/form/src/browser/formParseNodeFactory.ts
+++ b/packages/serialization/form/src/browser/formParseNodeFactory.ts
@@ -1,4 +1,5 @@
 import type { ParseNode, ParseNodeFactory } from "@microsoft/kiota-abstractions";
+
 import { FormParseNode } from "./../formParseNode";
 
 export class FormParseNodeFactory implements ParseNodeFactory {
diff --git a/packages/serialization/form/src/formParseNode.ts b/packages/serialization/form/src/formParseNode.ts
index 9ef5a479a..40618064b 100644
--- a/packages/serialization/form/src/formParseNode.ts
+++ b/packages/serialization/form/src/formParseNode.ts
@@ -2,9 +2,9 @@ import {
   DateOnly,
   Duration,
   type Parsable,
-  type ParseNode,
-  ParsableFactory,
+  type ParsableFactory,
   parseGuidString,
+  type ParseNode,
   TimeOnly,
   toFirstCharacterUpper,
 } from "@microsoft/kiota-abstractions";
diff --git a/packages/serialization/form/src/formParseNodeFactory.ts b/packages/serialization/form/src/formParseNodeFactory.ts
index 43a1a4074..92d3610be 100644
--- a/packages/serialization/form/src/formParseNodeFactory.ts
+++ b/packages/serialization/form/src/formParseNodeFactory.ts
@@ -1,5 +1,6 @@
 import type { ParseNode, ParseNodeFactory} from "@microsoft/kiota-abstractions";
 import { TextDecoder } from "util";
+
 import { FormParseNode } from "./formParseNode";
 
 export class FormParseNodeFactory implements ParseNodeFactory {
diff --git a/packages/serialization/form/src/formSerializationWriter.ts b/packages/serialization/form/src/formSerializationWriter.ts
index d73ad4498..81d062c91 100644
--- a/packages/serialization/form/src/formSerializationWriter.ts
+++ b/packages/serialization/form/src/formSerializationWriter.ts
@@ -2,12 +2,12 @@
 import {
   DateOnly,
   Duration,
-  ModelSerializerFunction,
+  type ModelSerializerFunction,
   type Parsable,
   type SerializationWriter,
   TimeOnly,
 } from "@microsoft/kiota-abstractions";
-import { Guid } from "guid-typescript";
+import type { Guid } from "guid-typescript";
 
 export class FormSerializationWriter implements SerializationWriter {
   public writeByteArrayValue(
diff --git a/packages/serialization/form/test/common/formParseNode.ts b/packages/serialization/form/test/common/formParseNode.ts
index 7961e0a98..1c69fdebd 100644
--- a/packages/serialization/form/test/common/formParseNode.ts
+++ b/packages/serialization/form/test/common/formParseNode.ts
@@ -1,8 +1,7 @@
 import { assert } from "chai";
 
 import { FormParseNode } from "../../src/index";
-import { createTestParserFromDiscriminatorValue } from "../testEntity";
-import type { TestEntity } from "../testEntity";
+import { createTestParserFromDiscriminatorValue,type TestEntity } from "../testEntity";
 
 describe("FormParseNode", () => {
   const testUserForm =
diff --git a/packages/serialization/form/test/common/formSerializationWriter.ts b/packages/serialization/form/test/common/formSerializationWriter.ts
index db67791d8..56082540f 100644
--- a/packages/serialization/form/test/common/formSerializationWriter.ts
+++ b/packages/serialization/form/test/common/formSerializationWriter.ts
@@ -2,8 +2,7 @@ import { DateOnly, Duration, TimeOnly } from "@microsoft/kiota-abstractions";
 import { assert } from "chai";
 
 import { FormSerializationWriter } from "../../src";
-import { serializeTestEntity } from "../testEntity";
-import type { TestEntity } from "../testEntity";
+import { serializeTestEntity,type TestEntity } from "../testEntity";
 
 describe("FormSerializationWriter", () => {
   it("writesSampleObjectValue", () => {
@@ -56,7 +55,7 @@ describe("FormSerializationWriter", () => {
     assert.equal(expectedString.length, count);
     assert.equal(arr.length, 0);
   });
-  
+
   it("writesSampleCollectionOfObjectValues", () => {
     const testEntity = {} as TestEntity;
     testEntity.id = "48d31887-5fad-4d73-a9f5-3c356e68a038";
diff --git a/packages/serialization/form/test/testEntity.ts b/packages/serialization/form/test/testEntity.ts
index c3abbcd2f..ceece38ed 100644
--- a/packages/serialization/form/test/testEntity.ts
+++ b/packages/serialization/form/test/testEntity.ts
@@ -1,10 +1,10 @@
-import {
-  type AdditionalDataHolder,
+import type {
+  AdditionalDataHolder,
   DateOnly,
   Duration,
-  type Parsable,
-  type ParseNode,
-  type SerializationWriter,
+  Parsable,
+  ParseNode,
+  SerializationWriter,
   TimeOnly,
 } from "@microsoft/kiota-abstractions";
 
diff --git a/packages/serialization/json/src/browser/jsonParseNodeFactory.ts b/packages/serialization/json/src/browser/jsonParseNodeFactory.ts
index 5e8023788..47c650b1b 100644
--- a/packages/serialization/json/src/browser/jsonParseNodeFactory.ts
+++ b/packages/serialization/json/src/browser/jsonParseNodeFactory.ts
@@ -1,4 +1,5 @@
 import type { ParseNode, ParseNodeFactory } from "@microsoft/kiota-abstractions";
+
 import { JsonParseNode } from "./../jsonParseNode";
 
 export class JsonParseNodeFactory implements ParseNodeFactory {
diff --git a/packages/serialization/json/src/jsonParseNode.ts b/packages/serialization/json/src/jsonParseNode.ts
index ac64cc448..d3505f56c 100644
--- a/packages/serialization/json/src/jsonParseNode.ts
+++ b/packages/serialization/json/src/jsonParseNode.ts
@@ -2,9 +2,9 @@ import {
   DateOnly,
   Duration,
   type Parsable,
-  ParsableFactory,
-  type ParseNode,
+  type ParsableFactory,
   parseGuidString,
+  type ParseNode,
   TimeOnly,
   toFirstCharacterUpper,
 } from "@microsoft/kiota-abstractions";
diff --git a/packages/serialization/json/src/jsonSerializationWriter.ts b/packages/serialization/json/src/jsonSerializationWriter.ts
index fc7534ff3..52528868d 100644
--- a/packages/serialization/json/src/jsonSerializationWriter.ts
+++ b/packages/serialization/json/src/jsonSerializationWriter.ts
@@ -2,12 +2,11 @@
 import {
   DateOnly,
   Duration,
-  ModelSerializerFunction,
+  type ModelSerializerFunction,
   type Parsable,
-  TimeOnly,
-  type SerializationWriter
-} from "@microsoft/kiota-abstractions";
-import { Guid } from "guid-typescript";
+  type SerializationWriter,
+  TimeOnly} from "@microsoft/kiota-abstractions";
+import type { Guid } from "guid-typescript";
 
 export class JsonSerializationWriter implements SerializationWriter {
   public writeByteArrayValue(
diff --git a/packages/serialization/json/test/common/JsonParseNode.ts b/packages/serialization/json/test/common/JsonParseNode.ts
index d7b233f4c..046e9f0a1 100644
--- a/packages/serialization/json/test/common/JsonParseNode.ts
+++ b/packages/serialization/json/test/common/JsonParseNode.ts
@@ -1,8 +1,7 @@
 import { assert } from "chai";
 
 import { JsonParseNode } from "../../src/index";
-import { createTestParserFromDiscriminatorValue } from "./testEntity";
-import type { TestParser } from "./testEntity";
+import { createTestParserFromDiscriminatorValue, type TestParser } from "./testEntity";
 
 describe("JsonParseNode", () => {
   it("jsonParseNode:initializes", async () => {
diff --git a/packages/serialization/json/test/common/jsonSerializationWriter.ts b/packages/serialization/json/test/common/jsonSerializationWriter.ts
index 6eb6ff78f..ba71f2ca2 100644
--- a/packages/serialization/json/test/common/jsonSerializationWriter.ts
+++ b/packages/serialization/json/test/common/jsonSerializationWriter.ts
@@ -2,10 +2,7 @@ import { assert } from "chai";
 
 import { JsonParseNode, JsonSerializationWriter } from "../../src/index";
 import {
-  createTestParserFromDiscriminatorValue,
-  serializeTestParser,
-  type TestParser
-} from "./testEntity";
+createTestParserFromDiscriminatorValue,  serializeTestParser,type TestParser} from "./testEntity";
 
 describe("JsonParseNode", () => {
   it("Test object serialization", async () => {
@@ -23,7 +20,7 @@ describe("JsonParseNode", () => {
           },
         },
       },
-      testDate: testDate
+      testDate
     };
     const expectedObject: TestParser = {
       testCollection: ["2", "3"],
@@ -35,7 +32,7 @@ describe("JsonParseNode", () => {
           someValue: 123,
         },
       },
-      testDate: testDate
+      testDate
     };
 
     const writer = new JsonSerializationWriter();
diff --git a/packages/serialization/json/test/common/testEntity.ts b/packages/serialization/json/test/common/testEntity.ts
index 7eee906c9..bf6c0614a 100644
--- a/packages/serialization/json/test/common/testEntity.ts
+++ b/packages/serialization/json/test/common/testEntity.ts
@@ -54,7 +54,7 @@ export function deserializeTestParser(
       testParser.testComplexString = n.getStringValue();
     },
     testDate: (n) => {
-      testParser.testDate = n.getDateValue()
+      testParser.testDate = n.getDateValue();
     },
     foos: (n) => {
       testParser.foos = n.getCollectionOfObjectValues(createFooParserFromDiscriminatorValue);
diff --git a/packages/serialization/multipart/src/multipartSerializationWriter.ts b/packages/serialization/multipart/src/multipartSerializationWriter.ts
index 723fab5c6..606678dfa 100644
--- a/packages/serialization/multipart/src/multipartSerializationWriter.ts
+++ b/packages/serialization/multipart/src/multipartSerializationWriter.ts
@@ -1,14 +1,13 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions */
-import {
+import type {
   DateOnly,
   Duration,
-  ModelSerializerFunction,
-  type Parsable,
   MultipartBody,
-  type SerializationWriter,
-  TimeOnly,
-} from "@microsoft/kiota-abstractions";
-import { Guid } from "guid-typescript";
+  type Parsable,
+  type SerializationWriter
+  ModelSerializerFunction,
+  TimeOnly } from "@microsoft/kiota-abstractions";
+import type { Guid } from "guid-typescript";
 
 /** Serialization writer for multipart/form-data */
 export class MultipartSerializationWriter implements SerializationWriter {
diff --git a/packages/serialization/multipart/test/common/multipartSerializationWriter.ts b/packages/serialization/multipart/test/common/multipartSerializationWriter.ts
index 258a0abc2..da89e8211 100644
--- a/packages/serialization/multipart/test/common/multipartSerializationWriter.ts
+++ b/packages/serialization/multipart/test/common/multipartSerializationWriter.ts
@@ -2,16 +2,15 @@ import {
   DateOnly,
   Duration,
   MultipartBody,
+  type RequestAdapter,
   serializeMultipartBody,
   TimeOnly,
 } from "@microsoft/kiota-abstractions";
-import type { RequestAdapter } from "@microsoft/kiota-abstractions";
 import { JsonSerializationWriterFactory } from "@microsoft/kiota-serialization-json";
 import { assert } from "chai";
 
 import { MultipartSerializationWriter } from "../../src";
-import { serializeTestEntity } from "../testEntity";
-import type { TestEntity } from "../testEntity";
+import { serializeTestEntity, type TestEntity } from "../testEntity";
 
 describe("MultipartSerializationWriter", () => {
   it("throws on parsable serialization", () => {
diff --git a/packages/serialization/multipart/test/testEntity.ts b/packages/serialization/multipart/test/testEntity.ts
index c3abbcd2f..ceece38ed 100644
--- a/packages/serialization/multipart/test/testEntity.ts
+++ b/packages/serialization/multipart/test/testEntity.ts
@@ -1,10 +1,10 @@
-import {
-  type AdditionalDataHolder,
+import type {
+  AdditionalDataHolder,
   DateOnly,
   Duration,
-  type Parsable,
-  type ParseNode,
-  type SerializationWriter,
+  Parsable,
+  ParseNode,
+  SerializationWriter,
   TimeOnly,
 } from "@microsoft/kiota-abstractions";
 
diff --git a/packages/serialization/text/src/browser/textParseNodeFactory.ts b/packages/serialization/text/src/browser/textParseNodeFactory.ts
index 50dc9cde4..4e0b89535 100644
--- a/packages/serialization/text/src/browser/textParseNodeFactory.ts
+++ b/packages/serialization/text/src/browser/textParseNodeFactory.ts
@@ -1,4 +1,5 @@
 import type { ParseNode, ParseNodeFactory } from "@microsoft/kiota-abstractions";
+
 import { TextParseNode } from "./../textParseNode";
 
 export class TextParseNodeFactory implements ParseNodeFactory {
diff --git a/packages/serialization/text/src/textParseNode.ts b/packages/serialization/text/src/textParseNode.ts
index e0e248cf3..b6f982349 100644
--- a/packages/serialization/text/src/textParseNode.ts
+++ b/packages/serialization/text/src/textParseNode.ts
@@ -1,10 +1,11 @@
+import type {
+  ParsableFactory} from "@microsoft/kiota-abstractions";
 import {
   DateOnly,
   Duration,
   type Parsable,
-  ParsableFactory,
-  type ParseNode,
   parseGuidString,
+  type ParseNode,
   TimeOnly,
   toFirstCharacterUpper,
 } from "@microsoft/kiota-abstractions";
diff --git a/packages/serialization/text/src/textSerializationWriter.ts b/packages/serialization/text/src/textSerializationWriter.ts
index e6baf503a..0eaccc444 100644
--- a/packages/serialization/text/src/textSerializationWriter.ts
+++ b/packages/serialization/text/src/textSerializationWriter.ts
@@ -1,13 +1,13 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import {
+import type {
   DateOnly,
   Duration,
   ModelSerializerFunction,
-  type Parsable,
-  type SerializationWriter,
+  Parsable,
+  SerializationWriter,
   TimeOnly,
 } from "@microsoft/kiota-abstractions";
-import { Guid } from "guid-typescript";
+import type { Guid } from "guid-typescript";
 
 export class TextSerializationWriter implements SerializationWriter {
   public writeByteArrayValue(
diff --git a/packages/serialization/text/test/common/textParseNode.ts b/packages/serialization/text/test/common/textParseNode.ts
index 0f892cd18..f8bf9da22 100644
--- a/packages/serialization/text/test/common/textParseNode.ts
+++ b/packages/serialization/text/test/common/textParseNode.ts
@@ -1,6 +1,7 @@
 import { assert } from "chai";
+import { v1 as uuidv1, v4 as uuidv4, v5 as uuidv5} from "uuid";
+
 import { TextParseNode } from "../../src/index";
-import { v1 as uuidv1, v4 as uuidv4, v5 as uuidv5} from 'uuid';
 
 describe("textParseNode", () => {
   it("textParseNode", async () => {

From e170b4d0dc720d5c8431718f8c7d3a822837e6fc Mon Sep 17 00:00:00 2001
From: koros <korosmatick@gmail.com>
Date: Fri, 6 Oct 2023 19:22:20 +0300
Subject: [PATCH 08/11] Update ESLint rules in subprojects to capture
 inconsistent imports

---
 packages/authentication/azure/.eslintrc.json    | 1 +
 packages/authentication/spfx/.eslintrc.json     | 1 +
 packages/http/fetch/.eslintrc.json              | 1 +
 packages/serialization/form/.eslintrc.json      | 1 +
 packages/serialization/json/.eslintrc.json      | 1 +
 packages/serialization/multipart/.eslintrc.json | 1 +
 packages/serialization/text/.eslintrc.json      | 1 +
 7 files changed, 7 insertions(+)

diff --git a/packages/authentication/azure/.eslintrc.json b/packages/authentication/azure/.eslintrc.json
index e73e74ab4..80ab9b397 100644
--- a/packages/authentication/azure/.eslintrc.json
+++ b/packages/authentication/azure/.eslintrc.json
@@ -18,6 +18,7 @@
         "@typescript-eslint/no-unused-vars": "error",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/explicit-module-boundary-types": "off",
+        "@typescript-eslint/consistent-type-imports": "error",
         "prettier/prettier": [
             "error",
             {
diff --git a/packages/authentication/spfx/.eslintrc.json b/packages/authentication/spfx/.eslintrc.json
index e73e74ab4..80ab9b397 100644
--- a/packages/authentication/spfx/.eslintrc.json
+++ b/packages/authentication/spfx/.eslintrc.json
@@ -18,6 +18,7 @@
         "@typescript-eslint/no-unused-vars": "error",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/explicit-module-boundary-types": "off",
+        "@typescript-eslint/consistent-type-imports": "error",
         "prettier/prettier": [
             "error",
             {
diff --git a/packages/http/fetch/.eslintrc.json b/packages/http/fetch/.eslintrc.json
index e73e74ab4..80ab9b397 100644
--- a/packages/http/fetch/.eslintrc.json
+++ b/packages/http/fetch/.eslintrc.json
@@ -18,6 +18,7 @@
         "@typescript-eslint/no-unused-vars": "error",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/explicit-module-boundary-types": "off",
+        "@typescript-eslint/consistent-type-imports": "error",
         "prettier/prettier": [
             "error",
             {
diff --git a/packages/serialization/form/.eslintrc.json b/packages/serialization/form/.eslintrc.json
index e73e74ab4..80ab9b397 100644
--- a/packages/serialization/form/.eslintrc.json
+++ b/packages/serialization/form/.eslintrc.json
@@ -18,6 +18,7 @@
         "@typescript-eslint/no-unused-vars": "error",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/explicit-module-boundary-types": "off",
+        "@typescript-eslint/consistent-type-imports": "error",
         "prettier/prettier": [
             "error",
             {
diff --git a/packages/serialization/json/.eslintrc.json b/packages/serialization/json/.eslintrc.json
index e73e74ab4..80ab9b397 100644
--- a/packages/serialization/json/.eslintrc.json
+++ b/packages/serialization/json/.eslintrc.json
@@ -18,6 +18,7 @@
         "@typescript-eslint/no-unused-vars": "error",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/explicit-module-boundary-types": "off",
+        "@typescript-eslint/consistent-type-imports": "error",
         "prettier/prettier": [
             "error",
             {
diff --git a/packages/serialization/multipart/.eslintrc.json b/packages/serialization/multipart/.eslintrc.json
index e73e74ab4..80ab9b397 100644
--- a/packages/serialization/multipart/.eslintrc.json
+++ b/packages/serialization/multipart/.eslintrc.json
@@ -18,6 +18,7 @@
         "@typescript-eslint/no-unused-vars": "error",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/explicit-module-boundary-types": "off",
+        "@typescript-eslint/consistent-type-imports": "error",
         "prettier/prettier": [
             "error",
             {
diff --git a/packages/serialization/text/.eslintrc.json b/packages/serialization/text/.eslintrc.json
index e73e74ab4..80ab9b397 100644
--- a/packages/serialization/text/.eslintrc.json
+++ b/packages/serialization/text/.eslintrc.json
@@ -18,6 +18,7 @@
         "@typescript-eslint/no-unused-vars": "error",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/explicit-module-boundary-types": "off",
+        "@typescript-eslint/consistent-type-imports": "error",
         "prettier/prettier": [
             "error",
             {

From 9bb80d10f0678a43e9772eb4cfe4620d1d1ff9c6 Mon Sep 17 00:00:00 2001
From: koros <korosmatick@gmail.com>
Date: Fri, 6 Oct 2023 23:01:58 +0300
Subject: [PATCH 09/11] fix build issue

---
 .../multipart/src/multipartSerializationWriter.ts    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/serialization/multipart/src/multipartSerializationWriter.ts b/packages/serialization/multipart/src/multipartSerializationWriter.ts
index 606678dfa..d1c3f95b9 100644
--- a/packages/serialization/multipart/src/multipartSerializationWriter.ts
+++ b/packages/serialization/multipart/src/multipartSerializationWriter.ts
@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions */
-import type {
-  DateOnly,
-  Duration,
+import {
+  type DateOnly,
+  type Duration,
   MultipartBody,
   type Parsable,
-  type SerializationWriter
-  ModelSerializerFunction,
-  TimeOnly } from "@microsoft/kiota-abstractions";
+  type SerializationWriter,
+  type ModelSerializerFunction,
+  type TimeOnly } from "@microsoft/kiota-abstractions";
 import type { Guid } from "guid-typescript";
 
 /** Serialization writer for multipart/form-data */

From 93eb3096e274873309fef1c24dab910a6bf470e4 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 10 Oct 2023 10:40:51 -0400
Subject: [PATCH 10/11] - refreshes example client

---
 packages/test/generatedCode/apiClient.ts      |  18 +-
 packages/test/generatedCode/kiota-lock.json   |   5 +-
 .../test/generatedCode/models/attachment.ts   |  41 ++++-
 .../models/attachmentCollectionResponse.ts    |  28 ++-
 .../test/generatedCode/models/bodyType.ts     |   2 +
 ...ollectionResponseFromDiscriminatorValue.ts |   8 -
 .../createAttachmentFromDiscriminatorValue.ts |   8 -
 ...eDateTimeTimeZoneFromDiscriminatorValue.ts |   8 -
 ...reateEmailAddressFromDiscriminatorValue.ts |   8 -
 .../createEntityFromDiscriminatorValue.ts     |  18 --
 ...ollectionResponseFromDiscriminatorValue.ts |   8 -
 .../createExtensionFromDiscriminatorValue.ts  |   8 -
 ...reateFollowupFlagFromDiscriminatorValue.ts |   8 -
 ...nceClassificationFromDiscriminatorValue.ts |   8 -
 ...ollectionResponseFromDiscriminatorValue.ts |   8 -
 ...ificationOverrideFromDiscriminatorValue.ts |   8 -
 ...rnetMessageHeaderFromDiscriminatorValue.ts |   8 -
 .../createItemBodyFromDiscriminatorValue.ts   |   8 -
 ...ollectionResponseFromDiscriminatorValue.ts |   8 -
 .../createMailFolderFromDiscriminatorValue.ts |   8 -
 ...ollectionResponseFromDiscriminatorValue.ts |   8 -
 .../createMessageFromDiscriminatorValue.ts    |   8 -
 ...essageRuleActionsFromDiscriminatorValue.ts |   8 -
 ...ollectionResponseFromDiscriminatorValue.ts |   8 -
 ...createMessageRuleFromDiscriminatorValue.ts |   8 -
 ...ageRulePredicatesFromDiscriminatorValue.ts |   8 -
 ...yExtendedPropertyFromDiscriminatorValue.ts |   8 -
 ...createOutlookItemFromDiscriminatorValue.ts |   8 -
 .../createRecipientFromDiscriminatorValue.ts  |   8 -
 ...yExtendedPropertyFromDiscriminatorValue.ts |   8 -
 .../createSizeRangeFromDiscriminatorValue.ts  |   8 -
 .../generatedCode/models/dateTimeTimeZone.ts  |  26 ++-
 .../models/deserializeIntoAttachment.ts       |  14 --
 ...rializeIntoAttachmentCollectionResponse.ts |  12 --
 .../models/deserializeIntoDateTimeTimeZone.ts |   9 -
 .../models/deserializeIntoEmailAddress.ts     |   9 -
 .../models/deserializeIntoEntity.ts           |   8 -
 .../models/deserializeIntoExtension.ts        |   9 -
 ...erializeIntoExtensionCollectionResponse.ts |  12 --
 .../models/deserializeIntoFollowupFlag.ts     |  15 --
 .../deserializeIntoInferenceClassification.ts |  13 --
 ...lizeIntoInferenceClassificationOverride.ts |  15 --
 ...lassificationOverrideCollectionResponse.ts |  12 --
 .../deserializeIntoInternetMessageHeader.ts   |   9 -
 .../models/deserializeIntoItemBody.ts         |  10 --
 .../models/deserializeIntoMailFolder.ts       |  34 ----
 ...rializeIntoMailFolderCollectionResponse.ts |  12 --
 .../models/deserializeIntoMessage.ts          |  65 -------
 ...eserializeIntoMessageCollectionResponse.ts |  12 --
 .../models/deserializeIntoMessageRule.ts      |  23 ---
 .../deserializeIntoMessageRuleActions.ts      |  22 ---
 ...ializeIntoMessageRuleCollectionResponse.ts |  12 --
 .../deserializeIntoMessageRulePredicates.ts   |  46 -----
 ...izeIntoMultiValueLegacyExtendedProperty.ts |  10 --
 .../models/deserializeIntoOutlookItem.ts      |  13 --
 .../models/deserializeIntoRecipient.ts        |  11 --
 ...zeIntoSingleValueLegacyExtendedProperty.ts |  10 --
 .../models/deserializeIntoSizeRange.ts        |   9 -
 .../test/generatedCode/models/emailAddress.ts |  26 ++-
 packages/test/generatedCode/models/entity.ts  |  34 +++-
 .../test/generatedCode/models/extension.ts    |  21 ++-
 .../models/extensionCollectionResponse.ts     |  28 ++-
 .../test/generatedCode/models/followupFlag.ts |  38 ++++-
 .../models/followupFlagStatus.ts              |   2 +
 .../test/generatedCode/models/importance.ts   |   2 +
 packages/test/generatedCode/models/index.ts   |  78 ---------
 .../models/inferenceClassification.ts         |  27 ++-
 .../models/inferenceClassificationOverride.ts |  33 +++-
 ...lassificationOverrideCollectionResponse.ts |  28 ++-
 .../models/inferenceClassificationType.ts     |   2 +
 .../models/internetMessageHeader.ts           |  26 ++-
 .../test/generatedCode/models/itemBody.ts     |  28 ++-
 .../test/generatedCode/models/mailFolder.ts   |  73 ++++++--
 .../models/mailFolderCollectionResponse.ts    |  28 ++-
 packages/test/generatedCode/models/message.ts | 161 +++++++++++++-----
 .../generatedCode/models/messageActionFlag.ts |   2 +
 .../models/messageCollectionResponse.ts       |  28 ++-
 .../test/generatedCode/models/messageRule.ts  |  57 +++++--
 .../models/messageRuleActions.ts              |  66 +++++--
 .../models/messageRuleCollectionResponse.ts   |  28 ++-
 .../models/messageRulePredicates.ts           | 148 ++++++++++++----
 .../multiValueLegacyExtendedProperty.ts       |  25 ++-
 .../models/oDataErrors/errorDetails.ts        |  42 +++++
 .../generatedCode/models/oDataErrors/index.ts |   4 +
 .../models/oDataErrors/innerError.ts          |  24 +++
 .../models/oDataErrors/mainError.ts           |  56 ++++++
 .../models/oDataErrors/oDataError.ts          |  31 ++++
 .../test/generatedCode/models/outlookItem.ts  |  38 ++++-
 .../test/generatedCode/models/recipient.ts    |  24 ++-
 .../test/generatedCode/models/sensitivity.ts  |   2 +
 .../models/serializeAttachment.ts             |  12 --
 .../serializeAttachmentCollectionResponse.ts  |  10 --
 .../models/serializeDateTimeTimeZone.ts       |   8 -
 .../models/serializeEmailAddress.ts           |   8 -
 .../generatedCode/models/serializeEntity.ts   |   7 -
 .../models/serializeExtension.ts              |   7 -
 .../serializeExtensionCollectionResponse.ts   |  10 --
 .../models/serializeFollowupFlag.ts           |  13 --
 .../serializeInferenceClassification.ts       |  10 --
 ...erializeInferenceClassificationOverride.ts |  12 --
 ...lassificationOverrideCollectionResponse.ts |  10 --
 .../models/serializeInternetMessageHeader.ts  |   8 -
 .../generatedCode/models/serializeItemBody.ts |   9 -
 .../models/serializeMailFolder.ts             |  26 ---
 .../serializeMailFolderCollectionResponse.ts  |  10 --
 .../generatedCode/models/serializeMessage.ts  |  55 ------
 .../serializeMessageCollectionResponse.ts     |  10 --
 .../models/serializeMessageRule.ts            |  19 ---
 .../models/serializeMessageRuleActions.ts     |  20 ---
 .../serializeMessageRuleCollectionResponse.ts |  10 --
 .../models/serializeMessageRulePredicates.ts  |  43 -----
 ...rializeMultiValueLegacyExtendedProperty.ts |   8 -
 .../models/serializeOutlookItem.ts            |  11 --
 .../models/serializeRecipient.ts              |   9 -
 ...ializeSingleValueLegacyExtendedProperty.ts |   8 -
 .../models/serializeSizeRange.ts              |   8 -
 .../singleValueLegacyExtendedProperty.ts      |  25 ++-
 .../test/generatedCode/models/sizeRange.ts    |  26 ++-
 .../item/inferenceClassification/index.ts     |   4 +-
 .../inferenceClassificationRequestBuilder.ts  |  74 ++++++--
 ...icationRequestBuilderGetQueryParameters.ts |   7 -
 ...onRequestBuilderGetRequestConfiguration.ts |  17 --
 ...RequestBuilderPatchRequestConfiguration.ts |  12 --
 .../overrides/count/countRequestBuilder.ts    |  46 ++++-
 .../countRequestBuilderGetQueryParameters.ts  |   7 -
 ...ntRequestBuilderGetRequestConfiguration.ts |  17 --
 .../overrides/count/index.ts                  |   3 +-
 .../overrides/index.ts                        |   4 +-
 .../overrides/item/index.ts                   |   5 +-
 ...lassificationOverrideItemRequestBuilder.ts |  85 +++++++--
 ...equestBuilderDeleteRequestConfiguration.ts |  12 --
 ...ideItemRequestBuilderGetQueryParameters.ts |   7 -
 ...emRequestBuilderGetRequestConfiguration.ts |  17 --
 ...RequestBuilderPatchRequestConfiguration.ts |  12 --
 .../overrides/overridesRequestBuilder.ts      |  96 +++++++++--
 ...erridesRequestBuilderGetQueryParameters.ts |  27 ---
 ...esRequestBuilderGetRequestConfiguration.ts |  17 --
 ...sRequestBuilderPostRequestConfiguration.ts |  12 --
 .../mailFolders/count/countRequestBuilder.ts  |  46 ++++-
 .../countRequestBuilderGetQueryParameters.ts  |   7 -
 ...ntRequestBuilderGetRequestConfiguration.ts |  17 --
 .../users/item/mailFolders/count/index.ts     |   3 +-
 .../users/item/mailFolders/index.ts           |   4 +-
 .../childFoldersRequestBuilder.ts             | 104 +++++++++--
 ...FoldersRequestBuilderGetQueryParameters.ts |  35 ----
 ...rsRequestBuilderGetRequestConfiguration.ts |  17 --
 ...sRequestBuilderPostRequestConfiguration.ts |  12 --
 .../childFolders/count/countRequestBuilder.ts |  46 ++++-
 .../countRequestBuilderGetQueryParameters.ts  |   7 -
 ...ntRequestBuilderGetRequestConfiguration.ts |  17 --
 .../item/childFolders/count/index.ts          |   3 +-
 .../mailFolders/item/childFolders/index.ts    |   4 +-
 .../item/childFolders/item/index.ts           |   5 +-
 .../item/mailFolderItemRequestBuilder.ts      |  97 +++++++++--
 ...equestBuilderDeleteRequestConfiguration.ts |  12 --
 ...derItemRequestBuilderGetQueryParameters.ts |  15 --
 ...emRequestBuilderGetRequestConfiguration.ts |  17 --
 ...RequestBuilderPatchRequestConfiguration.ts |  12 --
 .../messageRules/count/countRequestBuilder.ts |  46 ++++-
 .../countRequestBuilderGetQueryParameters.ts  |   7 -
 ...ntRequestBuilderGetRequestConfiguration.ts |  17 --
 .../item/messageRules/count/index.ts          |   3 +-
 .../childFolders/item/messageRules/index.ts   |   4 +-
 .../item/messageRules/item/index.ts           |   5 +-
 .../item/messageRuleItemRequestBuilder.ts     |  85 +++++++--
 ...equestBuilderDeleteRequestConfiguration.ts |  12 --
 ...uleItemRequestBuilderGetQueryParameters.ts |   7 -
 ...emRequestBuilderGetRequestConfiguration.ts |  17 --
 ...RequestBuilderPatchRequestConfiguration.ts |  12 --
 .../messageRulesRequestBuilder.ts             | 100 +++++++++--
 ...geRulesRequestBuilderGetQueryParameters.ts |  27 ---
 ...esRequestBuilderGetRequestConfiguration.ts |  17 --
 ...sRequestBuilderPostRequestConfiguration.ts |  12 --
 .../messages/count/countRequestBuilder.ts     |  50 +++++-
 .../countRequestBuilderGetQueryParameters.ts  |  11 --
 ...ntRequestBuilderGetRequestConfiguration.ts |  17 --
 .../childFolders/item/messages/count/index.ts |   3 +-
 .../item/childFolders/item/messages/index.ts  |   4 +-
 .../attachments/attachmentsRequestBuilder.ts  | 102 ++++++++---
 ...chmentsRequestBuilderGetQueryParameters.ts |  23 ---
 ...tsRequestBuilderGetRequestConfiguration.ts |  17 --
 ...sRequestBuilderPostRequestConfiguration.ts |  12 --
 .../attachments/count/countRequestBuilder.ts  |  46 ++++-
 .../countRequestBuilderGetQueryParameters.ts  |   7 -
 ...ntRequestBuilderGetRequestConfiguration.ts |  17 --
 .../messages/item/attachments/count/index.ts  |   3 +-
 .../item/messages/item/attachments/index.ts   |   4 +-
 .../item/attachmentItemRequestBuilder.ts      |  75 ++++++--
 ...equestBuilderDeleteRequestConfiguration.ts |  12 --
 ...entItemRequestBuilderGetQueryParameters.ts |  11 --
 ...emRequestBuilderGetRequestConfiguration.ts |  17 --
 .../messages/item/attachments/item/index.ts   |   4 +-
 .../extensions/count/countRequestBuilder.ts   |  46 ++++-
 .../countRequestBuilderGetQueryParameters.ts  |   7 -
 ...ntRequestBuilderGetRequestConfiguration.ts |  17 --
 .../messages/item/extensions/count/index.ts   |   3 +-
 .../extensions/extensionsRequestBuilder.ts    | 100 +++++++++--
 ...ensionsRequestBuilderGetQueryParameters.ts |  31 ----
 ...nsRequestBuilderGetRequestConfiguration.ts |  17 --
 ...sRequestBuilderPostRequestConfiguration.ts |  12 --
 .../item/messages/item/extensions/index.ts    |   4 +-
 .../item/extensionItemRequestBuilder.ts       |  89 ++++++++--
 ...equestBuilderDeleteRequestConfiguration.ts |  12 --
 ...ionItemRequestBuilderGetQueryParameters.ts |  11 --
 ...emRequestBuilderGetRequestConfiguration.ts |  17 --
 ...RequestBuilderPatchRequestConfiguration.ts |  12 --
 .../messages/item/extensions/item/index.ts    |   5 +-
 .../childFolders/item/messages/item/index.ts  |   5 +-
 .../item/messageItemRequestBuilder.ts         |  95 +++++++++--
 ...equestBuilderDeleteRequestConfiguration.ts |  12 --
 ...ageItemRequestBuilderGetQueryParameters.ts |  11 --
 ...emRequestBuilderGetRequestConfiguration.ts |  17 --
 ...RequestBuilderPatchRequestConfiguration.ts |  12 --
 .../item/value/contentRequestBuilder.ts       |  53 +++++-
 ...ntRequestBuilderGetRequestConfiguration.ts |  12 --
 ...ntRequestBuilderPutRequestConfiguration.ts |  12 --
 .../item/messages/item/value/index.ts         |   3 +-
 .../item/messages/messagesRequestBuilder.ts   | 104 +++++++++--
 ...essagesRequestBuilderGetQueryParameters.ts |  35 ----
 ...esRequestBuilderGetRequestConfiguration.ts |  17 --
 ...sRequestBuilderPostRequestConfiguration.ts |  12 --
 .../users/item/mailFolders/item/index.ts      |   5 +-
 .../item/mailFolderItemRequestBuilder.ts      |  99 +++++++++--
 ...equestBuilderDeleteRequestConfiguration.ts |  12 --
 ...derItemRequestBuilderGetQueryParameters.ts |  15 --
 ...emRequestBuilderGetRequestConfiguration.ts |  17 --
 ...RequestBuilderPatchRequestConfiguration.ts |  12 --
 .../messageRules/count/countRequestBuilder.ts |  46 ++++-
 .../countRequestBuilderGetQueryParameters.ts  |   7 -
 ...ntRequestBuilderGetRequestConfiguration.ts |  17 --
 .../item/messageRules/count/index.ts          |   3 +-
 .../mailFolders/item/messageRules/index.ts    |   4 +-
 .../item/messageRules/item/index.ts           |   5 +-
 .../item/messageRuleItemRequestBuilder.ts     |  85 +++++++--
 ...equestBuilderDeleteRequestConfiguration.ts |  12 --
 ...uleItemRequestBuilderGetQueryParameters.ts |   7 -
 ...emRequestBuilderGetRequestConfiguration.ts |  17 --
 ...RequestBuilderPatchRequestConfiguration.ts |  12 --
 .../messageRulesRequestBuilder.ts             | 100 +++++++++--
 ...geRulesRequestBuilderGetQueryParameters.ts |  27 ---
 ...esRequestBuilderGetRequestConfiguration.ts |  17 --
 ...sRequestBuilderPostRequestConfiguration.ts |  12 --
 .../messages/count/countRequestBuilder.ts     |  50 +++++-
 .../countRequestBuilderGetQueryParameters.ts  |  11 --
 ...ntRequestBuilderGetRequestConfiguration.ts |  17 --
 .../mailFolders/item/messages/count/index.ts  |   3 +-
 .../item/mailFolders/item/messages/index.ts   |   4 +-
 .../attachments/attachmentsRequestBuilder.ts  | 102 ++++++++---
 ...chmentsRequestBuilderGetQueryParameters.ts |  23 ---
 ...tsRequestBuilderGetRequestConfiguration.ts |  17 --
 ...sRequestBuilderPostRequestConfiguration.ts |  12 --
 .../attachments/count/countRequestBuilder.ts  |  46 ++++-
 .../countRequestBuilderGetQueryParameters.ts  |   7 -
 ...ntRequestBuilderGetRequestConfiguration.ts |  17 --
 .../messages/item/attachments/count/index.ts  |   3 +-
 .../item/messages/item/attachments/index.ts   |   4 +-
 .../item/attachmentItemRequestBuilder.ts      |  75 ++++++--
 ...equestBuilderDeleteRequestConfiguration.ts |  12 --
 ...entItemRequestBuilderGetQueryParameters.ts |  11 --
 ...emRequestBuilderGetRequestConfiguration.ts |  17 --
 .../messages/item/attachments/item/index.ts   |   4 +-
 .../extensions/count/countRequestBuilder.ts   |  46 ++++-
 .../countRequestBuilderGetQueryParameters.ts  |   7 -
 ...ntRequestBuilderGetRequestConfiguration.ts |  17 --
 .../messages/item/extensions/count/index.ts   |   3 +-
 .../extensions/extensionsRequestBuilder.ts    | 100 +++++++++--
 ...ensionsRequestBuilderGetQueryParameters.ts |  31 ----
 ...nsRequestBuilderGetRequestConfiguration.ts |  17 --
 ...sRequestBuilderPostRequestConfiguration.ts |  12 --
 .../item/messages/item/extensions/index.ts    |   4 +-
 .../item/extensionItemRequestBuilder.ts       |  89 ++++++++--
 ...equestBuilderDeleteRequestConfiguration.ts |  12 --
 ...ionItemRequestBuilderGetQueryParameters.ts |  11 --
 ...emRequestBuilderGetRequestConfiguration.ts |  17 --
 ...RequestBuilderPatchRequestConfiguration.ts |  12 --
 .../messages/item/extensions/item/index.ts    |   5 +-
 .../mailFolders/item/messages/item/index.ts   |   5 +-
 .../item/messageItemRequestBuilder.ts         |  95 +++++++++--
 ...equestBuilderDeleteRequestConfiguration.ts |  12 --
 ...ageItemRequestBuilderGetQueryParameters.ts |  11 --
 ...emRequestBuilderGetRequestConfiguration.ts |  17 --
 ...RequestBuilderPatchRequestConfiguration.ts |  12 --
 .../item/value/contentRequestBuilder.ts       |  53 +++++-
 ...ntRequestBuilderGetRequestConfiguration.ts |  12 --
 ...ntRequestBuilderPutRequestConfiguration.ts |  12 --
 .../item/messages/item/value/index.ts         |   3 +-
 .../item/messages/messagesRequestBuilder.ts   | 104 +++++++++--
 ...essagesRequestBuilderGetQueryParameters.ts |  35 ----
 ...esRequestBuilderGetRequestConfiguration.ts |  17 --
 ...sRequestBuilderPostRequestConfiguration.ts |  12 --
 .../mailFolders/mailFoldersRequestBuilder.ts  | 104 +++++++++--
 ...FoldersRequestBuilderGetQueryParameters.ts |  35 ----
 ...rsRequestBuilderGetRequestConfiguration.ts |  17 --
 ...sRequestBuilderPostRequestConfiguration.ts |  12 --
 .../messages/count/countRequestBuilder.ts     |  50 +++++-
 .../countRequestBuilderGetQueryParameters.ts  |  11 --
 ...ntRequestBuilderGetRequestConfiguration.ts |  17 --
 .../users/item/messages/count/index.ts        |   3 +-
 .../users/item/messages/index.ts              |   4 +-
 .../attachments/attachmentsRequestBuilder.ts  | 102 ++++++++---
 ...chmentsRequestBuilderGetQueryParameters.ts |  23 ---
 ...tsRequestBuilderGetRequestConfiguration.ts |  17 --
 ...sRequestBuilderPostRequestConfiguration.ts |  12 --
 .../attachments/count/countRequestBuilder.ts  |  46 ++++-
 .../countRequestBuilderGetQueryParameters.ts  |   7 -
 ...ntRequestBuilderGetRequestConfiguration.ts |  17 --
 .../messages/item/attachments/count/index.ts  |   3 +-
 .../item/messages/item/attachments/index.ts   |   4 +-
 .../item/attachmentItemRequestBuilder.ts      |  75 ++++++--
 ...equestBuilderDeleteRequestConfiguration.ts |  12 --
 ...entItemRequestBuilderGetQueryParameters.ts |  11 --
 ...emRequestBuilderGetRequestConfiguration.ts |  17 --
 .../messages/item/attachments/item/index.ts   |   4 +-
 .../extensions/count/countRequestBuilder.ts   |  46 ++++-
 .../countRequestBuilderGetQueryParameters.ts  |   7 -
 ...ntRequestBuilderGetRequestConfiguration.ts |  17 --
 .../messages/item/extensions/count/index.ts   |   3 +-
 .../extensions/extensionsRequestBuilder.ts    | 100 +++++++++--
 ...ensionsRequestBuilderGetQueryParameters.ts |  31 ----
 ...nsRequestBuilderGetRequestConfiguration.ts |  17 --
 ...sRequestBuilderPostRequestConfiguration.ts |  12 --
 .../item/messages/item/extensions/index.ts    |   4 +-
 .../item/extensionItemRequestBuilder.ts       |  89 ++++++++--
 ...equestBuilderDeleteRequestConfiguration.ts |  12 --
 ...ionItemRequestBuilderGetQueryParameters.ts |  11 --
 ...emRequestBuilderGetRequestConfiguration.ts |  17 --
 ...RequestBuilderPatchRequestConfiguration.ts |  12 --
 .../messages/item/extensions/item/index.ts    |   5 +-
 .../users/item/messages/item/index.ts         |   5 +-
 .../item/messageItemRequestBuilder.ts         | 105 ++++++++++--
 ...equestBuilderDeleteRequestConfiguration.ts |  12 --
 ...ageItemRequestBuilderGetQueryParameters.ts |  15 --
 ...emRequestBuilderGetRequestConfiguration.ts |  17 --
 ...RequestBuilderPatchRequestConfiguration.ts |  12 --
 .../item/value/contentRequestBuilder.ts       |  55 +++++-
 ...ntRequestBuilderGetRequestConfiguration.ts |  12 --
 ...ntRequestBuilderPutRequestConfiguration.ts |  12 --
 .../users/item/messages/item/value/index.ts   |   3 +-
 .../item/messages/messagesRequestBuilder.ts   | 116 +++++++++++--
 ...essagesRequestBuilderGetQueryParameters.ts |  39 -----
 ...esRequestBuilderGetRequestConfiguration.ts |  17 --
 ...sRequestBuilderPostRequestConfiguration.ts |  12 --
 .../users/item/userItemRequestBuilder.ts      |  14 +-
 .../users/usersRequestBuilder.ts              |  10 +-
 344 files changed, 4228 insertions(+), 3899 deletions(-)
 delete mode 100644 packages/test/generatedCode/models/createAttachmentCollectionResponseFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createAttachmentFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createDateTimeTimeZoneFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createEmailAddressFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createEntityFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createExtensionCollectionResponseFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createExtensionFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createFollowupFlagFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createInferenceClassificationFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createInferenceClassificationOverrideFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createInternetMessageHeaderFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createItemBodyFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createMailFolderCollectionResponseFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createMailFolderFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createMessageCollectionResponseFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createMessageFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createMessageRuleActionsFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createMessageRuleCollectionResponseFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createMessageRuleFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createMessageRulePredicatesFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createMultiValueLegacyExtendedPropertyFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createOutlookItemFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createRecipientFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createSingleValueLegacyExtendedPropertyFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/createSizeRangeFromDiscriminatorValue.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoAttachment.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoAttachmentCollectionResponse.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoDateTimeTimeZone.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoEmailAddress.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoEntity.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoExtension.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoExtensionCollectionResponse.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoFollowupFlag.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoInferenceClassification.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoInferenceClassificationOverride.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoInferenceClassificationOverrideCollectionResponse.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoInternetMessageHeader.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoItemBody.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoMailFolder.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoMailFolderCollectionResponse.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoMessage.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoMessageCollectionResponse.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoMessageRule.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoMessageRuleActions.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoMessageRuleCollectionResponse.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoMessageRulePredicates.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoMultiValueLegacyExtendedProperty.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoOutlookItem.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoRecipient.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoSingleValueLegacyExtendedProperty.ts
 delete mode 100644 packages/test/generatedCode/models/deserializeIntoSizeRange.ts
 create mode 100644 packages/test/generatedCode/models/oDataErrors/errorDetails.ts
 create mode 100644 packages/test/generatedCode/models/oDataErrors/index.ts
 create mode 100644 packages/test/generatedCode/models/oDataErrors/innerError.ts
 create mode 100644 packages/test/generatedCode/models/oDataErrors/mainError.ts
 create mode 100644 packages/test/generatedCode/models/oDataErrors/oDataError.ts
 delete mode 100644 packages/test/generatedCode/models/serializeAttachment.ts
 delete mode 100644 packages/test/generatedCode/models/serializeAttachmentCollectionResponse.ts
 delete mode 100644 packages/test/generatedCode/models/serializeDateTimeTimeZone.ts
 delete mode 100644 packages/test/generatedCode/models/serializeEmailAddress.ts
 delete mode 100644 packages/test/generatedCode/models/serializeEntity.ts
 delete mode 100644 packages/test/generatedCode/models/serializeExtension.ts
 delete mode 100644 packages/test/generatedCode/models/serializeExtensionCollectionResponse.ts
 delete mode 100644 packages/test/generatedCode/models/serializeFollowupFlag.ts
 delete mode 100644 packages/test/generatedCode/models/serializeInferenceClassification.ts
 delete mode 100644 packages/test/generatedCode/models/serializeInferenceClassificationOverride.ts
 delete mode 100644 packages/test/generatedCode/models/serializeInferenceClassificationOverrideCollectionResponse.ts
 delete mode 100644 packages/test/generatedCode/models/serializeInternetMessageHeader.ts
 delete mode 100644 packages/test/generatedCode/models/serializeItemBody.ts
 delete mode 100644 packages/test/generatedCode/models/serializeMailFolder.ts
 delete mode 100644 packages/test/generatedCode/models/serializeMailFolderCollectionResponse.ts
 delete mode 100644 packages/test/generatedCode/models/serializeMessage.ts
 delete mode 100644 packages/test/generatedCode/models/serializeMessageCollectionResponse.ts
 delete mode 100644 packages/test/generatedCode/models/serializeMessageRule.ts
 delete mode 100644 packages/test/generatedCode/models/serializeMessageRuleActions.ts
 delete mode 100644 packages/test/generatedCode/models/serializeMessageRuleCollectionResponse.ts
 delete mode 100644 packages/test/generatedCode/models/serializeMessageRulePredicates.ts
 delete mode 100644 packages/test/generatedCode/models/serializeMultiValueLegacyExtendedProperty.ts
 delete mode 100644 packages/test/generatedCode/models/serializeOutlookItem.ts
 delete mode 100644 packages/test/generatedCode/models/serializeRecipient.ts
 delete mode 100644 packages/test/generatedCode/models/serializeSingleValueLegacyExtendedProperty.ts
 delete mode 100644 packages/test/generatedCode/models/serializeSizeRange.ts
 delete mode 100644 packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderPatchRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderPostRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderPostRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderDeleteRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderPatchRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderDeleteRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderPatchRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderPostRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderDeleteRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderPatchRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderDeleteRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderPatchRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderPostRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderPostRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/count/countRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/messagesRequestBuilderGetQueryParameters.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
 delete mode 100644 packages/test/generatedCode/users/item/messages/messagesRequestBuilderPostRequestConfiguration.ts

diff --git a/packages/test/generatedCode/apiClient.ts b/packages/test/generatedCode/apiClient.ts
index 95dff00f9..84660ecdc 100644
--- a/packages/test/generatedCode/apiClient.ts
+++ b/packages/test/generatedCode/apiClient.ts
@@ -1,10 +1,12 @@
-import {UsersRequestBuilder} from './users/usersRequestBuilder';
-import {BaseRequestBuilder, ParseNodeFactoryRegistry, SerializationWriterFactoryRegistry, enableBackingStoreForSerializationWriterFactory, registerDefaultDeserializer, registerDefaultSerializer} from '@microsoft/kiota-abstractions';
-import type {RequestAdapter} from '@microsoft/kiota-abstractions';
-import {FormParseNodeFactory, FormSerializationWriterFactory} from '@microsoft/kiota-serialization-form';
-import {JsonParseNodeFactory, JsonSerializationWriterFactory} from '@microsoft/kiota-serialization-json';
-import {MultipartSerializationWriterFactory} from '@microsoft/kiota-serialization-multipart';
-import {TextParseNodeFactory, TextSerializationWriterFactory} from '@microsoft/kiota-serialization-text';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { UsersRequestBuilder } from './users/usersRequestBuilder';
+import { BaseRequestBuilder, enableBackingStoreForSerializationWriterFactory, ParseNodeFactoryRegistry, registerDefaultDeserializer, registerDefaultSerializer, SerializationWriterFactoryRegistry, type RequestAdapter } from '@microsoft/kiota-abstractions';
+import { FormParseNodeFactory, FormSerializationWriterFactory } from '@microsoft/kiota-serialization-form';
+import { JsonParseNodeFactory, JsonSerializationWriterFactory } from '@microsoft/kiota-serialization-json';
+import { MultipartSerializationWriterFactory } from '@microsoft/kiota-serialization-multipart';
+import { TextParseNodeFactory, TextSerializationWriterFactory } from '@microsoft/kiota-serialization-text';
 
 /**
  * The main entry point of the SDK, exposes the configuration and the fluent API.
@@ -35,3 +37,5 @@ export class ApiClient extends BaseRequestBuilder {
         this.pathParameters["baseurl"] = requestAdapter.baseUrl;
     };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/kiota-lock.json b/packages/test/generatedCode/kiota-lock.json
index 819ea166b..9d12ebcc7 100644
--- a/packages/test/generatedCode/kiota-lock.json
+++ b/packages/test/generatedCode/kiota-lock.json
@@ -1,12 +1,13 @@
 {
-  "descriptionHash": "BCA660F549E6B77563972121CEBDD92906DA590C37483649B859B2179089FD72457541C7D14A626F0144756386186D90CC2FE47E7DBF4A483C47507A82971D4C",
+  "descriptionHash": "B3F00AC94273BF07D188EF02F7B73AACEA7BD22C6FFEB8A943C8E331209EEE8FEC91B3EC1E5306625F4F1BB858A9DCA3B754FB22475A6105301A8B9216D02CA3",
   "descriptionLocation": "https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-powershell/dev/openApiDocs/v1.0/Mail.yml",
   "lockFileVersion": "1.0.0",
-  "kiotaVersion": "1.6.0",
+  "kiotaVersion": "1.8.0",
   "clientClassName": "ApiClient",
   "clientNamespaceName": "ApiSdk",
   "language": "TypeScript",
   "usesBackingStore": false,
+  "excludeBackwardCompatible": false,
   "includeAdditionalData": true,
   "serializers": [
     "Microsoft.Kiota.Serialization.Json.JsonSerializationWriterFactory",
diff --git a/packages/test/generatedCode/models/attachment.ts b/packages/test/generatedCode/models/attachment.ts
index 5822b0c31..efc7014e4 100644
--- a/packages/test/generatedCode/models/attachment.ts
+++ b/packages/test/generatedCode/models/attachment.ts
@@ -1,25 +1,52 @@
-import type {Entity} from './entity';
-import type {Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { deserializeIntoEntity, serializeEntity, type Entity } from './entity';
+import { type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
 export interface Attachment extends Entity, Parsable {
     /**
      * The MIME type.
      */
-    contentType?: string | undefined;
+    contentType?: string;
     /**
      * true if the attachment is an inline attachment; otherwise, false.
      */
-    isInline?: boolean | undefined;
+    isInline?: boolean;
     /**
      * The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z
      */
-    lastModifiedDateTime?: Date | undefined;
+    lastModifiedDateTime?: Date;
     /**
      * The attachment's file name.
      */
-    name?: string | undefined;
+    name?: string;
     /**
      * The length of the attachment in bytes.
      */
-    size?: number | undefined;
+    size?: number;
 }
+export function createAttachmentFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoAttachment;
+}
+export function deserializeIntoAttachment(attachment: Attachment | undefined = {} as Attachment) : Record<string, (node: ParseNode) => void> {
+    return {
+        ...deserializeIntoEntity(attachment),
+        "contentType": n => { attachment.contentType = n.getStringValue(); },
+        "isInline": n => { attachment.isInline = n.getBooleanValue(); },
+        "lastModifiedDateTime": n => { attachment.lastModifiedDateTime = n.getDateValue(); },
+        "name": n => { attachment.name = n.getStringValue(); },
+        "size": n => { attachment.size = n.getNumberValue(); },
+    }
+}
+export function serializeAttachment(writer: SerializationWriter, attachment: Attachment | undefined = {} as Attachment) : void {
+        serializeEntity(writer, attachment)
+        writer.writeStringValue("contentType", attachment.contentType);
+        writer.writeBooleanValue("isInline", attachment.isInline);
+        writer.writeDateValue("lastModifiedDateTime", attachment.lastModifiedDateTime);
+        writer.writeStringValue("name", attachment.name);
+        writer.writeNumberValue("size", attachment.size);
+}
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/attachmentCollectionResponse.ts b/packages/test/generatedCode/models/attachmentCollectionResponse.ts
index 110aab93f..4102ac417 100644
--- a/packages/test/generatedCode/models/attachmentCollectionResponse.ts
+++ b/packages/test/generatedCode/models/attachmentCollectionResponse.ts
@@ -1,5 +1,8 @@
-import type {Attachment} from './attachment';
-import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createAttachmentFromDiscriminatorValue, serializeAttachment, type Attachment } from './attachment';
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
 export interface AttachmentCollectionResponse extends AdditionalDataHolder, Parsable {
     /**
@@ -9,9 +12,26 @@ export interface AttachmentCollectionResponse extends AdditionalDataHolder, Pars
     /**
      * The OdataNextLink property
      */
-    odataNextLink?: string | undefined;
+    odataNextLink?: string;
     /**
      * The value property
      */
-    value?: Attachment[] | undefined;
+    value?: Attachment[];
 }
+export function createAttachmentCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoAttachmentCollectionResponse;
+}
+export function deserializeIntoAttachmentCollectionResponse(attachmentCollectionResponse: AttachmentCollectionResponse | undefined = {} as AttachmentCollectionResponse) : Record<string, (node: ParseNode) => void> {
+    return {
+        "@odata.nextLink": n => { attachmentCollectionResponse.odataNextLink = n.getStringValue(); },
+        "value": n => { attachmentCollectionResponse.value = n.getCollectionOfObjectValues<Attachment>(createAttachmentFromDiscriminatorValue); },
+    }
+}
+export function serializeAttachmentCollectionResponse(writer: SerializationWriter, attachmentCollectionResponse: AttachmentCollectionResponse | undefined = {} as AttachmentCollectionResponse) : void {
+        writer.writeStringValue("@odata.nextLink", attachmentCollectionResponse.odataNextLink);
+        writer.writeCollectionOfObjectValues<Attachment>("value", attachmentCollectionResponse.value, );
+        writer.writeAdditionalData(attachmentCollectionResponse.additionalData);
+}
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/bodyType.ts b/packages/test/generatedCode/models/bodyType.ts
index aa3525a4b..5ac1b3532 100644
--- a/packages/test/generatedCode/models/bodyType.ts
+++ b/packages/test/generatedCode/models/bodyType.ts
@@ -2,3 +2,5 @@ export enum BodyType {
     Text = "text",
     Html = "html",
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/createAttachmentCollectionResponseFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createAttachmentCollectionResponseFromDiscriminatorValue.ts
deleted file mode 100644
index 0c0b4fe51..000000000
--- a/packages/test/generatedCode/models/createAttachmentCollectionResponseFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoAttachmentCollectionResponse} from './deserializeIntoAttachmentCollectionResponse';
-import {AttachmentCollectionResponse} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createAttachmentCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoAttachmentCollectionResponse;
-}
diff --git a/packages/test/generatedCode/models/createAttachmentFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createAttachmentFromDiscriminatorValue.ts
deleted file mode 100644
index 5eb84d84e..000000000
--- a/packages/test/generatedCode/models/createAttachmentFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoAttachment} from './deserializeIntoAttachment';
-import {Attachment} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createAttachmentFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoAttachment;
-}
diff --git a/packages/test/generatedCode/models/createDateTimeTimeZoneFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createDateTimeTimeZoneFromDiscriminatorValue.ts
deleted file mode 100644
index c655449a2..000000000
--- a/packages/test/generatedCode/models/createDateTimeTimeZoneFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoDateTimeTimeZone} from './deserializeIntoDateTimeTimeZone';
-import {DateTimeTimeZone} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createDateTimeTimeZoneFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoDateTimeTimeZone;
-}
diff --git a/packages/test/generatedCode/models/createEmailAddressFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createEmailAddressFromDiscriminatorValue.ts
deleted file mode 100644
index b7967c62c..000000000
--- a/packages/test/generatedCode/models/createEmailAddressFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoEmailAddress} from './deserializeIntoEmailAddress';
-import {EmailAddress} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createEmailAddressFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoEmailAddress;
-}
diff --git a/packages/test/generatedCode/models/createEntityFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createEntityFromDiscriminatorValue.ts
deleted file mode 100644
index 3fc4e4e4e..000000000
--- a/packages/test/generatedCode/models/createEntityFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import {deserializeIntoAttachment} from './deserializeIntoAttachment';
-import {deserializeIntoEntity} from './deserializeIntoEntity';
-import {deserializeIntoExtension} from './deserializeIntoExtension';
-import {deserializeIntoInferenceClassification} from './deserializeIntoInferenceClassification';
-import {deserializeIntoInferenceClassificationOverride} from './deserializeIntoInferenceClassificationOverride';
-import {deserializeIntoMailFolder} from './deserializeIntoMailFolder';
-import {deserializeIntoMessage} from './deserializeIntoMessage';
-import {deserializeIntoMessageRule} from './deserializeIntoMessageRule';
-import {deserializeIntoMultiValueLegacyExtendedProperty} from './deserializeIntoMultiValueLegacyExtendedProperty';
-import {deserializeIntoOutlookItem} from './deserializeIntoOutlookItem';
-import {deserializeIntoSingleValueLegacyExtendedProperty} from './deserializeIntoSingleValueLegacyExtendedProperty';
-import {Entity} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createEntityFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoEntity;
-}
diff --git a/packages/test/generatedCode/models/createExtensionCollectionResponseFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createExtensionCollectionResponseFromDiscriminatorValue.ts
deleted file mode 100644
index e2b48136d..000000000
--- a/packages/test/generatedCode/models/createExtensionCollectionResponseFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoExtensionCollectionResponse} from './deserializeIntoExtensionCollectionResponse';
-import {ExtensionCollectionResponse} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createExtensionCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoExtensionCollectionResponse;
-}
diff --git a/packages/test/generatedCode/models/createExtensionFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createExtensionFromDiscriminatorValue.ts
deleted file mode 100644
index 0aadc6f84..000000000
--- a/packages/test/generatedCode/models/createExtensionFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoExtension} from './deserializeIntoExtension';
-import {Extension} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createExtensionFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoExtension;
-}
diff --git a/packages/test/generatedCode/models/createFollowupFlagFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createFollowupFlagFromDiscriminatorValue.ts
deleted file mode 100644
index 911ca8370..000000000
--- a/packages/test/generatedCode/models/createFollowupFlagFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoFollowupFlag} from './deserializeIntoFollowupFlag';
-import {FollowupFlag} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createFollowupFlagFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoFollowupFlag;
-}
diff --git a/packages/test/generatedCode/models/createInferenceClassificationFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createInferenceClassificationFromDiscriminatorValue.ts
deleted file mode 100644
index 7baf1d4ad..000000000
--- a/packages/test/generatedCode/models/createInferenceClassificationFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoInferenceClassification} from './deserializeIntoInferenceClassification';
-import {InferenceClassification} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createInferenceClassificationFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoInferenceClassification;
-}
diff --git a/packages/test/generatedCode/models/createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue.ts
deleted file mode 100644
index dd7bfc72d..000000000
--- a/packages/test/generatedCode/models/createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoInferenceClassificationOverrideCollectionResponse} from './deserializeIntoInferenceClassificationOverrideCollectionResponse';
-import {InferenceClassificationOverrideCollectionResponse} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoInferenceClassificationOverrideCollectionResponse;
-}
diff --git a/packages/test/generatedCode/models/createInferenceClassificationOverrideFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createInferenceClassificationOverrideFromDiscriminatorValue.ts
deleted file mode 100644
index 3b80f578f..000000000
--- a/packages/test/generatedCode/models/createInferenceClassificationOverrideFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoInferenceClassificationOverride} from './deserializeIntoInferenceClassificationOverride';
-import {InferenceClassificationOverride} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createInferenceClassificationOverrideFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoInferenceClassificationOverride;
-}
diff --git a/packages/test/generatedCode/models/createInternetMessageHeaderFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createInternetMessageHeaderFromDiscriminatorValue.ts
deleted file mode 100644
index 03968efea..000000000
--- a/packages/test/generatedCode/models/createInternetMessageHeaderFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoInternetMessageHeader} from './deserializeIntoInternetMessageHeader';
-import {InternetMessageHeader} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createInternetMessageHeaderFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoInternetMessageHeader;
-}
diff --git a/packages/test/generatedCode/models/createItemBodyFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createItemBodyFromDiscriminatorValue.ts
deleted file mode 100644
index f8020cbda..000000000
--- a/packages/test/generatedCode/models/createItemBodyFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoItemBody} from './deserializeIntoItemBody';
-import {ItemBody} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createItemBodyFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoItemBody;
-}
diff --git a/packages/test/generatedCode/models/createMailFolderCollectionResponseFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createMailFolderCollectionResponseFromDiscriminatorValue.ts
deleted file mode 100644
index ee6b7d560..000000000
--- a/packages/test/generatedCode/models/createMailFolderCollectionResponseFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoMailFolderCollectionResponse} from './deserializeIntoMailFolderCollectionResponse';
-import {MailFolderCollectionResponse} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createMailFolderCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoMailFolderCollectionResponse;
-}
diff --git a/packages/test/generatedCode/models/createMailFolderFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createMailFolderFromDiscriminatorValue.ts
deleted file mode 100644
index c4ed15091..000000000
--- a/packages/test/generatedCode/models/createMailFolderFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoMailFolder} from './deserializeIntoMailFolder';
-import {MailFolder} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createMailFolderFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoMailFolder;
-}
diff --git a/packages/test/generatedCode/models/createMessageCollectionResponseFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createMessageCollectionResponseFromDiscriminatorValue.ts
deleted file mode 100644
index e9c9c422d..000000000
--- a/packages/test/generatedCode/models/createMessageCollectionResponseFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoMessageCollectionResponse} from './deserializeIntoMessageCollectionResponse';
-import {MessageCollectionResponse} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createMessageCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoMessageCollectionResponse;
-}
diff --git a/packages/test/generatedCode/models/createMessageFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createMessageFromDiscriminatorValue.ts
deleted file mode 100644
index 028c85234..000000000
--- a/packages/test/generatedCode/models/createMessageFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoMessage} from './deserializeIntoMessage';
-import {Message} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createMessageFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoMessage;
-}
diff --git a/packages/test/generatedCode/models/createMessageRuleActionsFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createMessageRuleActionsFromDiscriminatorValue.ts
deleted file mode 100644
index a7c7e9afb..000000000
--- a/packages/test/generatedCode/models/createMessageRuleActionsFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoMessageRuleActions} from './deserializeIntoMessageRuleActions';
-import {MessageRuleActions} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createMessageRuleActionsFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoMessageRuleActions;
-}
diff --git a/packages/test/generatedCode/models/createMessageRuleCollectionResponseFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createMessageRuleCollectionResponseFromDiscriminatorValue.ts
deleted file mode 100644
index d9ccf5932..000000000
--- a/packages/test/generatedCode/models/createMessageRuleCollectionResponseFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoMessageRuleCollectionResponse} from './deserializeIntoMessageRuleCollectionResponse';
-import {MessageRuleCollectionResponse} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createMessageRuleCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoMessageRuleCollectionResponse;
-}
diff --git a/packages/test/generatedCode/models/createMessageRuleFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createMessageRuleFromDiscriminatorValue.ts
deleted file mode 100644
index f526e38fb..000000000
--- a/packages/test/generatedCode/models/createMessageRuleFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoMessageRule} from './deserializeIntoMessageRule';
-import {MessageRule} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createMessageRuleFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoMessageRule;
-}
diff --git a/packages/test/generatedCode/models/createMessageRulePredicatesFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createMessageRulePredicatesFromDiscriminatorValue.ts
deleted file mode 100644
index ce6ecb323..000000000
--- a/packages/test/generatedCode/models/createMessageRulePredicatesFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoMessageRulePredicates} from './deserializeIntoMessageRulePredicates';
-import {MessageRulePredicates} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createMessageRulePredicatesFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoMessageRulePredicates;
-}
diff --git a/packages/test/generatedCode/models/createMultiValueLegacyExtendedPropertyFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createMultiValueLegacyExtendedPropertyFromDiscriminatorValue.ts
deleted file mode 100644
index eadbc4b10..000000000
--- a/packages/test/generatedCode/models/createMultiValueLegacyExtendedPropertyFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoMultiValueLegacyExtendedProperty} from './deserializeIntoMultiValueLegacyExtendedProperty';
-import {MultiValueLegacyExtendedProperty} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createMultiValueLegacyExtendedPropertyFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoMultiValueLegacyExtendedProperty;
-}
diff --git a/packages/test/generatedCode/models/createOutlookItemFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createOutlookItemFromDiscriminatorValue.ts
deleted file mode 100644
index f7e21a19b..000000000
--- a/packages/test/generatedCode/models/createOutlookItemFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoOutlookItem} from './deserializeIntoOutlookItem';
-import {OutlookItem} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createOutlookItemFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoOutlookItem;
-}
diff --git a/packages/test/generatedCode/models/createRecipientFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createRecipientFromDiscriminatorValue.ts
deleted file mode 100644
index 26a8dd9a6..000000000
--- a/packages/test/generatedCode/models/createRecipientFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoRecipient} from './deserializeIntoRecipient';
-import {Recipient} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createRecipientFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoRecipient;
-}
diff --git a/packages/test/generatedCode/models/createSingleValueLegacyExtendedPropertyFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createSingleValueLegacyExtendedPropertyFromDiscriminatorValue.ts
deleted file mode 100644
index 2fa5af1bf..000000000
--- a/packages/test/generatedCode/models/createSingleValueLegacyExtendedPropertyFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoSingleValueLegacyExtendedProperty} from './deserializeIntoSingleValueLegacyExtendedProperty';
-import {SingleValueLegacyExtendedProperty} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createSingleValueLegacyExtendedPropertyFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoSingleValueLegacyExtendedProperty;
-}
diff --git a/packages/test/generatedCode/models/createSizeRangeFromDiscriminatorValue.ts b/packages/test/generatedCode/models/createSizeRangeFromDiscriminatorValue.ts
deleted file mode 100644
index f7d4058e4..000000000
--- a/packages/test/generatedCode/models/createSizeRangeFromDiscriminatorValue.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {deserializeIntoSizeRange} from './deserializeIntoSizeRange';
-import {SizeRange} from './index';
-import {ParseNode} from '@microsoft/kiota-abstractions';
-
-export function createSizeRangeFromDiscriminatorValue(parseNode: ParseNode | undefined) {
-    if(!parseNode) throw new Error("parseNode cannot be undefined");
-    return deserializeIntoSizeRange;
-}
diff --git a/packages/test/generatedCode/models/dateTimeTimeZone.ts b/packages/test/generatedCode/models/dateTimeTimeZone.ts
index 0cb257d01..87b377572 100644
--- a/packages/test/generatedCode/models/dateTimeTimeZone.ts
+++ b/packages/test/generatedCode/models/dateTimeTimeZone.ts
@@ -1,5 +1,12 @@
-import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createDateTimeTimeZoneFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoDateTimeTimeZone;
+}
 export interface DateTimeTimeZone extends AdditionalDataHolder, Parsable {
     /**
      * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
@@ -8,9 +15,22 @@ export interface DateTimeTimeZone extends AdditionalDataHolder, Parsable {
     /**
      * A single point of time in a combined date and time representation ({date}T{time}; for example, 2017-08-29T04:00:00.0000000).
      */
-    dateTime?: string | undefined;
+    dateTime?: string;
     /**
      * Represents a time zone, for example, 'Pacific Standard Time'. See below for more possible values.
      */
-    timeZone?: string | undefined;
+    timeZone?: string;
+}
+export function deserializeIntoDateTimeTimeZone(dateTimeTimeZone: DateTimeTimeZone | undefined = {} as DateTimeTimeZone) : Record<string, (node: ParseNode) => void> {
+    return {
+        "dateTime": n => { dateTimeTimeZone.dateTime = n.getStringValue(); },
+        "timeZone": n => { dateTimeTimeZone.timeZone = n.getStringValue(); },
+    }
+}
+export function serializeDateTimeTimeZone(writer: SerializationWriter, dateTimeTimeZone: DateTimeTimeZone | undefined = {} as DateTimeTimeZone) : void {
+        writer.writeStringValue("dateTime", dateTimeTimeZone.dateTime);
+        writer.writeStringValue("timeZone", dateTimeTimeZone.timeZone);
+        writer.writeAdditionalData(dateTimeTimeZone.additionalData);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/deserializeIntoAttachment.ts b/packages/test/generatedCode/models/deserializeIntoAttachment.ts
deleted file mode 100644
index 0c0b479f6..000000000
--- a/packages/test/generatedCode/models/deserializeIntoAttachment.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type {Attachment} from './attachment';
-import {deserializeIntoEntity} from './deserializeIntoEntity';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoAttachment(attachment: Attachment | undefined = {} as Attachment) : Record<string, (node: ParseNode) => void> {
-    return {
-        ...deserializeIntoEntity(attachment),
-        "contentType": n => { attachment.contentType = n.getStringValue(); },
-        "isInline": n => { attachment.isInline = n.getBooleanValue(); },
-        "lastModifiedDateTime": n => { attachment.lastModifiedDateTime = n.getDateValue(); },
-        "name": n => { attachment.name = n.getStringValue(); },
-        "size": n => { attachment.size = n.getNumberValue(); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoAttachmentCollectionResponse.ts b/packages/test/generatedCode/models/deserializeIntoAttachmentCollectionResponse.ts
deleted file mode 100644
index dc6e9cb92..000000000
--- a/packages/test/generatedCode/models/deserializeIntoAttachmentCollectionResponse.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {Attachment} from './attachment';
-import type {AttachmentCollectionResponse} from './attachmentCollectionResponse';
-import {createAttachmentFromDiscriminatorValue} from './createAttachmentFromDiscriminatorValue';
-import {serializeAttachment} from './serializeAttachment';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoAttachmentCollectionResponse(attachmentCollectionResponse: AttachmentCollectionResponse | undefined = {} as AttachmentCollectionResponse) : Record<string, (node: ParseNode) => void> {
-    return {
-        "@odata.nextLink": n => { attachmentCollectionResponse.odataNextLink = n.getStringValue(); },
-        "value": n => { attachmentCollectionResponse.value = n.getCollectionOfObjectValues<Attachment>(createAttachmentFromDiscriminatorValue); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoDateTimeTimeZone.ts b/packages/test/generatedCode/models/deserializeIntoDateTimeTimeZone.ts
deleted file mode 100644
index f2639efdd..000000000
--- a/packages/test/generatedCode/models/deserializeIntoDateTimeTimeZone.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type {DateTimeTimeZone} from './dateTimeTimeZone';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoDateTimeTimeZone(dateTimeTimeZone: DateTimeTimeZone | undefined = {} as DateTimeTimeZone) : Record<string, (node: ParseNode) => void> {
-    return {
-        "dateTime": n => { dateTimeTimeZone.dateTime = n.getStringValue(); },
-        "timeZone": n => { dateTimeTimeZone.timeZone = n.getStringValue(); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoEmailAddress.ts b/packages/test/generatedCode/models/deserializeIntoEmailAddress.ts
deleted file mode 100644
index 85363295d..000000000
--- a/packages/test/generatedCode/models/deserializeIntoEmailAddress.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type {EmailAddress} from './emailAddress';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoEmailAddress(emailAddress: EmailAddress | undefined = {} as EmailAddress) : Record<string, (node: ParseNode) => void> {
-    return {
-        "address": n => { emailAddress.address = n.getStringValue(); },
-        "name": n => { emailAddress.name = n.getStringValue(); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoEntity.ts b/packages/test/generatedCode/models/deserializeIntoEntity.ts
deleted file mode 100644
index 27c7f0d5e..000000000
--- a/packages/test/generatedCode/models/deserializeIntoEntity.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type {Entity} from './entity';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoEntity(entity: Entity | undefined = {} as Entity) : Record<string, (node: ParseNode) => void> {
-    return {
-        "id": n => { entity.id = n.getStringValue(); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoExtension.ts b/packages/test/generatedCode/models/deserializeIntoExtension.ts
deleted file mode 100644
index 8af652a96..000000000
--- a/packages/test/generatedCode/models/deserializeIntoExtension.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import {deserializeIntoEntity} from './deserializeIntoEntity';
-import type {Extension} from './extension';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoExtension(extension: Extension | undefined = {} as Extension) : Record<string, (node: ParseNode) => void> {
-    return {
-        ...deserializeIntoEntity(extension),
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoExtensionCollectionResponse.ts b/packages/test/generatedCode/models/deserializeIntoExtensionCollectionResponse.ts
deleted file mode 100644
index 5f1742986..000000000
--- a/packages/test/generatedCode/models/deserializeIntoExtensionCollectionResponse.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import {createExtensionFromDiscriminatorValue} from './createExtensionFromDiscriminatorValue';
-import type {Extension} from './extension';
-import type {ExtensionCollectionResponse} from './extensionCollectionResponse';
-import {serializeExtension} from './serializeExtension';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoExtensionCollectionResponse(extensionCollectionResponse: ExtensionCollectionResponse | undefined = {} as ExtensionCollectionResponse) : Record<string, (node: ParseNode) => void> {
-    return {
-        "@odata.nextLink": n => { extensionCollectionResponse.odataNextLink = n.getStringValue(); },
-        "value": n => { extensionCollectionResponse.value = n.getCollectionOfObjectValues<Extension>(createExtensionFromDiscriminatorValue); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoFollowupFlag.ts b/packages/test/generatedCode/models/deserializeIntoFollowupFlag.ts
deleted file mode 100644
index 6fc640913..000000000
--- a/packages/test/generatedCode/models/deserializeIntoFollowupFlag.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import {createDateTimeTimeZoneFromDiscriminatorValue} from './createDateTimeTimeZoneFromDiscriminatorValue';
-import type {DateTimeTimeZone} from './dateTimeTimeZone';
-import type {FollowupFlag} from './followupFlag';
-import {FollowupFlagStatus} from './followupFlagStatus';
-import {serializeDateTimeTimeZone} from './serializeDateTimeTimeZone';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoFollowupFlag(followupFlag: FollowupFlag | undefined = {} as FollowupFlag) : Record<string, (node: ParseNode) => void> {
-    return {
-        "completedDateTime": n => { followupFlag.completedDateTime = n.getObjectValue<DateTimeTimeZone>(createDateTimeTimeZoneFromDiscriminatorValue); },
-        "dueDateTime": n => { followupFlag.dueDateTime = n.getObjectValue<DateTimeTimeZone>(createDateTimeTimeZoneFromDiscriminatorValue); },
-        "flagStatus": n => { followupFlag.flagStatus = n.getEnumValue<FollowupFlagStatus>(FollowupFlagStatus); },
-        "startDateTime": n => { followupFlag.startDateTime = n.getObjectValue<DateTimeTimeZone>(createDateTimeTimeZoneFromDiscriminatorValue); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoInferenceClassification.ts b/packages/test/generatedCode/models/deserializeIntoInferenceClassification.ts
deleted file mode 100644
index 168dedeff..000000000
--- a/packages/test/generatedCode/models/deserializeIntoInferenceClassification.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import {createInferenceClassificationOverrideFromDiscriminatorValue} from './createInferenceClassificationOverrideFromDiscriminatorValue';
-import {deserializeIntoEntity} from './deserializeIntoEntity';
-import type {InferenceClassification} from './inferenceClassification';
-import type {InferenceClassificationOverride} from './inferenceClassificationOverride';
-import {serializeInferenceClassificationOverride} from './serializeInferenceClassificationOverride';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoInferenceClassification(inferenceClassification: InferenceClassification | undefined = {} as InferenceClassification) : Record<string, (node: ParseNode) => void> {
-    return {
-        ...deserializeIntoEntity(inferenceClassification),
-        "overrides": n => { inferenceClassification.overrides = n.getCollectionOfObjectValues<InferenceClassificationOverride>(createInferenceClassificationOverrideFromDiscriminatorValue); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoInferenceClassificationOverride.ts b/packages/test/generatedCode/models/deserializeIntoInferenceClassificationOverride.ts
deleted file mode 100644
index 0476fed1e..000000000
--- a/packages/test/generatedCode/models/deserializeIntoInferenceClassificationOverride.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import {createEmailAddressFromDiscriminatorValue} from './createEmailAddressFromDiscriminatorValue';
-import {deserializeIntoEntity} from './deserializeIntoEntity';
-import type {EmailAddress} from './emailAddress';
-import type {InferenceClassificationOverride} from './inferenceClassificationOverride';
-import {InferenceClassificationType} from './inferenceClassificationType';
-import {serializeEmailAddress} from './serializeEmailAddress';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoInferenceClassificationOverride(inferenceClassificationOverride: InferenceClassificationOverride | undefined = {} as InferenceClassificationOverride) : Record<string, (node: ParseNode) => void> {
-    return {
-        ...deserializeIntoEntity(inferenceClassificationOverride),
-        "classifyAs": n => { inferenceClassificationOverride.classifyAs = n.getEnumValue<InferenceClassificationType>(InferenceClassificationType); },
-        "senderEmailAddress": n => { inferenceClassificationOverride.senderEmailAddress = n.getObjectValue<EmailAddress>(createEmailAddressFromDiscriminatorValue); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoInferenceClassificationOverrideCollectionResponse.ts b/packages/test/generatedCode/models/deserializeIntoInferenceClassificationOverrideCollectionResponse.ts
deleted file mode 100644
index 8d4030b52..000000000
--- a/packages/test/generatedCode/models/deserializeIntoInferenceClassificationOverrideCollectionResponse.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import {createInferenceClassificationOverrideFromDiscriminatorValue} from './createInferenceClassificationOverrideFromDiscriminatorValue';
-import type {InferenceClassificationOverride} from './inferenceClassificationOverride';
-import type {InferenceClassificationOverrideCollectionResponse} from './inferenceClassificationOverrideCollectionResponse';
-import {serializeInferenceClassificationOverride} from './serializeInferenceClassificationOverride';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoInferenceClassificationOverrideCollectionResponse(inferenceClassificationOverrideCollectionResponse: InferenceClassificationOverrideCollectionResponse | undefined = {} as InferenceClassificationOverrideCollectionResponse) : Record<string, (node: ParseNode) => void> {
-    return {
-        "@odata.nextLink": n => { inferenceClassificationOverrideCollectionResponse.odataNextLink = n.getStringValue(); },
-        "value": n => { inferenceClassificationOverrideCollectionResponse.value = n.getCollectionOfObjectValues<InferenceClassificationOverride>(createInferenceClassificationOverrideFromDiscriminatorValue); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoInternetMessageHeader.ts b/packages/test/generatedCode/models/deserializeIntoInternetMessageHeader.ts
deleted file mode 100644
index b7de7a489..000000000
--- a/packages/test/generatedCode/models/deserializeIntoInternetMessageHeader.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type {InternetMessageHeader} from './internetMessageHeader';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoInternetMessageHeader(internetMessageHeader: InternetMessageHeader | undefined = {} as InternetMessageHeader) : Record<string, (node: ParseNode) => void> {
-    return {
-        "name": n => { internetMessageHeader.name = n.getStringValue(); },
-        "value": n => { internetMessageHeader.value = n.getStringValue(); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoItemBody.ts b/packages/test/generatedCode/models/deserializeIntoItemBody.ts
deleted file mode 100644
index e31eac638..000000000
--- a/packages/test/generatedCode/models/deserializeIntoItemBody.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import {BodyType} from './bodyType';
-import type {ItemBody} from './itemBody';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoItemBody(itemBody: ItemBody | undefined = {} as ItemBody) : Record<string, (node: ParseNode) => void> {
-    return {
-        "content": n => { itemBody.content = n.getStringValue(); },
-        "contentType": n => { itemBody.contentType = n.getEnumValue<BodyType>(BodyType); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoMailFolder.ts b/packages/test/generatedCode/models/deserializeIntoMailFolder.ts
deleted file mode 100644
index 7abfb5b85..000000000
--- a/packages/test/generatedCode/models/deserializeIntoMailFolder.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import {createMailFolderFromDiscriminatorValue} from './createMailFolderFromDiscriminatorValue';
-import {createMessageFromDiscriminatorValue} from './createMessageFromDiscriminatorValue';
-import {createMessageRuleFromDiscriminatorValue} from './createMessageRuleFromDiscriminatorValue';
-import {createMultiValueLegacyExtendedPropertyFromDiscriminatorValue} from './createMultiValueLegacyExtendedPropertyFromDiscriminatorValue';
-import {createSingleValueLegacyExtendedPropertyFromDiscriminatorValue} from './createSingleValueLegacyExtendedPropertyFromDiscriminatorValue';
-import {deserializeIntoEntity} from './deserializeIntoEntity';
-import type {MailFolder} from './mailFolder';
-import type {Message} from './message';
-import type {MessageRule} from './messageRule';
-import type {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
-import {serializeMailFolder} from './serializeMailFolder';
-import {serializeMessage} from './serializeMessage';
-import {serializeMessageRule} from './serializeMessageRule';
-import {serializeMultiValueLegacyExtendedProperty} from './serializeMultiValueLegacyExtendedProperty';
-import {serializeSingleValueLegacyExtendedProperty} from './serializeSingleValueLegacyExtendedProperty';
-import type {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoMailFolder(mailFolder: MailFolder | undefined = {} as MailFolder) : Record<string, (node: ParseNode) => void> {
-    return {
-        ...deserializeIntoEntity(mailFolder),
-        "childFolderCount": n => { mailFolder.childFolderCount = n.getNumberValue(); },
-        "childFolders": n => { mailFolder.childFolders = n.getCollectionOfObjectValues<MailFolder>(createMailFolderFromDiscriminatorValue); },
-        "displayName": n => { mailFolder.displayName = n.getStringValue(); },
-        "isHidden": n => { mailFolder.isHidden = n.getBooleanValue(); },
-        "messageRules": n => { mailFolder.messageRules = n.getCollectionOfObjectValues<MessageRule>(createMessageRuleFromDiscriminatorValue); },
-        "messages": n => { mailFolder.messages = n.getCollectionOfObjectValues<Message>(createMessageFromDiscriminatorValue); },
-        "multiValueExtendedProperties": n => { mailFolder.multiValueExtendedProperties = n.getCollectionOfObjectValues<MultiValueLegacyExtendedProperty>(createMultiValueLegacyExtendedPropertyFromDiscriminatorValue); },
-        "parentFolderId": n => { mailFolder.parentFolderId = n.getStringValue(); },
-        "singleValueExtendedProperties": n => { mailFolder.singleValueExtendedProperties = n.getCollectionOfObjectValues<SingleValueLegacyExtendedProperty>(createSingleValueLegacyExtendedPropertyFromDiscriminatorValue); },
-        "totalItemCount": n => { mailFolder.totalItemCount = n.getNumberValue(); },
-        "unreadItemCount": n => { mailFolder.unreadItemCount = n.getNumberValue(); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoMailFolderCollectionResponse.ts b/packages/test/generatedCode/models/deserializeIntoMailFolderCollectionResponse.ts
deleted file mode 100644
index f051c9f6e..000000000
--- a/packages/test/generatedCode/models/deserializeIntoMailFolderCollectionResponse.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import {createMailFolderFromDiscriminatorValue} from './createMailFolderFromDiscriminatorValue';
-import type {MailFolder} from './mailFolder';
-import type {MailFolderCollectionResponse} from './mailFolderCollectionResponse';
-import {serializeMailFolder} from './serializeMailFolder';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoMailFolderCollectionResponse(mailFolderCollectionResponse: MailFolderCollectionResponse | undefined = {} as MailFolderCollectionResponse) : Record<string, (node: ParseNode) => void> {
-    return {
-        "@odata.nextLink": n => { mailFolderCollectionResponse.odataNextLink = n.getStringValue(); },
-        "value": n => { mailFolderCollectionResponse.value = n.getCollectionOfObjectValues<MailFolder>(createMailFolderFromDiscriminatorValue); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoMessage.ts b/packages/test/generatedCode/models/deserializeIntoMessage.ts
deleted file mode 100644
index 6686a1a64..000000000
--- a/packages/test/generatedCode/models/deserializeIntoMessage.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import type {Attachment} from './attachment';
-import {createAttachmentFromDiscriminatorValue} from './createAttachmentFromDiscriminatorValue';
-import {createExtensionFromDiscriminatorValue} from './createExtensionFromDiscriminatorValue';
-import {createFollowupFlagFromDiscriminatorValue} from './createFollowupFlagFromDiscriminatorValue';
-import {createInternetMessageHeaderFromDiscriminatorValue} from './createInternetMessageHeaderFromDiscriminatorValue';
-import {createItemBodyFromDiscriminatorValue} from './createItemBodyFromDiscriminatorValue';
-import {createMultiValueLegacyExtendedPropertyFromDiscriminatorValue} from './createMultiValueLegacyExtendedPropertyFromDiscriminatorValue';
-import {createRecipientFromDiscriminatorValue} from './createRecipientFromDiscriminatorValue';
-import {createSingleValueLegacyExtendedPropertyFromDiscriminatorValue} from './createSingleValueLegacyExtendedPropertyFromDiscriminatorValue';
-import {deserializeIntoOutlookItem} from './deserializeIntoOutlookItem';
-import type {Extension} from './extension';
-import type {FollowupFlag} from './followupFlag';
-import {Importance} from './importance';
-import {InferenceClassificationType} from './inferenceClassificationType';
-import type {InternetMessageHeader} from './internetMessageHeader';
-import type {ItemBody} from './itemBody';
-import type {Message} from './message';
-import type {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
-import type {Recipient} from './recipient';
-import {serializeAttachment} from './serializeAttachment';
-import {serializeExtension} from './serializeExtension';
-import {serializeFollowupFlag} from './serializeFollowupFlag';
-import {serializeInternetMessageHeader} from './serializeInternetMessageHeader';
-import {serializeItemBody} from './serializeItemBody';
-import {serializeMultiValueLegacyExtendedProperty} from './serializeMultiValueLegacyExtendedProperty';
-import {serializeRecipient} from './serializeRecipient';
-import {serializeSingleValueLegacyExtendedProperty} from './serializeSingleValueLegacyExtendedProperty';
-import type {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoMessage(message: Message | undefined = {} as Message) : Record<string, (node: ParseNode) => void> {
-    return {
-        ...deserializeIntoOutlookItem(message),
-        "attachments": n => { message.attachments = n.getCollectionOfObjectValues<Attachment>(createAttachmentFromDiscriminatorValue); },
-        "bccRecipients": n => { message.bccRecipients = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
-        "body": n => { message.body = n.getObjectValue<ItemBody>(createItemBodyFromDiscriminatorValue); },
-        "bodyPreview": n => { message.bodyPreview = n.getStringValue(); },
-        "ccRecipients": n => { message.ccRecipients = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
-        "conversationId": n => { message.conversationId = n.getStringValue(); },
-        "conversationIndex": n => { message.conversationIndex = n.getStringValue(); },
-        "extensions": n => { message.extensions = n.getCollectionOfObjectValues<Extension>(createExtensionFromDiscriminatorValue); },
-        "flag": n => { message.flag = n.getObjectValue<FollowupFlag>(createFollowupFlagFromDiscriminatorValue); },
-        "from": n => { message.from = n.getObjectValue<Recipient>(createRecipientFromDiscriminatorValue); },
-        "hasAttachments": n => { message.hasAttachments = n.getBooleanValue(); },
-        "importance": n => { message.importance = n.getEnumValue<Importance>(Importance); },
-        "inferenceClassification": n => { message.inferenceClassification = n.getEnumValue<InferenceClassificationType>(InferenceClassificationType); },
-        "internetMessageHeaders": n => { message.internetMessageHeaders = n.getCollectionOfObjectValues<InternetMessageHeader>(createInternetMessageHeaderFromDiscriminatorValue); },
-        "internetMessageId": n => { message.internetMessageId = n.getStringValue(); },
-        "isDeliveryReceiptRequested": n => { message.isDeliveryReceiptRequested = n.getBooleanValue(); },
-        "isDraft": n => { message.isDraft = n.getBooleanValue(); },
-        "isRead": n => { message.isRead = n.getBooleanValue(); },
-        "isReadReceiptRequested": n => { message.isReadReceiptRequested = n.getBooleanValue(); },
-        "multiValueExtendedProperties": n => { message.multiValueExtendedProperties = n.getCollectionOfObjectValues<MultiValueLegacyExtendedProperty>(createMultiValueLegacyExtendedPropertyFromDiscriminatorValue); },
-        "parentFolderId": n => { message.parentFolderId = n.getStringValue(); },
-        "receivedDateTime": n => { message.receivedDateTime = n.getDateValue(); },
-        "replyTo": n => { message.replyTo = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
-        "sender": n => { message.sender = n.getObjectValue<Recipient>(createRecipientFromDiscriminatorValue); },
-        "sentDateTime": n => { message.sentDateTime = n.getDateValue(); },
-        "singleValueExtendedProperties": n => { message.singleValueExtendedProperties = n.getCollectionOfObjectValues<SingleValueLegacyExtendedProperty>(createSingleValueLegacyExtendedPropertyFromDiscriminatorValue); },
-        "subject": n => { message.subject = n.getStringValue(); },
-        "toRecipients": n => { message.toRecipients = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
-        "uniqueBody": n => { message.uniqueBody = n.getObjectValue<ItemBody>(createItemBodyFromDiscriminatorValue); },
-        "webLink": n => { message.webLink = n.getStringValue(); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoMessageCollectionResponse.ts b/packages/test/generatedCode/models/deserializeIntoMessageCollectionResponse.ts
deleted file mode 100644
index c50a9c819..000000000
--- a/packages/test/generatedCode/models/deserializeIntoMessageCollectionResponse.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import {createMessageFromDiscriminatorValue} from './createMessageFromDiscriminatorValue';
-import type {Message} from './message';
-import type {MessageCollectionResponse} from './messageCollectionResponse';
-import {serializeMessage} from './serializeMessage';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoMessageCollectionResponse(messageCollectionResponse: MessageCollectionResponse | undefined = {} as MessageCollectionResponse) : Record<string, (node: ParseNode) => void> {
-    return {
-        "@odata.nextLink": n => { messageCollectionResponse.odataNextLink = n.getStringValue(); },
-        "value": n => { messageCollectionResponse.value = n.getCollectionOfObjectValues<Message>(createMessageFromDiscriminatorValue); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoMessageRule.ts b/packages/test/generatedCode/models/deserializeIntoMessageRule.ts
deleted file mode 100644
index e46da91a0..000000000
--- a/packages/test/generatedCode/models/deserializeIntoMessageRule.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import {createMessageRuleActionsFromDiscriminatorValue} from './createMessageRuleActionsFromDiscriminatorValue';
-import {createMessageRulePredicatesFromDiscriminatorValue} from './createMessageRulePredicatesFromDiscriminatorValue';
-import {deserializeIntoEntity} from './deserializeIntoEntity';
-import type {MessageRule} from './messageRule';
-import type {MessageRuleActions} from './messageRuleActions';
-import type {MessageRulePredicates} from './messageRulePredicates';
-import {serializeMessageRuleActions} from './serializeMessageRuleActions';
-import {serializeMessageRulePredicates} from './serializeMessageRulePredicates';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoMessageRule(messageRule: MessageRule | undefined = {} as MessageRule) : Record<string, (node: ParseNode) => void> {
-    return {
-        ...deserializeIntoEntity(messageRule),
-        "actions": n => { messageRule.actions = n.getObjectValue<MessageRuleActions>(createMessageRuleActionsFromDiscriminatorValue); },
-        "conditions": n => { messageRule.conditions = n.getObjectValue<MessageRulePredicates>(createMessageRulePredicatesFromDiscriminatorValue); },
-        "displayName": n => { messageRule.displayName = n.getStringValue(); },
-        "exceptions": n => { messageRule.exceptions = n.getObjectValue<MessageRulePredicates>(createMessageRulePredicatesFromDiscriminatorValue); },
-        "hasError": n => { messageRule.hasError = n.getBooleanValue(); },
-        "isEnabled": n => { messageRule.isEnabled = n.getBooleanValue(); },
-        "isReadOnly": n => { messageRule.isReadOnly = n.getBooleanValue(); },
-        "sequence": n => { messageRule.sequence = n.getNumberValue(); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoMessageRuleActions.ts b/packages/test/generatedCode/models/deserializeIntoMessageRuleActions.ts
deleted file mode 100644
index af024405f..000000000
--- a/packages/test/generatedCode/models/deserializeIntoMessageRuleActions.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import {createRecipientFromDiscriminatorValue} from './createRecipientFromDiscriminatorValue';
-import {Importance} from './importance';
-import type {MessageRuleActions} from './messageRuleActions';
-import type {Recipient} from './recipient';
-import {serializeRecipient} from './serializeRecipient';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoMessageRuleActions(messageRuleActions: MessageRuleActions | undefined = {} as MessageRuleActions) : Record<string, (node: ParseNode) => void> {
-    return {
-        "assignCategories": n => { messageRuleActions.assignCategories = n.getCollectionOfPrimitiveValues<string>(); },
-        "copyToFolder": n => { messageRuleActions.copyToFolder = n.getStringValue(); },
-        "delete": n => { messageRuleActions.delete = n.getBooleanValue(); },
-        "forwardAsAttachmentTo": n => { messageRuleActions.forwardAsAttachmentTo = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
-        "forwardTo": n => { messageRuleActions.forwardTo = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
-        "markAsRead": n => { messageRuleActions.markAsRead = n.getBooleanValue(); },
-        "markImportance": n => { messageRuleActions.markImportance = n.getEnumValue<Importance>(Importance); },
-        "moveToFolder": n => { messageRuleActions.moveToFolder = n.getStringValue(); },
-        "permanentDelete": n => { messageRuleActions.permanentDelete = n.getBooleanValue(); },
-        "redirectTo": n => { messageRuleActions.redirectTo = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
-        "stopProcessingRules": n => { messageRuleActions.stopProcessingRules = n.getBooleanValue(); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoMessageRuleCollectionResponse.ts b/packages/test/generatedCode/models/deserializeIntoMessageRuleCollectionResponse.ts
deleted file mode 100644
index 1a213fdcd..000000000
--- a/packages/test/generatedCode/models/deserializeIntoMessageRuleCollectionResponse.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import {createMessageRuleFromDiscriminatorValue} from './createMessageRuleFromDiscriminatorValue';
-import type {MessageRule} from './messageRule';
-import type {MessageRuleCollectionResponse} from './messageRuleCollectionResponse';
-import {serializeMessageRule} from './serializeMessageRule';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoMessageRuleCollectionResponse(messageRuleCollectionResponse: MessageRuleCollectionResponse | undefined = {} as MessageRuleCollectionResponse) : Record<string, (node: ParseNode) => void> {
-    return {
-        "@odata.nextLink": n => { messageRuleCollectionResponse.odataNextLink = n.getStringValue(); },
-        "value": n => { messageRuleCollectionResponse.value = n.getCollectionOfObjectValues<MessageRule>(createMessageRuleFromDiscriminatorValue); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoMessageRulePredicates.ts b/packages/test/generatedCode/models/deserializeIntoMessageRulePredicates.ts
deleted file mode 100644
index 9c852335a..000000000
--- a/packages/test/generatedCode/models/deserializeIntoMessageRulePredicates.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import {createRecipientFromDiscriminatorValue} from './createRecipientFromDiscriminatorValue';
-import {createSizeRangeFromDiscriminatorValue} from './createSizeRangeFromDiscriminatorValue';
-import {Importance} from './importance';
-import {MessageActionFlag} from './messageActionFlag';
-import type {MessageRulePredicates} from './messageRulePredicates';
-import type {Recipient} from './recipient';
-import {Sensitivity} from './sensitivity';
-import {serializeRecipient} from './serializeRecipient';
-import {serializeSizeRange} from './serializeSizeRange';
-import type {SizeRange} from './sizeRange';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoMessageRulePredicates(messageRulePredicates: MessageRulePredicates | undefined = {} as MessageRulePredicates) : Record<string, (node: ParseNode) => void> {
-    return {
-        "bodyContains": n => { messageRulePredicates.bodyContains = n.getCollectionOfPrimitiveValues<string>(); },
-        "bodyOrSubjectContains": n => { messageRulePredicates.bodyOrSubjectContains = n.getCollectionOfPrimitiveValues<string>(); },
-        "categories": n => { messageRulePredicates.categories = n.getCollectionOfPrimitiveValues<string>(); },
-        "fromAddresses": n => { messageRulePredicates.fromAddresses = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
-        "hasAttachments": n => { messageRulePredicates.hasAttachments = n.getBooleanValue(); },
-        "headerContains": n => { messageRulePredicates.headerContains = n.getCollectionOfPrimitiveValues<string>(); },
-        "importance": n => { messageRulePredicates.importance = n.getEnumValue<Importance>(Importance); },
-        "isApprovalRequest": n => { messageRulePredicates.isApprovalRequest = n.getBooleanValue(); },
-        "isAutomaticForward": n => { messageRulePredicates.isAutomaticForward = n.getBooleanValue(); },
-        "isAutomaticReply": n => { messageRulePredicates.isAutomaticReply = n.getBooleanValue(); },
-        "isEncrypted": n => { messageRulePredicates.isEncrypted = n.getBooleanValue(); },
-        "isMeetingRequest": n => { messageRulePredicates.isMeetingRequest = n.getBooleanValue(); },
-        "isMeetingResponse": n => { messageRulePredicates.isMeetingResponse = n.getBooleanValue(); },
-        "isNonDeliveryReport": n => { messageRulePredicates.isNonDeliveryReport = n.getBooleanValue(); },
-        "isPermissionControlled": n => { messageRulePredicates.isPermissionControlled = n.getBooleanValue(); },
-        "isReadReceipt": n => { messageRulePredicates.isReadReceipt = n.getBooleanValue(); },
-        "isSigned": n => { messageRulePredicates.isSigned = n.getBooleanValue(); },
-        "isVoicemail": n => { messageRulePredicates.isVoicemail = n.getBooleanValue(); },
-        "messageActionFlag": n => { messageRulePredicates.messageActionFlag = n.getEnumValue<MessageActionFlag>(MessageActionFlag); },
-        "notSentToMe": n => { messageRulePredicates.notSentToMe = n.getBooleanValue(); },
-        "recipientContains": n => { messageRulePredicates.recipientContains = n.getCollectionOfPrimitiveValues<string>(); },
-        "senderContains": n => { messageRulePredicates.senderContains = n.getCollectionOfPrimitiveValues<string>(); },
-        "sensitivity": n => { messageRulePredicates.sensitivity = n.getEnumValue<Sensitivity>(Sensitivity); },
-        "sentCcMe": n => { messageRulePredicates.sentCcMe = n.getBooleanValue(); },
-        "sentOnlyToMe": n => { messageRulePredicates.sentOnlyToMe = n.getBooleanValue(); },
-        "sentToAddresses": n => { messageRulePredicates.sentToAddresses = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
-        "sentToMe": n => { messageRulePredicates.sentToMe = n.getBooleanValue(); },
-        "sentToOrCcMe": n => { messageRulePredicates.sentToOrCcMe = n.getBooleanValue(); },
-        "subjectContains": n => { messageRulePredicates.subjectContains = n.getCollectionOfPrimitiveValues<string>(); },
-        "withinSizeRange": n => { messageRulePredicates.withinSizeRange = n.getObjectValue<SizeRange>(createSizeRangeFromDiscriminatorValue); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoMultiValueLegacyExtendedProperty.ts b/packages/test/generatedCode/models/deserializeIntoMultiValueLegacyExtendedProperty.ts
deleted file mode 100644
index 7eb708f16..000000000
--- a/packages/test/generatedCode/models/deserializeIntoMultiValueLegacyExtendedProperty.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import {deserializeIntoEntity} from './deserializeIntoEntity';
-import type {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoMultiValueLegacyExtendedProperty(multiValueLegacyExtendedProperty: MultiValueLegacyExtendedProperty | undefined = {} as MultiValueLegacyExtendedProperty) : Record<string, (node: ParseNode) => void> {
-    return {
-        ...deserializeIntoEntity(multiValueLegacyExtendedProperty),
-        "value": n => { multiValueLegacyExtendedProperty.value = n.getCollectionOfPrimitiveValues<string>(); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoOutlookItem.ts b/packages/test/generatedCode/models/deserializeIntoOutlookItem.ts
deleted file mode 100644
index a8d223c9d..000000000
--- a/packages/test/generatedCode/models/deserializeIntoOutlookItem.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import {deserializeIntoEntity} from './deserializeIntoEntity';
-import type {OutlookItem} from './outlookItem';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoOutlookItem(outlookItem: OutlookItem | undefined = {} as OutlookItem) : Record<string, (node: ParseNode) => void> {
-    return {
-        ...deserializeIntoEntity(outlookItem),
-        "categories": n => { outlookItem.categories = n.getCollectionOfPrimitiveValues<string>(); },
-        "changeKey": n => { outlookItem.changeKey = n.getStringValue(); },
-        "createdDateTime": n => { outlookItem.createdDateTime = n.getDateValue(); },
-        "lastModifiedDateTime": n => { outlookItem.lastModifiedDateTime = n.getDateValue(); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoRecipient.ts b/packages/test/generatedCode/models/deserializeIntoRecipient.ts
deleted file mode 100644
index 9069f7008..000000000
--- a/packages/test/generatedCode/models/deserializeIntoRecipient.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import {createEmailAddressFromDiscriminatorValue} from './createEmailAddressFromDiscriminatorValue';
-import type {EmailAddress} from './emailAddress';
-import type {Recipient} from './recipient';
-import {serializeEmailAddress} from './serializeEmailAddress';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoRecipient(recipient: Recipient | undefined = {} as Recipient) : Record<string, (node: ParseNode) => void> {
-    return {
-        "emailAddress": n => { recipient.emailAddress = n.getObjectValue<EmailAddress>(createEmailAddressFromDiscriminatorValue); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoSingleValueLegacyExtendedProperty.ts b/packages/test/generatedCode/models/deserializeIntoSingleValueLegacyExtendedProperty.ts
deleted file mode 100644
index 9e34a27f5..000000000
--- a/packages/test/generatedCode/models/deserializeIntoSingleValueLegacyExtendedProperty.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import {deserializeIntoEntity} from './deserializeIntoEntity';
-import type {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoSingleValueLegacyExtendedProperty(singleValueLegacyExtendedProperty: SingleValueLegacyExtendedProperty | undefined = {} as SingleValueLegacyExtendedProperty) : Record<string, (node: ParseNode) => void> {
-    return {
-        ...deserializeIntoEntity(singleValueLegacyExtendedProperty),
-        "value": n => { singleValueLegacyExtendedProperty.value = n.getStringValue(); },
-    }
-}
diff --git a/packages/test/generatedCode/models/deserializeIntoSizeRange.ts b/packages/test/generatedCode/models/deserializeIntoSizeRange.ts
deleted file mode 100644
index 8d798ffd0..000000000
--- a/packages/test/generatedCode/models/deserializeIntoSizeRange.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type {SizeRange} from './sizeRange';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function deserializeIntoSizeRange(sizeRange: SizeRange | undefined = {} as SizeRange) : Record<string, (node: ParseNode) => void> {
-    return {
-        "maximumSize": n => { sizeRange.maximumSize = n.getNumberValue(); },
-        "minimumSize": n => { sizeRange.minimumSize = n.getNumberValue(); },
-    }
-}
diff --git a/packages/test/generatedCode/models/emailAddress.ts b/packages/test/generatedCode/models/emailAddress.ts
index 081c1b341..8672b912d 100644
--- a/packages/test/generatedCode/models/emailAddress.ts
+++ b/packages/test/generatedCode/models/emailAddress.ts
@@ -1,5 +1,18 @@
-import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createEmailAddressFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoEmailAddress;
+}
+export function deserializeIntoEmailAddress(emailAddress: EmailAddress | undefined = {} as EmailAddress) : Record<string, (node: ParseNode) => void> {
+    return {
+        "address": n => { emailAddress.address = n.getStringValue(); },
+        "name": n => { emailAddress.name = n.getStringValue(); },
+    }
+}
 export interface EmailAddress extends AdditionalDataHolder, Parsable {
     /**
      * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
@@ -8,9 +21,16 @@ export interface EmailAddress extends AdditionalDataHolder, Parsable {
     /**
      * The email address of the person or entity.
      */
-    address?: string | undefined;
+    address?: string;
     /**
      * The display name of the person or entity.
      */
-    name?: string | undefined;
+    name?: string;
+}
+export function serializeEmailAddress(writer: SerializationWriter, emailAddress: EmailAddress | undefined = {} as EmailAddress) : void {
+        writer.writeStringValue("address", emailAddress.address);
+        writer.writeStringValue("name", emailAddress.name);
+        writer.writeAdditionalData(emailAddress.additionalData);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/entity.ts b/packages/test/generatedCode/models/entity.ts
index d29987408..53b5b72c8 100644
--- a/packages/test/generatedCode/models/entity.ts
+++ b/packages/test/generatedCode/models/entity.ts
@@ -1,12 +1,40 @@
-import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { deserializeIntoAttachment } from './attachment';
+import { deserializeIntoExtension } from './extension';
+import { deserializeIntoInferenceClassification } from './inferenceClassification';
+import { deserializeIntoInferenceClassificationOverride } from './inferenceClassificationOverride';
+import { deserializeIntoMailFolder } from './mailFolder';
+import { deserializeIntoMessage } from './message';
+import { deserializeIntoMessageRule } from './messageRule';
+import { deserializeIntoMultiValueLegacyExtendedProperty } from './multiValueLegacyExtendedProperty';
+import { deserializeIntoOutlookItem } from './outlookItem';
+import { deserializeIntoSingleValueLegacyExtendedProperty } from './singleValueLegacyExtendedProperty';
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createEntityFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoEntity;
+}
+export function deserializeIntoEntity(entity: Entity | undefined = {} as Entity) : Record<string, (node: ParseNode) => void> {
+    return {
+        "id": n => { entity.id = n.getStringValue(); },
+    }
+}
 export interface Entity extends AdditionalDataHolder, Parsable {
     /**
      * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
      */
     additionalData?: Record<string, unknown>;
     /**
-     * The unique idenfier for an entity. Read-only.
+     * The unique identifier for an entity. Read-only.
      */
-    id?: string | undefined;
+    id?: string;
+}
+export function serializeEntity(writer: SerializationWriter, entity: Entity | undefined = {} as Entity) : void {
+        writer.writeStringValue("id", entity.id);
+        writer.writeAdditionalData(entity.additionalData);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/extension.ts b/packages/test/generatedCode/models/extension.ts
index c12272c7b..22897a5dc 100644
--- a/packages/test/generatedCode/models/extension.ts
+++ b/packages/test/generatedCode/models/extension.ts
@@ -1,5 +1,22 @@
-import type {Entity} from './entity';
-import type {Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { deserializeIntoEntity, serializeEntity, type Entity } from './entity';
+import { type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createExtensionFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoExtension;
+}
+export function deserializeIntoExtension(extension: Extension | undefined = {} as Extension) : Record<string, (node: ParseNode) => void> {
+    return {
+        ...deserializeIntoEntity(extension),
+    }
+}
 export interface Extension extends Entity, Parsable {
 }
+export function serializeExtension(writer: SerializationWriter, extension: Extension | undefined = {} as Extension) : void {
+        serializeEntity(writer, extension)
+}
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/extensionCollectionResponse.ts b/packages/test/generatedCode/models/extensionCollectionResponse.ts
index 2b49cbf2a..1aa30c3e1 100644
--- a/packages/test/generatedCode/models/extensionCollectionResponse.ts
+++ b/packages/test/generatedCode/models/extensionCollectionResponse.ts
@@ -1,6 +1,19 @@
-import type {Extension} from './extension';
-import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createExtensionFromDiscriminatorValue, serializeExtension, type Extension } from './extension';
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createExtensionCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoExtensionCollectionResponse;
+}
+export function deserializeIntoExtensionCollectionResponse(extensionCollectionResponse: ExtensionCollectionResponse | undefined = {} as ExtensionCollectionResponse) : Record<string, (node: ParseNode) => void> {
+    return {
+        "@odata.nextLink": n => { extensionCollectionResponse.odataNextLink = n.getStringValue(); },
+        "value": n => { extensionCollectionResponse.value = n.getCollectionOfObjectValues<Extension>(createExtensionFromDiscriminatorValue); },
+    }
+}
 export interface ExtensionCollectionResponse extends AdditionalDataHolder, Parsable {
     /**
      * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
@@ -9,9 +22,16 @@ export interface ExtensionCollectionResponse extends AdditionalDataHolder, Parsa
     /**
      * The OdataNextLink property
      */
-    odataNextLink?: string | undefined;
+    odataNextLink?: string;
     /**
      * The value property
      */
-    value?: Extension[] | undefined;
+    value?: Extension[];
+}
+export function serializeExtensionCollectionResponse(writer: SerializationWriter, extensionCollectionResponse: ExtensionCollectionResponse | undefined = {} as ExtensionCollectionResponse) : void {
+        writer.writeStringValue("@odata.nextLink", extensionCollectionResponse.odataNextLink);
+        writer.writeCollectionOfObjectValues<Extension>("value", extensionCollectionResponse.value, );
+        writer.writeAdditionalData(extensionCollectionResponse.additionalData);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/followupFlag.ts b/packages/test/generatedCode/models/followupFlag.ts
index 6fbff6afd..637e1c948 100644
--- a/packages/test/generatedCode/models/followupFlag.ts
+++ b/packages/test/generatedCode/models/followupFlag.ts
@@ -1,7 +1,22 @@
-import type {DateTimeTimeZone} from './dateTimeTimeZone';
-import {FollowupFlagStatus} from './followupFlagStatus';
-import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createDateTimeTimeZoneFromDiscriminatorValue, serializeDateTimeTimeZone, type DateTimeTimeZone } from './dateTimeTimeZone';
+import { FollowupFlagStatus } from './followupFlagStatus';
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createFollowupFlagFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoFollowupFlag;
+}
+export function deserializeIntoFollowupFlag(followupFlag: FollowupFlag | undefined = {} as FollowupFlag) : Record<string, (node: ParseNode) => void> {
+    return {
+        "completedDateTime": n => { followupFlag.completedDateTime = n.getObjectValue<DateTimeTimeZone>(createDateTimeTimeZoneFromDiscriminatorValue); },
+        "dueDateTime": n => { followupFlag.dueDateTime = n.getObjectValue<DateTimeTimeZone>(createDateTimeTimeZoneFromDiscriminatorValue); },
+        "flagStatus": n => { followupFlag.flagStatus = n.getEnumValue<FollowupFlagStatus>(FollowupFlagStatus); },
+        "startDateTime": n => { followupFlag.startDateTime = n.getObjectValue<DateTimeTimeZone>(createDateTimeTimeZoneFromDiscriminatorValue); },
+    }
+}
 export interface FollowupFlag extends AdditionalDataHolder, Parsable {
     /**
      * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
@@ -10,17 +25,26 @@ export interface FollowupFlag extends AdditionalDataHolder, Parsable {
     /**
      * The completedDateTime property
      */
-    completedDateTime?: DateTimeTimeZone | undefined;
+    completedDateTime?: DateTimeTimeZone;
     /**
      * The dueDateTime property
      */
-    dueDateTime?: DateTimeTimeZone | undefined;
+    dueDateTime?: DateTimeTimeZone;
     /**
      * The flagStatus property
      */
-    flagStatus?: FollowupFlagStatus | undefined;
+    flagStatus?: FollowupFlagStatus;
     /**
      * The startDateTime property
      */
-    startDateTime?: DateTimeTimeZone | undefined;
+    startDateTime?: DateTimeTimeZone;
+}
+export function serializeFollowupFlag(writer: SerializationWriter, followupFlag: FollowupFlag | undefined = {} as FollowupFlag) : void {
+        writer.writeObjectValue<DateTimeTimeZone>("completedDateTime", followupFlag.completedDateTime, );
+        writer.writeObjectValue<DateTimeTimeZone>("dueDateTime", followupFlag.dueDateTime, );
+        writer.writeEnumValue<FollowupFlagStatus>("flagStatus", followupFlag.flagStatus);
+        writer.writeObjectValue<DateTimeTimeZone>("startDateTime", followupFlag.startDateTime, );
+        writer.writeAdditionalData(followupFlag.additionalData);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/followupFlagStatus.ts b/packages/test/generatedCode/models/followupFlagStatus.ts
index 433015ccb..a03a5fe92 100644
--- a/packages/test/generatedCode/models/followupFlagStatus.ts
+++ b/packages/test/generatedCode/models/followupFlagStatus.ts
@@ -3,3 +3,5 @@ export enum FollowupFlagStatus {
     Complete = "complete",
     Flagged = "flagged",
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/importance.ts b/packages/test/generatedCode/models/importance.ts
index 549bd987f..8aa24637e 100644
--- a/packages/test/generatedCode/models/importance.ts
+++ b/packages/test/generatedCode/models/importance.ts
@@ -3,3 +3,5 @@ export enum Importance {
     Normal = "normal",
     High = "high",
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/index.ts b/packages/test/generatedCode/models/index.ts
index f4e950175..42fcef976 100644
--- a/packages/test/generatedCode/models/index.ts
+++ b/packages/test/generatedCode/models/index.ts
@@ -6,59 +6,7 @@ export * from './messageActionFlag'
 export * from './sensitivity'
 export * from './attachment'
 export * from './attachmentCollectionResponse'
-export * from './createAttachmentCollectionResponseFromDiscriminatorValue'
-export * from './createAttachmentFromDiscriminatorValue'
-export * from './createDateTimeTimeZoneFromDiscriminatorValue'
-export * from './createEmailAddressFromDiscriminatorValue'
-export * from './createEntityFromDiscriminatorValue'
-export * from './createExtensionCollectionResponseFromDiscriminatorValue'
-export * from './createExtensionFromDiscriminatorValue'
-export * from './createFollowupFlagFromDiscriminatorValue'
-export * from './createInferenceClassificationFromDiscriminatorValue'
-export * from './createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue'
-export * from './createInferenceClassificationOverrideFromDiscriminatorValue'
-export * from './createInternetMessageHeaderFromDiscriminatorValue'
-export * from './createItemBodyFromDiscriminatorValue'
-export * from './createMailFolderCollectionResponseFromDiscriminatorValue'
-export * from './createMailFolderFromDiscriminatorValue'
-export * from './createMessageCollectionResponseFromDiscriminatorValue'
-export * from './createMessageFromDiscriminatorValue'
-export * from './createMessageRuleActionsFromDiscriminatorValue'
-export * from './createMessageRuleCollectionResponseFromDiscriminatorValue'
-export * from './createMessageRuleFromDiscriminatorValue'
-export * from './createMessageRulePredicatesFromDiscriminatorValue'
-export * from './createMultiValueLegacyExtendedPropertyFromDiscriminatorValue'
-export * from './createOutlookItemFromDiscriminatorValue'
-export * from './createRecipientFromDiscriminatorValue'
-export * from './createSingleValueLegacyExtendedPropertyFromDiscriminatorValue'
-export * from './createSizeRangeFromDiscriminatorValue'
 export * from './dateTimeTimeZone'
-export * from './deserializeIntoAttachment'
-export * from './deserializeIntoAttachmentCollectionResponse'
-export * from './deserializeIntoDateTimeTimeZone'
-export * from './deserializeIntoEmailAddress'
-export * from './deserializeIntoEntity'
-export * from './deserializeIntoExtension'
-export * from './deserializeIntoExtensionCollectionResponse'
-export * from './deserializeIntoFollowupFlag'
-export * from './deserializeIntoInferenceClassification'
-export * from './deserializeIntoInferenceClassificationOverride'
-export * from './deserializeIntoInferenceClassificationOverrideCollectionResponse'
-export * from './deserializeIntoInternetMessageHeader'
-export * from './deserializeIntoItemBody'
-export * from './deserializeIntoMailFolder'
-export * from './deserializeIntoMailFolderCollectionResponse'
-export * from './deserializeIntoMessage'
-export * from './deserializeIntoMessageCollectionResponse'
-export * from './deserializeIntoMessageRule'
-export * from './deserializeIntoMessageRuleActions'
-export * from './deserializeIntoMessageRuleCollectionResponse'
-export * from './deserializeIntoMessageRulePredicates'
-export * from './deserializeIntoMultiValueLegacyExtendedProperty'
-export * from './deserializeIntoOutlookItem'
-export * from './deserializeIntoRecipient'
-export * from './deserializeIntoSingleValueLegacyExtendedProperty'
-export * from './deserializeIntoSizeRange'
 export * from './emailAddress'
 export * from './entity'
 export * from './extension'
@@ -80,31 +28,5 @@ export * from './messageRulePredicates'
 export * from './multiValueLegacyExtendedProperty'
 export * from './outlookItem'
 export * from './recipient'
-export * from './serializeAttachment'
-export * from './serializeAttachmentCollectionResponse'
-export * from './serializeDateTimeTimeZone'
-export * from './serializeEmailAddress'
-export * from './serializeEntity'
-export * from './serializeExtension'
-export * from './serializeExtensionCollectionResponse'
-export * from './serializeFollowupFlag'
-export * from './serializeInferenceClassification'
-export * from './serializeInferenceClassificationOverride'
-export * from './serializeInferenceClassificationOverrideCollectionResponse'
-export * from './serializeInternetMessageHeader'
-export * from './serializeItemBody'
-export * from './serializeMailFolder'
-export * from './serializeMailFolderCollectionResponse'
-export * from './serializeMessage'
-export * from './serializeMessageCollectionResponse'
-export * from './serializeMessageRule'
-export * from './serializeMessageRuleActions'
-export * from './serializeMessageRuleCollectionResponse'
-export * from './serializeMessageRulePredicates'
-export * from './serializeMultiValueLegacyExtendedProperty'
-export * from './serializeOutlookItem'
-export * from './serializeRecipient'
-export * from './serializeSingleValueLegacyExtendedProperty'
-export * from './serializeSizeRange'
 export * from './singleValueLegacyExtendedProperty'
 export * from './sizeRange'
diff --git a/packages/test/generatedCode/models/inferenceClassification.ts b/packages/test/generatedCode/models/inferenceClassification.ts
index 3200f7a22..5c56d7e73 100644
--- a/packages/test/generatedCode/models/inferenceClassification.ts
+++ b/packages/test/generatedCode/models/inferenceClassification.ts
@@ -1,10 +1,29 @@
-import type {Entity} from './entity';
-import type {InferenceClassificationOverride} from './inferenceClassificationOverride';
-import type {Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { deserializeIntoEntity, serializeEntity, type Entity } from './entity';
+import { createInferenceClassificationOverrideFromDiscriminatorValue, serializeInferenceClassificationOverride, type InferenceClassificationOverride } from './inferenceClassificationOverride';
+import { type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createInferenceClassificationFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoInferenceClassification;
+}
+export function deserializeIntoInferenceClassification(inferenceClassification: InferenceClassification | undefined = {} as InferenceClassification) : Record<string, (node: ParseNode) => void> {
+    return {
+        ...deserializeIntoEntity(inferenceClassification),
+        "overrides": n => { inferenceClassification.overrides = n.getCollectionOfObjectValues<InferenceClassificationOverride>(createInferenceClassificationOverrideFromDiscriminatorValue); },
+    }
+}
 export interface InferenceClassification extends Entity, Parsable {
     /**
      * A set of overrides for a user to always classify messages from specific senders in certain ways: focused, or other. Read-only. Nullable.
      */
-    overrides?: InferenceClassificationOverride[] | undefined;
+    overrides?: InferenceClassificationOverride[];
+}
+export function serializeInferenceClassification(writer: SerializationWriter, inferenceClassification: InferenceClassification | undefined = {} as InferenceClassification) : void {
+        serializeEntity(writer, inferenceClassification)
+        writer.writeCollectionOfObjectValues<InferenceClassificationOverride>("overrides", inferenceClassification.overrides, );
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/inferenceClassificationOverride.ts b/packages/test/generatedCode/models/inferenceClassificationOverride.ts
index df7d9e016..9381957d9 100644
--- a/packages/test/generatedCode/models/inferenceClassificationOverride.ts
+++ b/packages/test/generatedCode/models/inferenceClassificationOverride.ts
@@ -1,15 +1,36 @@
-import type {EmailAddress} from './emailAddress';
-import type {Entity} from './entity';
-import {InferenceClassificationType} from './inferenceClassificationType';
-import type {Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createEmailAddressFromDiscriminatorValue, serializeEmailAddress, type EmailAddress } from './emailAddress';
+import { deserializeIntoEntity, serializeEntity, type Entity } from './entity';
+import { InferenceClassificationType } from './inferenceClassificationType';
+import { type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createInferenceClassificationOverrideFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoInferenceClassificationOverride;
+}
+export function deserializeIntoInferenceClassificationOverride(inferenceClassificationOverride: InferenceClassificationOverride | undefined = {} as InferenceClassificationOverride) : Record<string, (node: ParseNode) => void> {
+    return {
+        ...deserializeIntoEntity(inferenceClassificationOverride),
+        "classifyAs": n => { inferenceClassificationOverride.classifyAs = n.getEnumValue<InferenceClassificationType>(InferenceClassificationType); },
+        "senderEmailAddress": n => { inferenceClassificationOverride.senderEmailAddress = n.getObjectValue<EmailAddress>(createEmailAddressFromDiscriminatorValue); },
+    }
+}
 export interface InferenceClassificationOverride extends Entity, Parsable {
     /**
      * The classifyAs property
      */
-    classifyAs?: InferenceClassificationType | undefined;
+    classifyAs?: InferenceClassificationType;
     /**
      * The senderEmailAddress property
      */
-    senderEmailAddress?: EmailAddress | undefined;
+    senderEmailAddress?: EmailAddress;
+}
+export function serializeInferenceClassificationOverride(writer: SerializationWriter, inferenceClassificationOverride: InferenceClassificationOverride | undefined = {} as InferenceClassificationOverride) : void {
+        serializeEntity(writer, inferenceClassificationOverride)
+        writer.writeEnumValue<InferenceClassificationType>("classifyAs", inferenceClassificationOverride.classifyAs);
+        writer.writeObjectValue<EmailAddress>("senderEmailAddress", inferenceClassificationOverride.senderEmailAddress, );
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/inferenceClassificationOverrideCollectionResponse.ts b/packages/test/generatedCode/models/inferenceClassificationOverrideCollectionResponse.ts
index e7c3cf571..36aad8418 100644
--- a/packages/test/generatedCode/models/inferenceClassificationOverrideCollectionResponse.ts
+++ b/packages/test/generatedCode/models/inferenceClassificationOverrideCollectionResponse.ts
@@ -1,6 +1,19 @@
-import type {InferenceClassificationOverride} from './inferenceClassificationOverride';
-import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createInferenceClassificationOverrideFromDiscriminatorValue, serializeInferenceClassificationOverride, type InferenceClassificationOverride } from './inferenceClassificationOverride';
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoInferenceClassificationOverrideCollectionResponse;
+}
+export function deserializeIntoInferenceClassificationOverrideCollectionResponse(inferenceClassificationOverrideCollectionResponse: InferenceClassificationOverrideCollectionResponse | undefined = {} as InferenceClassificationOverrideCollectionResponse) : Record<string, (node: ParseNode) => void> {
+    return {
+        "@odata.nextLink": n => { inferenceClassificationOverrideCollectionResponse.odataNextLink = n.getStringValue(); },
+        "value": n => { inferenceClassificationOverrideCollectionResponse.value = n.getCollectionOfObjectValues<InferenceClassificationOverride>(createInferenceClassificationOverrideFromDiscriminatorValue); },
+    }
+}
 export interface InferenceClassificationOverrideCollectionResponse extends AdditionalDataHolder, Parsable {
     /**
      * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
@@ -9,9 +22,16 @@ export interface InferenceClassificationOverrideCollectionResponse extends Addit
     /**
      * The OdataNextLink property
      */
-    odataNextLink?: string | undefined;
+    odataNextLink?: string;
     /**
      * The value property
      */
-    value?: InferenceClassificationOverride[] | undefined;
+    value?: InferenceClassificationOverride[];
+}
+export function serializeInferenceClassificationOverrideCollectionResponse(writer: SerializationWriter, inferenceClassificationOverrideCollectionResponse: InferenceClassificationOverrideCollectionResponse | undefined = {} as InferenceClassificationOverrideCollectionResponse) : void {
+        writer.writeStringValue("@odata.nextLink", inferenceClassificationOverrideCollectionResponse.odataNextLink);
+        writer.writeCollectionOfObjectValues<InferenceClassificationOverride>("value", inferenceClassificationOverrideCollectionResponse.value, );
+        writer.writeAdditionalData(inferenceClassificationOverrideCollectionResponse.additionalData);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/inferenceClassificationType.ts b/packages/test/generatedCode/models/inferenceClassificationType.ts
index 3e174ab73..ae6120549 100644
--- a/packages/test/generatedCode/models/inferenceClassificationType.ts
+++ b/packages/test/generatedCode/models/inferenceClassificationType.ts
@@ -2,3 +2,5 @@ export enum InferenceClassificationType {
     Focused = "focused",
     Other = "other",
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/internetMessageHeader.ts b/packages/test/generatedCode/models/internetMessageHeader.ts
index c3ee21d89..eac21a058 100644
--- a/packages/test/generatedCode/models/internetMessageHeader.ts
+++ b/packages/test/generatedCode/models/internetMessageHeader.ts
@@ -1,5 +1,18 @@
-import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createInternetMessageHeaderFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoInternetMessageHeader;
+}
+export function deserializeIntoInternetMessageHeader(internetMessageHeader: InternetMessageHeader | undefined = {} as InternetMessageHeader) : Record<string, (node: ParseNode) => void> {
+    return {
+        "name": n => { internetMessageHeader.name = n.getStringValue(); },
+        "value": n => { internetMessageHeader.value = n.getStringValue(); },
+    }
+}
 export interface InternetMessageHeader extends AdditionalDataHolder, Parsable {
     /**
      * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
@@ -8,9 +21,16 @@ export interface InternetMessageHeader extends AdditionalDataHolder, Parsable {
     /**
      * Represents the key in a key-value pair.
      */
-    name?: string | undefined;
+    name?: string;
     /**
      * The value in a key-value pair.
      */
-    value?: string | undefined;
+    value?: string;
+}
+export function serializeInternetMessageHeader(writer: SerializationWriter, internetMessageHeader: InternetMessageHeader | undefined = {} as InternetMessageHeader) : void {
+        writer.writeStringValue("name", internetMessageHeader.name);
+        writer.writeStringValue("value", internetMessageHeader.value);
+        writer.writeAdditionalData(internetMessageHeader.additionalData);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/itemBody.ts b/packages/test/generatedCode/models/itemBody.ts
index 10cf1fd2a..5bfacaa01 100644
--- a/packages/test/generatedCode/models/itemBody.ts
+++ b/packages/test/generatedCode/models/itemBody.ts
@@ -1,6 +1,19 @@
-import {BodyType} from './bodyType';
-import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { BodyType } from './bodyType';
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createItemBodyFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoItemBody;
+}
+export function deserializeIntoItemBody(itemBody: ItemBody | undefined = {} as ItemBody) : Record<string, (node: ParseNode) => void> {
+    return {
+        "content": n => { itemBody.content = n.getStringValue(); },
+        "contentType": n => { itemBody.contentType = n.getEnumValue<BodyType>(BodyType); },
+    }
+}
 export interface ItemBody extends AdditionalDataHolder, Parsable {
     /**
      * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
@@ -9,9 +22,16 @@ export interface ItemBody extends AdditionalDataHolder, Parsable {
     /**
      * The content of the item.
      */
-    content?: string | undefined;
+    content?: string;
     /**
      * The contentType property
      */
-    contentType?: BodyType | undefined;
+    contentType?: BodyType;
+}
+export function serializeItemBody(writer: SerializationWriter, itemBody: ItemBody | undefined = {} as ItemBody) : void {
+        writer.writeStringValue("content", itemBody.content);
+        writer.writeEnumValue<BodyType>("contentType", itemBody.contentType);
+        writer.writeAdditionalData(itemBody.additionalData);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/mailFolder.ts b/packages/test/generatedCode/models/mailFolder.ts
index 4d14024c3..40430baf2 100644
--- a/packages/test/generatedCode/models/mailFolder.ts
+++ b/packages/test/generatedCode/models/mailFolder.ts
@@ -1,53 +1,92 @@
-import type {Entity} from './entity';
-import type {Message} from './message';
-import type {MessageRule} from './messageRule';
-import type {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
-import type {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
-import type {Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { deserializeIntoEntity, serializeEntity, type Entity } from './entity';
+import { createMessageFromDiscriminatorValue, serializeMessage, type Message } from './message';
+import { createMessageRuleFromDiscriminatorValue, serializeMessageRule, type MessageRule } from './messageRule';
+import { createMultiValueLegacyExtendedPropertyFromDiscriminatorValue, serializeMultiValueLegacyExtendedProperty, type MultiValueLegacyExtendedProperty } from './multiValueLegacyExtendedProperty';
+import { createSingleValueLegacyExtendedPropertyFromDiscriminatorValue, serializeSingleValueLegacyExtendedProperty, type SingleValueLegacyExtendedProperty } from './singleValueLegacyExtendedProperty';
+import { type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createMailFolderFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoMailFolder;
+}
+export function deserializeIntoMailFolder(mailFolder: MailFolder | undefined = {} as MailFolder) : Record<string, (node: ParseNode) => void> {
+    return {
+        ...deserializeIntoEntity(mailFolder),
+        "childFolderCount": n => { mailFolder.childFolderCount = n.getNumberValue(); },
+        "childFolders": n => { mailFolder.childFolders = n.getCollectionOfObjectValues<MailFolder>(createMailFolderFromDiscriminatorValue); },
+        "displayName": n => { mailFolder.displayName = n.getStringValue(); },
+        "isHidden": n => { mailFolder.isHidden = n.getBooleanValue(); },
+        "messageRules": n => { mailFolder.messageRules = n.getCollectionOfObjectValues<MessageRule>(createMessageRuleFromDiscriminatorValue); },
+        "messages": n => { mailFolder.messages = n.getCollectionOfObjectValues<Message>(createMessageFromDiscriminatorValue); },
+        "multiValueExtendedProperties": n => { mailFolder.multiValueExtendedProperties = n.getCollectionOfObjectValues<MultiValueLegacyExtendedProperty>(createMultiValueLegacyExtendedPropertyFromDiscriminatorValue); },
+        "parentFolderId": n => { mailFolder.parentFolderId = n.getStringValue(); },
+        "singleValueExtendedProperties": n => { mailFolder.singleValueExtendedProperties = n.getCollectionOfObjectValues<SingleValueLegacyExtendedProperty>(createSingleValueLegacyExtendedPropertyFromDiscriminatorValue); },
+        "totalItemCount": n => { mailFolder.totalItemCount = n.getNumberValue(); },
+        "unreadItemCount": n => { mailFolder.unreadItemCount = n.getNumberValue(); },
+    }
+}
 export interface MailFolder extends Entity, Parsable {
     /**
      * The number of immediate child mailFolders in the current mailFolder.
      */
-    childFolderCount?: number | undefined;
+    childFolderCount?: number;
     /**
      * The collection of child folders in the mailFolder.
      */
-    childFolders?: MailFolder[] | undefined;
+    childFolders?: MailFolder[];
     /**
      * The mailFolder's display name.
      */
-    displayName?: string | undefined;
+    displayName?: string;
     /**
      * Indicates whether the mailFolder is hidden. This property can be set only when creating the folder. Find more information in Hidden mail folders.
      */
-    isHidden?: boolean | undefined;
+    isHidden?: boolean;
     /**
      * The collection of rules that apply to the user's Inbox folder.
      */
-    messageRules?: MessageRule[] | undefined;
+    messageRules?: MessageRule[];
     /**
      * The collection of messages in the mailFolder.
      */
-    messages?: Message[] | undefined;
+    messages?: Message[];
     /**
      * The collection of multi-value extended properties defined for the mailFolder. Read-only. Nullable.
      */
-    multiValueExtendedProperties?: MultiValueLegacyExtendedProperty[] | undefined;
+    multiValueExtendedProperties?: MultiValueLegacyExtendedProperty[];
     /**
      * The unique identifier for the mailFolder's parent mailFolder.
      */
-    parentFolderId?: string | undefined;
+    parentFolderId?: string;
     /**
      * The collection of single-value extended properties defined for the mailFolder. Read-only. Nullable.
      */
-    singleValueExtendedProperties?: SingleValueLegacyExtendedProperty[] | undefined;
+    singleValueExtendedProperties?: SingleValueLegacyExtendedProperty[];
     /**
      * The number of items in the mailFolder.
      */
-    totalItemCount?: number | undefined;
+    totalItemCount?: number;
     /**
      * The number of items in the mailFolder marked as unread.
      */
-    unreadItemCount?: number | undefined;
+    unreadItemCount?: number;
+}
+export function serializeMailFolder(writer: SerializationWriter, mailFolder: MailFolder | undefined = {} as MailFolder) : void {
+        serializeEntity(writer, mailFolder)
+        writer.writeNumberValue("childFolderCount", mailFolder.childFolderCount);
+        writer.writeCollectionOfObjectValues<MailFolder>("childFolders", mailFolder.childFolders, );
+        writer.writeStringValue("displayName", mailFolder.displayName);
+        writer.writeBooleanValue("isHidden", mailFolder.isHidden);
+        writer.writeCollectionOfObjectValues<MessageRule>("messageRules", mailFolder.messageRules, );
+        writer.writeCollectionOfObjectValues<Message>("messages", mailFolder.messages, );
+        writer.writeCollectionOfObjectValues<MultiValueLegacyExtendedProperty>("multiValueExtendedProperties", mailFolder.multiValueExtendedProperties, );
+        writer.writeStringValue("parentFolderId", mailFolder.parentFolderId);
+        writer.writeCollectionOfObjectValues<SingleValueLegacyExtendedProperty>("singleValueExtendedProperties", mailFolder.singleValueExtendedProperties, );
+        writer.writeNumberValue("totalItemCount", mailFolder.totalItemCount);
+        writer.writeNumberValue("unreadItemCount", mailFolder.unreadItemCount);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/mailFolderCollectionResponse.ts b/packages/test/generatedCode/models/mailFolderCollectionResponse.ts
index b9f483a35..90cfe3816 100644
--- a/packages/test/generatedCode/models/mailFolderCollectionResponse.ts
+++ b/packages/test/generatedCode/models/mailFolderCollectionResponse.ts
@@ -1,6 +1,19 @@
-import type {MailFolder} from './mailFolder';
-import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createMailFolderFromDiscriminatorValue, serializeMailFolder, type MailFolder } from './mailFolder';
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createMailFolderCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoMailFolderCollectionResponse;
+}
+export function deserializeIntoMailFolderCollectionResponse(mailFolderCollectionResponse: MailFolderCollectionResponse | undefined = {} as MailFolderCollectionResponse) : Record<string, (node: ParseNode) => void> {
+    return {
+        "@odata.nextLink": n => { mailFolderCollectionResponse.odataNextLink = n.getStringValue(); },
+        "value": n => { mailFolderCollectionResponse.value = n.getCollectionOfObjectValues<MailFolder>(createMailFolderFromDiscriminatorValue); },
+    }
+}
 export interface MailFolderCollectionResponse extends AdditionalDataHolder, Parsable {
     /**
      * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
@@ -9,9 +22,16 @@ export interface MailFolderCollectionResponse extends AdditionalDataHolder, Pars
     /**
      * The OdataNextLink property
      */
-    odataNextLink?: string | undefined;
+    odataNextLink?: string;
     /**
      * The value property
      */
-    value?: MailFolder[] | undefined;
+    value?: MailFolder[];
+}
+export function serializeMailFolderCollectionResponse(writer: SerializationWriter, mailFolderCollectionResponse: MailFolderCollectionResponse | undefined = {} as MailFolderCollectionResponse) : void {
+        writer.writeStringValue("@odata.nextLink", mailFolderCollectionResponse.odataNextLink);
+        writer.writeCollectionOfObjectValues<MailFolder>("value", mailFolderCollectionResponse.value, );
+        writer.writeAdditionalData(mailFolderCollectionResponse.additionalData);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/message.ts b/packages/test/generatedCode/models/message.ts
index 5d43a27de..66a708d12 100644
--- a/packages/test/generatedCode/models/message.ts
+++ b/packages/test/generatedCode/models/message.ts
@@ -1,135 +1,212 @@
-import type {Attachment} from './attachment';
-import type {Extension} from './extension';
-import type {FollowupFlag} from './followupFlag';
-import {Importance} from './importance';
-import {InferenceClassificationType} from './inferenceClassificationType';
-import type {InternetMessageHeader} from './internetMessageHeader';
-import type {ItemBody} from './itemBody';
-import type {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
-import type {OutlookItem} from './outlookItem';
-import type {Recipient} from './recipient';
-import type {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
-import type {Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createAttachmentFromDiscriminatorValue, serializeAttachment, type Attachment } from './attachment';
+import { createExtensionFromDiscriminatorValue, serializeExtension, type Extension } from './extension';
+import { createFollowupFlagFromDiscriminatorValue, serializeFollowupFlag, type FollowupFlag } from './followupFlag';
+import { Importance } from './importance';
+import { InferenceClassificationType } from './inferenceClassificationType';
+import { createInternetMessageHeaderFromDiscriminatorValue, serializeInternetMessageHeader, type InternetMessageHeader } from './internetMessageHeader';
+import { createItemBodyFromDiscriminatorValue, serializeItemBody, type ItemBody } from './itemBody';
+import { createMultiValueLegacyExtendedPropertyFromDiscriminatorValue, serializeMultiValueLegacyExtendedProperty, type MultiValueLegacyExtendedProperty } from './multiValueLegacyExtendedProperty';
+import { deserializeIntoOutlookItem, serializeOutlookItem, type OutlookItem } from './outlookItem';
+import { createRecipientFromDiscriminatorValue, serializeRecipient, type Recipient } from './recipient';
+import { createSingleValueLegacyExtendedPropertyFromDiscriminatorValue, serializeSingleValueLegacyExtendedProperty, type SingleValueLegacyExtendedProperty } from './singleValueLegacyExtendedProperty';
+import { type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createMessageFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoMessage;
+}
+export function deserializeIntoMessage(message: Message | undefined = {} as Message) : Record<string, (node: ParseNode) => void> {
+    return {
+        ...deserializeIntoOutlookItem(message),
+        "attachments": n => { message.attachments = n.getCollectionOfObjectValues<Attachment>(createAttachmentFromDiscriminatorValue); },
+        "bccRecipients": n => { message.bccRecipients = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
+        "body": n => { message.body = n.getObjectValue<ItemBody>(createItemBodyFromDiscriminatorValue); },
+        "bodyPreview": n => { message.bodyPreview = n.getStringValue(); },
+        "ccRecipients": n => { message.ccRecipients = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
+        "conversationId": n => { message.conversationId = n.getStringValue(); },
+        "conversationIndex": n => { message.conversationIndex = n.getStringValue(); },
+        "extensions": n => { message.extensions = n.getCollectionOfObjectValues<Extension>(createExtensionFromDiscriminatorValue); },
+        "flag": n => { message.flag = n.getObjectValue<FollowupFlag>(createFollowupFlagFromDiscriminatorValue); },
+        "from": n => { message.from = n.getObjectValue<Recipient>(createRecipientFromDiscriminatorValue); },
+        "hasAttachments": n => { message.hasAttachments = n.getBooleanValue(); },
+        "importance": n => { message.importance = n.getEnumValue<Importance>(Importance); },
+        "inferenceClassification": n => { message.inferenceClassification = n.getEnumValue<InferenceClassificationType>(InferenceClassificationType); },
+        "internetMessageHeaders": n => { message.internetMessageHeaders = n.getCollectionOfObjectValues<InternetMessageHeader>(createInternetMessageHeaderFromDiscriminatorValue); },
+        "internetMessageId": n => { message.internetMessageId = n.getStringValue(); },
+        "isDeliveryReceiptRequested": n => { message.isDeliveryReceiptRequested = n.getBooleanValue(); },
+        "isDraft": n => { message.isDraft = n.getBooleanValue(); },
+        "isRead": n => { message.isRead = n.getBooleanValue(); },
+        "isReadReceiptRequested": n => { message.isReadReceiptRequested = n.getBooleanValue(); },
+        "multiValueExtendedProperties": n => { message.multiValueExtendedProperties = n.getCollectionOfObjectValues<MultiValueLegacyExtendedProperty>(createMultiValueLegacyExtendedPropertyFromDiscriminatorValue); },
+        "parentFolderId": n => { message.parentFolderId = n.getStringValue(); },
+        "receivedDateTime": n => { message.receivedDateTime = n.getDateValue(); },
+        "replyTo": n => { message.replyTo = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
+        "sender": n => { message.sender = n.getObjectValue<Recipient>(createRecipientFromDiscriminatorValue); },
+        "sentDateTime": n => { message.sentDateTime = n.getDateValue(); },
+        "singleValueExtendedProperties": n => { message.singleValueExtendedProperties = n.getCollectionOfObjectValues<SingleValueLegacyExtendedProperty>(createSingleValueLegacyExtendedPropertyFromDiscriminatorValue); },
+        "subject": n => { message.subject = n.getStringValue(); },
+        "toRecipients": n => { message.toRecipients = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
+        "uniqueBody": n => { message.uniqueBody = n.getObjectValue<ItemBody>(createItemBodyFromDiscriminatorValue); },
+        "webLink": n => { message.webLink = n.getStringValue(); },
+    }
+}
 export interface Message extends OutlookItem, Parsable {
     /**
      * The fileAttachment and itemAttachment attachments for the message.
      */
-    attachments?: Attachment[] | undefined;
+    attachments?: Attachment[];
     /**
      * The Bcc: recipients for the message.
      */
-    bccRecipients?: Recipient[] | undefined;
+    bccRecipients?: Recipient[];
     /**
      * The body property
      */
-    body?: ItemBody | undefined;
+    body?: ItemBody;
     /**
      * The first 255 characters of the message body. It is in text format.
      */
-    bodyPreview?: string | undefined;
+    bodyPreview?: string;
     /**
      * The Cc: recipients for the message.
      */
-    ccRecipients?: Recipient[] | undefined;
+    ccRecipients?: Recipient[];
     /**
      * The ID of the conversation the email belongs to.
      */
-    conversationId?: string | undefined;
+    conversationId?: string;
     /**
      * Indicates the position of the message within the conversation.
      */
-    conversationIndex?: string | undefined;
+    conversationIndex?: string;
     /**
      * The collection of open extensions defined for the message. Nullable.
      */
-    extensions?: Extension[] | undefined;
+    extensions?: Extension[];
     /**
      * The flag property
      */
-    flag?: FollowupFlag | undefined;
+    flag?: FollowupFlag;
     /**
      * The from property
      */
-    from?: Recipient | undefined;
+    from?: Recipient;
     /**
      * Indicates whether the message has attachments. This property doesn't include inline attachments, so if a message contains only inline attachments, this property is false. To verify the existence of inline attachments, parse the body property to look for a src attribute, such as <IMG src='cid:image001.jpg@01D26CD8.6C05F070'>.
      */
-    hasAttachments?: boolean | undefined;
+    hasAttachments?: boolean;
     /**
      * The importance property
      */
-    importance?: Importance | undefined;
+    importance?: Importance;
     /**
      * The inferenceClassification property
      */
-    inferenceClassification?: InferenceClassificationType | undefined;
+    inferenceClassification?: InferenceClassificationType;
     /**
      * The internetMessageHeaders property
      */
-    internetMessageHeaders?: InternetMessageHeader[] | undefined;
+    internetMessageHeaders?: InternetMessageHeader[];
     /**
      * The internetMessageId property
      */
-    internetMessageId?: string | undefined;
+    internetMessageId?: string;
     /**
      * The isDeliveryReceiptRequested property
      */
-    isDeliveryReceiptRequested?: boolean | undefined;
+    isDeliveryReceiptRequested?: boolean;
     /**
      * The isDraft property
      */
-    isDraft?: boolean | undefined;
+    isDraft?: boolean;
     /**
      * The isRead property
      */
-    isRead?: boolean | undefined;
+    isRead?: boolean;
     /**
      * The isReadReceiptRequested property
      */
-    isReadReceiptRequested?: boolean | undefined;
+    isReadReceiptRequested?: boolean;
     /**
      * The collection of multi-value extended properties defined for the message. Nullable.
      */
-    multiValueExtendedProperties?: MultiValueLegacyExtendedProperty[] | undefined;
+    multiValueExtendedProperties?: MultiValueLegacyExtendedProperty[];
     /**
      * The parentFolderId property
      */
-    parentFolderId?: string | undefined;
+    parentFolderId?: string;
     /**
      * The receivedDateTime property
      */
-    receivedDateTime?: Date | undefined;
+    receivedDateTime?: Date;
     /**
      * The replyTo property
      */
-    replyTo?: Recipient[] | undefined;
+    replyTo?: Recipient[];
     /**
      * The sender property
      */
-    sender?: Recipient | undefined;
+    sender?: Recipient;
     /**
      * The sentDateTime property
      */
-    sentDateTime?: Date | undefined;
+    sentDateTime?: Date;
     /**
      * The collection of single-value extended properties defined for the message. Nullable.
      */
-    singleValueExtendedProperties?: SingleValueLegacyExtendedProperty[] | undefined;
+    singleValueExtendedProperties?: SingleValueLegacyExtendedProperty[];
     /**
      * The subject property
      */
-    subject?: string | undefined;
+    subject?: string;
     /**
      * The toRecipients property
      */
-    toRecipients?: Recipient[] | undefined;
+    toRecipients?: Recipient[];
     /**
      * The uniqueBody property
      */
-    uniqueBody?: ItemBody | undefined;
+    uniqueBody?: ItemBody;
     /**
      * The webLink property
      */
-    webLink?: string | undefined;
+    webLink?: string;
+}
+export function serializeMessage(writer: SerializationWriter, message: Message | undefined = {} as Message) : void {
+        serializeOutlookItem(writer, message)
+        writer.writeCollectionOfObjectValues<Attachment>("attachments", message.attachments, );
+        writer.writeCollectionOfObjectValues<Recipient>("bccRecipients", message.bccRecipients, );
+        writer.writeObjectValue<ItemBody>("body", message.body, );
+        writer.writeStringValue("bodyPreview", message.bodyPreview);
+        writer.writeCollectionOfObjectValues<Recipient>("ccRecipients", message.ccRecipients, );
+        writer.writeStringValue("conversationId", message.conversationId);
+        writer.writeStringValue("conversationIndex", message.conversationIndex);
+        writer.writeCollectionOfObjectValues<Extension>("extensions", message.extensions, );
+        writer.writeObjectValue<FollowupFlag>("flag", message.flag, );
+        writer.writeObjectValue<Recipient>("from", message.from, );
+        writer.writeBooleanValue("hasAttachments", message.hasAttachments);
+        writer.writeEnumValue<Importance>("importance", message.importance);
+        writer.writeEnumValue<InferenceClassificationType>("inferenceClassification", message.inferenceClassification);
+        writer.writeCollectionOfObjectValues<InternetMessageHeader>("internetMessageHeaders", message.internetMessageHeaders, );
+        writer.writeStringValue("internetMessageId", message.internetMessageId);
+        writer.writeBooleanValue("isDeliveryReceiptRequested", message.isDeliveryReceiptRequested);
+        writer.writeBooleanValue("isDraft", message.isDraft);
+        writer.writeBooleanValue("isRead", message.isRead);
+        writer.writeBooleanValue("isReadReceiptRequested", message.isReadReceiptRequested);
+        writer.writeCollectionOfObjectValues<MultiValueLegacyExtendedProperty>("multiValueExtendedProperties", message.multiValueExtendedProperties, );
+        writer.writeStringValue("parentFolderId", message.parentFolderId);
+        writer.writeDateValue("receivedDateTime", message.receivedDateTime);
+        writer.writeCollectionOfObjectValues<Recipient>("replyTo", message.replyTo, );
+        writer.writeObjectValue<Recipient>("sender", message.sender, );
+        writer.writeDateValue("sentDateTime", message.sentDateTime);
+        writer.writeCollectionOfObjectValues<SingleValueLegacyExtendedProperty>("singleValueExtendedProperties", message.singleValueExtendedProperties, );
+        writer.writeStringValue("subject", message.subject);
+        writer.writeCollectionOfObjectValues<Recipient>("toRecipients", message.toRecipients, );
+        writer.writeObjectValue<ItemBody>("uniqueBody", message.uniqueBody, );
+        writer.writeStringValue("webLink", message.webLink);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/messageActionFlag.ts b/packages/test/generatedCode/models/messageActionFlag.ts
index 1b23cd834..4a5cc4198 100644
--- a/packages/test/generatedCode/models/messageActionFlag.ts
+++ b/packages/test/generatedCode/models/messageActionFlag.ts
@@ -11,3 +11,5 @@ export enum MessageActionFlag {
     ReplyToAll = "replyToAll",
     Review = "review",
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/messageCollectionResponse.ts b/packages/test/generatedCode/models/messageCollectionResponse.ts
index 2ded66bc8..f2bbd62e8 100644
--- a/packages/test/generatedCode/models/messageCollectionResponse.ts
+++ b/packages/test/generatedCode/models/messageCollectionResponse.ts
@@ -1,6 +1,19 @@
-import type {Message} from './message';
-import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createMessageFromDiscriminatorValue, serializeMessage, type Message } from './message';
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createMessageCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoMessageCollectionResponse;
+}
+export function deserializeIntoMessageCollectionResponse(messageCollectionResponse: MessageCollectionResponse | undefined = {} as MessageCollectionResponse) : Record<string, (node: ParseNode) => void> {
+    return {
+        "@odata.nextLink": n => { messageCollectionResponse.odataNextLink = n.getStringValue(); },
+        "value": n => { messageCollectionResponse.value = n.getCollectionOfObjectValues<Message>(createMessageFromDiscriminatorValue); },
+    }
+}
 export interface MessageCollectionResponse extends AdditionalDataHolder, Parsable {
     /**
      * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
@@ -9,9 +22,16 @@ export interface MessageCollectionResponse extends AdditionalDataHolder, Parsabl
     /**
      * The OdataNextLink property
      */
-    odataNextLink?: string | undefined;
+    odataNextLink?: string;
     /**
      * The value property
      */
-    value?: Message[] | undefined;
+    value?: Message[];
+}
+export function serializeMessageCollectionResponse(writer: SerializationWriter, messageCollectionResponse: MessageCollectionResponse | undefined = {} as MessageCollectionResponse) : void {
+        writer.writeStringValue("@odata.nextLink", messageCollectionResponse.odataNextLink);
+        writer.writeCollectionOfObjectValues<Message>("value", messageCollectionResponse.value, );
+        writer.writeAdditionalData(messageCollectionResponse.additionalData);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/messageRule.ts b/packages/test/generatedCode/models/messageRule.ts
index 468036408..582ad032c 100644
--- a/packages/test/generatedCode/models/messageRule.ts
+++ b/packages/test/generatedCode/models/messageRule.ts
@@ -1,39 +1,72 @@
-import type {Entity} from './entity';
-import type {MessageRuleActions} from './messageRuleActions';
-import type {MessageRulePredicates} from './messageRulePredicates';
-import type {Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { deserializeIntoEntity, serializeEntity, type Entity } from './entity';
+import { createMessageRuleActionsFromDiscriminatorValue, serializeMessageRuleActions, type MessageRuleActions } from './messageRuleActions';
+import { createMessageRulePredicatesFromDiscriminatorValue, serializeMessageRulePredicates, type MessageRulePredicates } from './messageRulePredicates';
+import { type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createMessageRuleFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoMessageRule;
+}
+export function deserializeIntoMessageRule(messageRule: MessageRule | undefined = {} as MessageRule) : Record<string, (node: ParseNode) => void> {
+    return {
+        ...deserializeIntoEntity(messageRule),
+        "actions": n => { messageRule.actions = n.getObjectValue<MessageRuleActions>(createMessageRuleActionsFromDiscriminatorValue); },
+        "conditions": n => { messageRule.conditions = n.getObjectValue<MessageRulePredicates>(createMessageRulePredicatesFromDiscriminatorValue); },
+        "displayName": n => { messageRule.displayName = n.getStringValue(); },
+        "exceptions": n => { messageRule.exceptions = n.getObjectValue<MessageRulePredicates>(createMessageRulePredicatesFromDiscriminatorValue); },
+        "hasError": n => { messageRule.hasError = n.getBooleanValue(); },
+        "isEnabled": n => { messageRule.isEnabled = n.getBooleanValue(); },
+        "isReadOnly": n => { messageRule.isReadOnly = n.getBooleanValue(); },
+        "sequence": n => { messageRule.sequence = n.getNumberValue(); },
+    }
+}
 export interface MessageRule extends Entity, Parsable {
     /**
      * The actions property
      */
-    actions?: MessageRuleActions | undefined;
+    actions?: MessageRuleActions;
     /**
      * The conditions property
      */
-    conditions?: MessageRulePredicates | undefined;
+    conditions?: MessageRulePredicates;
     /**
      * The display name of the rule.
      */
-    displayName?: string | undefined;
+    displayName?: string;
     /**
      * The exceptions property
      */
-    exceptions?: MessageRulePredicates | undefined;
+    exceptions?: MessageRulePredicates;
     /**
      * Indicates whether the rule is in an error condition. Read-only.
      */
-    hasError?: boolean | undefined;
+    hasError?: boolean;
     /**
      * Indicates whether the rule is enabled to be applied to messages.
      */
-    isEnabled?: boolean | undefined;
+    isEnabled?: boolean;
     /**
      * Indicates if the rule is read-only and cannot be modified or deleted by the rules REST API.
      */
-    isReadOnly?: boolean | undefined;
+    isReadOnly?: boolean;
     /**
      * Indicates the order in which the rule is executed, among other rules.
      */
-    sequence?: number | undefined;
+    sequence?: number;
+}
+export function serializeMessageRule(writer: SerializationWriter, messageRule: MessageRule | undefined = {} as MessageRule) : void {
+        serializeEntity(writer, messageRule)
+        writer.writeObjectValue<MessageRuleActions>("actions", messageRule.actions, );
+        writer.writeObjectValue<MessageRulePredicates>("conditions", messageRule.conditions, );
+        writer.writeStringValue("displayName", messageRule.displayName);
+        writer.writeObjectValue<MessageRulePredicates>("exceptions", messageRule.exceptions, );
+        writer.writeBooleanValue("hasError", messageRule.hasError);
+        writer.writeBooleanValue("isEnabled", messageRule.isEnabled);
+        writer.writeBooleanValue("isReadOnly", messageRule.isReadOnly);
+        writer.writeNumberValue("sequence", messageRule.sequence);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/messageRuleActions.ts b/packages/test/generatedCode/models/messageRuleActions.ts
index 9821edcf7..17d320a84 100644
--- a/packages/test/generatedCode/models/messageRuleActions.ts
+++ b/packages/test/generatedCode/models/messageRuleActions.ts
@@ -1,7 +1,29 @@
-import {Importance} from './importance';
-import type {Recipient} from './recipient';
-import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { Importance } from './importance';
+import { createRecipientFromDiscriminatorValue, serializeRecipient, type Recipient } from './recipient';
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createMessageRuleActionsFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoMessageRuleActions;
+}
+export function deserializeIntoMessageRuleActions(messageRuleActions: MessageRuleActions | undefined = {} as MessageRuleActions) : Record<string, (node: ParseNode) => void> {
+    return {
+        "assignCategories": n => { messageRuleActions.assignCategories = n.getCollectionOfPrimitiveValues<string>(); },
+        "copyToFolder": n => { messageRuleActions.copyToFolder = n.getStringValue(); },
+        "delete": n => { messageRuleActions.delete = n.getBooleanValue(); },
+        "forwardAsAttachmentTo": n => { messageRuleActions.forwardAsAttachmentTo = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
+        "forwardTo": n => { messageRuleActions.forwardTo = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
+        "markAsRead": n => { messageRuleActions.markAsRead = n.getBooleanValue(); },
+        "markImportance": n => { messageRuleActions.markImportance = n.getEnumValue<Importance>(Importance); },
+        "moveToFolder": n => { messageRuleActions.moveToFolder = n.getStringValue(); },
+        "permanentDelete": n => { messageRuleActions.permanentDelete = n.getBooleanValue(); },
+        "redirectTo": n => { messageRuleActions.redirectTo = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
+        "stopProcessingRules": n => { messageRuleActions.stopProcessingRules = n.getBooleanValue(); },
+    }
+}
 export interface MessageRuleActions extends AdditionalDataHolder, Parsable {
     /**
      * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
@@ -10,45 +32,61 @@ export interface MessageRuleActions extends AdditionalDataHolder, Parsable {
     /**
      * A list of categories to be assigned to a message.
      */
-    assignCategories?: string[] | undefined;
+    assignCategories?: string[];
     /**
      * The ID of a folder that a message is to be copied to.
      */
-    copyToFolder?: string | undefined;
+    copyToFolder?: string;
     /**
      * Indicates whether a message should be moved to the Deleted Items folder.
      */
-    delete?: boolean | undefined;
+    delete?: boolean;
     /**
      * The email addresses of the recipients to which a message should be forwarded as an attachment.
      */
-    forwardAsAttachmentTo?: Recipient[] | undefined;
+    forwardAsAttachmentTo?: Recipient[];
     /**
      * The email addresses of the recipients to which a message should be forwarded.
      */
-    forwardTo?: Recipient[] | undefined;
+    forwardTo?: Recipient[];
     /**
      * Indicates whether a message should be marked as read.
      */
-    markAsRead?: boolean | undefined;
+    markAsRead?: boolean;
     /**
      * The markImportance property
      */
-    markImportance?: Importance | undefined;
+    markImportance?: Importance;
     /**
      * The ID of the folder that a message will be moved to.
      */
-    moveToFolder?: string | undefined;
+    moveToFolder?: string;
     /**
      * Indicates whether a message should be permanently deleted and not saved to the Deleted Items folder.
      */
-    permanentDelete?: boolean | undefined;
+    permanentDelete?: boolean;
     /**
      * The email addresses to which a message should be redirected.
      */
-    redirectTo?: Recipient[] | undefined;
+    redirectTo?: Recipient[];
     /**
      * Indicates whether subsequent rules should be evaluated.
      */
-    stopProcessingRules?: boolean | undefined;
+    stopProcessingRules?: boolean;
+}
+export function serializeMessageRuleActions(writer: SerializationWriter, messageRuleActions: MessageRuleActions | undefined = {} as MessageRuleActions) : void {
+        writer.writeCollectionOfPrimitiveValues<string>("assignCategories", messageRuleActions.assignCategories);
+        writer.writeStringValue("copyToFolder", messageRuleActions.copyToFolder);
+        writer.writeBooleanValue("delete", messageRuleActions.delete);
+        writer.writeCollectionOfObjectValues<Recipient>("forwardAsAttachmentTo", messageRuleActions.forwardAsAttachmentTo, );
+        writer.writeCollectionOfObjectValues<Recipient>("forwardTo", messageRuleActions.forwardTo, );
+        writer.writeBooleanValue("markAsRead", messageRuleActions.markAsRead);
+        writer.writeEnumValue<Importance>("markImportance", messageRuleActions.markImportance);
+        writer.writeStringValue("moveToFolder", messageRuleActions.moveToFolder);
+        writer.writeBooleanValue("permanentDelete", messageRuleActions.permanentDelete);
+        writer.writeCollectionOfObjectValues<Recipient>("redirectTo", messageRuleActions.redirectTo, );
+        writer.writeBooleanValue("stopProcessingRules", messageRuleActions.stopProcessingRules);
+        writer.writeAdditionalData(messageRuleActions.additionalData);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/messageRuleCollectionResponse.ts b/packages/test/generatedCode/models/messageRuleCollectionResponse.ts
index 9a721a9be..9db91d650 100644
--- a/packages/test/generatedCode/models/messageRuleCollectionResponse.ts
+++ b/packages/test/generatedCode/models/messageRuleCollectionResponse.ts
@@ -1,6 +1,19 @@
-import type {MessageRule} from './messageRule';
-import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createMessageRuleFromDiscriminatorValue, serializeMessageRule, type MessageRule } from './messageRule';
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createMessageRuleCollectionResponseFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoMessageRuleCollectionResponse;
+}
+export function deserializeIntoMessageRuleCollectionResponse(messageRuleCollectionResponse: MessageRuleCollectionResponse | undefined = {} as MessageRuleCollectionResponse) : Record<string, (node: ParseNode) => void> {
+    return {
+        "@odata.nextLink": n => { messageRuleCollectionResponse.odataNextLink = n.getStringValue(); },
+        "value": n => { messageRuleCollectionResponse.value = n.getCollectionOfObjectValues<MessageRule>(createMessageRuleFromDiscriminatorValue); },
+    }
+}
 export interface MessageRuleCollectionResponse extends AdditionalDataHolder, Parsable {
     /**
      * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
@@ -9,9 +22,16 @@ export interface MessageRuleCollectionResponse extends AdditionalDataHolder, Par
     /**
      * The OdataNextLink property
      */
-    odataNextLink?: string | undefined;
+    odataNextLink?: string;
     /**
      * The value property
      */
-    value?: MessageRule[] | undefined;
+    value?: MessageRule[];
+}
+export function serializeMessageRuleCollectionResponse(writer: SerializationWriter, messageRuleCollectionResponse: MessageRuleCollectionResponse | undefined = {} as MessageRuleCollectionResponse) : void {
+        writer.writeStringValue("@odata.nextLink", messageRuleCollectionResponse.odataNextLink);
+        writer.writeCollectionOfObjectValues<MessageRule>("value", messageRuleCollectionResponse.value, );
+        writer.writeAdditionalData(messageRuleCollectionResponse.additionalData);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/messageRulePredicates.ts b/packages/test/generatedCode/models/messageRulePredicates.ts
index 4ce5aae6c..a92f78f2b 100644
--- a/packages/test/generatedCode/models/messageRulePredicates.ts
+++ b/packages/test/generatedCode/models/messageRulePredicates.ts
@@ -1,10 +1,51 @@
-import {Importance} from './importance';
-import {MessageActionFlag} from './messageActionFlag';
-import type {Recipient} from './recipient';
-import {Sensitivity} from './sensitivity';
-import type {SizeRange} from './sizeRange';
-import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { Importance } from './importance';
+import { MessageActionFlag } from './messageActionFlag';
+import { createRecipientFromDiscriminatorValue, serializeRecipient, type Recipient } from './recipient';
+import { Sensitivity } from './sensitivity';
+import { createSizeRangeFromDiscriminatorValue, serializeSizeRange, type SizeRange } from './sizeRange';
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createMessageRulePredicatesFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoMessageRulePredicates;
+}
+export function deserializeIntoMessageRulePredicates(messageRulePredicates: MessageRulePredicates | undefined = {} as MessageRulePredicates) : Record<string, (node: ParseNode) => void> {
+    return {
+        "bodyContains": n => { messageRulePredicates.bodyContains = n.getCollectionOfPrimitiveValues<string>(); },
+        "bodyOrSubjectContains": n => { messageRulePredicates.bodyOrSubjectContains = n.getCollectionOfPrimitiveValues<string>(); },
+        "categories": n => { messageRulePredicates.categories = n.getCollectionOfPrimitiveValues<string>(); },
+        "fromAddresses": n => { messageRulePredicates.fromAddresses = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
+        "hasAttachments": n => { messageRulePredicates.hasAttachments = n.getBooleanValue(); },
+        "headerContains": n => { messageRulePredicates.headerContains = n.getCollectionOfPrimitiveValues<string>(); },
+        "importance": n => { messageRulePredicates.importance = n.getEnumValue<Importance>(Importance); },
+        "isApprovalRequest": n => { messageRulePredicates.isApprovalRequest = n.getBooleanValue(); },
+        "isAutomaticForward": n => { messageRulePredicates.isAutomaticForward = n.getBooleanValue(); },
+        "isAutomaticReply": n => { messageRulePredicates.isAutomaticReply = n.getBooleanValue(); },
+        "isEncrypted": n => { messageRulePredicates.isEncrypted = n.getBooleanValue(); },
+        "isMeetingRequest": n => { messageRulePredicates.isMeetingRequest = n.getBooleanValue(); },
+        "isMeetingResponse": n => { messageRulePredicates.isMeetingResponse = n.getBooleanValue(); },
+        "isNonDeliveryReport": n => { messageRulePredicates.isNonDeliveryReport = n.getBooleanValue(); },
+        "isPermissionControlled": n => { messageRulePredicates.isPermissionControlled = n.getBooleanValue(); },
+        "isReadReceipt": n => { messageRulePredicates.isReadReceipt = n.getBooleanValue(); },
+        "isSigned": n => { messageRulePredicates.isSigned = n.getBooleanValue(); },
+        "isVoicemail": n => { messageRulePredicates.isVoicemail = n.getBooleanValue(); },
+        "messageActionFlag": n => { messageRulePredicates.messageActionFlag = n.getEnumValue<MessageActionFlag>(MessageActionFlag); },
+        "notSentToMe": n => { messageRulePredicates.notSentToMe = n.getBooleanValue(); },
+        "recipientContains": n => { messageRulePredicates.recipientContains = n.getCollectionOfPrimitiveValues<string>(); },
+        "senderContains": n => { messageRulePredicates.senderContains = n.getCollectionOfPrimitiveValues<string>(); },
+        "sensitivity": n => { messageRulePredicates.sensitivity = n.getEnumValue<Sensitivity>(Sensitivity); },
+        "sentCcMe": n => { messageRulePredicates.sentCcMe = n.getBooleanValue(); },
+        "sentOnlyToMe": n => { messageRulePredicates.sentOnlyToMe = n.getBooleanValue(); },
+        "sentToAddresses": n => { messageRulePredicates.sentToAddresses = n.getCollectionOfObjectValues<Recipient>(createRecipientFromDiscriminatorValue); },
+        "sentToMe": n => { messageRulePredicates.sentToMe = n.getBooleanValue(); },
+        "sentToOrCcMe": n => { messageRulePredicates.sentToOrCcMe = n.getBooleanValue(); },
+        "subjectContains": n => { messageRulePredicates.subjectContains = n.getCollectionOfPrimitiveValues<string>(); },
+        "withinSizeRange": n => { messageRulePredicates.withinSizeRange = n.getObjectValue<SizeRange>(createSizeRangeFromDiscriminatorValue); },
+    }
+}
 export interface MessageRulePredicates extends AdditionalDataHolder, Parsable {
     /**
      * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
@@ -13,121 +54,156 @@ export interface MessageRulePredicates extends AdditionalDataHolder, Parsable {
     /**
      * Represents the strings that should appear in the body of an incoming message in order for the condition or exception to apply.
      */
-    bodyContains?: string[] | undefined;
+    bodyContains?: string[];
     /**
      * Represents the strings that should appear in the body or subject of an incoming message in order for the condition or exception to apply.
      */
-    bodyOrSubjectContains?: string[] | undefined;
+    bodyOrSubjectContains?: string[];
     /**
      * Represents the categories that an incoming message should be labeled with in order for the condition or exception to apply.
      */
-    categories?: string[] | undefined;
+    categories?: string[];
     /**
      * Represents the specific sender email addresses of an incoming message in order for the condition or exception to apply.
      */
-    fromAddresses?: Recipient[] | undefined;
+    fromAddresses?: Recipient[];
     /**
      * Indicates whether an incoming message must have attachments in order for the condition or exception to apply.
      */
-    hasAttachments?: boolean | undefined;
+    hasAttachments?: boolean;
     /**
      * Represents the strings that appear in the headers of an incoming message in order for the condition or exception to apply.
      */
-    headerContains?: string[] | undefined;
+    headerContains?: string[];
     /**
      * The importance property
      */
-    importance?: Importance | undefined;
+    importance?: Importance;
     /**
      * Indicates whether an incoming message must be an approval request in order for the condition or exception to apply.
      */
-    isApprovalRequest?: boolean | undefined;
+    isApprovalRequest?: boolean;
     /**
      * Indicates whether an incoming message must be automatically forwarded in order for the condition or exception to apply.
      */
-    isAutomaticForward?: boolean | undefined;
+    isAutomaticForward?: boolean;
     /**
      * Indicates whether an incoming message must be an auto reply in order for the condition or exception to apply.
      */
-    isAutomaticReply?: boolean | undefined;
+    isAutomaticReply?: boolean;
     /**
      * Indicates whether an incoming message must be encrypted in order for the condition or exception to apply.
      */
-    isEncrypted?: boolean | undefined;
+    isEncrypted?: boolean;
     /**
      * Indicates whether an incoming message must be a meeting request in order for the condition or exception to apply.
      */
-    isMeetingRequest?: boolean | undefined;
+    isMeetingRequest?: boolean;
     /**
      * Indicates whether an incoming message must be a meeting response in order for the condition or exception to apply.
      */
-    isMeetingResponse?: boolean | undefined;
+    isMeetingResponse?: boolean;
     /**
      * Indicates whether an incoming message must be a non-delivery report in order for the condition or exception to apply.
      */
-    isNonDeliveryReport?: boolean | undefined;
+    isNonDeliveryReport?: boolean;
     /**
      * Indicates whether an incoming message must be permission controlled (RMS-protected) in order for the condition or exception to apply.
      */
-    isPermissionControlled?: boolean | undefined;
+    isPermissionControlled?: boolean;
     /**
      * Indicates whether an incoming message must be a read receipt in order for the condition or exception to apply.
      */
-    isReadReceipt?: boolean | undefined;
+    isReadReceipt?: boolean;
     /**
      * Indicates whether an incoming message must be S/MIME-signed in order for the condition or exception to apply.
      */
-    isSigned?: boolean | undefined;
+    isSigned?: boolean;
     /**
      * Indicates whether an incoming message must be a voice mail in order for the condition or exception to apply.
      */
-    isVoicemail?: boolean | undefined;
+    isVoicemail?: boolean;
     /**
      * The messageActionFlag property
      */
-    messageActionFlag?: MessageActionFlag | undefined;
+    messageActionFlag?: MessageActionFlag;
     /**
      * Indicates whether the owner of the mailbox must not be a recipient of an incoming message in order for the condition or exception to apply.
      */
-    notSentToMe?: boolean | undefined;
+    notSentToMe?: boolean;
     /**
      * Represents the strings that appear in either the toRecipients or ccRecipients properties of an incoming message in order for the condition or exception to apply.
      */
-    recipientContains?: string[] | undefined;
+    recipientContains?: string[];
     /**
      * Represents the strings that appear in the from property of an incoming message in order for the condition or exception to apply.
      */
-    senderContains?: string[] | undefined;
+    senderContains?: string[];
     /**
      * The sensitivity property
      */
-    sensitivity?: Sensitivity | undefined;
+    sensitivity?: Sensitivity;
     /**
      * Indicates whether the owner of the mailbox must be in the ccRecipients property of an incoming message in order for the condition or exception to apply.
      */
-    sentCcMe?: boolean | undefined;
+    sentCcMe?: boolean;
     /**
      * Indicates whether the owner of the mailbox must be the only recipient in an incoming message in order for the condition or exception to apply.
      */
-    sentOnlyToMe?: boolean | undefined;
+    sentOnlyToMe?: boolean;
     /**
      * Represents the email addresses that an incoming message must have been sent to in order for the condition or exception to apply.
      */
-    sentToAddresses?: Recipient[] | undefined;
+    sentToAddresses?: Recipient[];
     /**
      * Indicates whether the owner of the mailbox must be in the toRecipients property of an incoming message in order for the condition or exception to apply.
      */
-    sentToMe?: boolean | undefined;
+    sentToMe?: boolean;
     /**
      * Indicates whether the owner of the mailbox must be in either a toRecipients or ccRecipients property of an incoming message in order for the condition or exception to apply.
      */
-    sentToOrCcMe?: boolean | undefined;
+    sentToOrCcMe?: boolean;
     /**
      * Represents the strings that appear in the subject of an incoming message in order for the condition or exception to apply.
      */
-    subjectContains?: string[] | undefined;
+    subjectContains?: string[];
     /**
      * The withinSizeRange property
      */
-    withinSizeRange?: SizeRange | undefined;
+    withinSizeRange?: SizeRange;
+}
+export function serializeMessageRulePredicates(writer: SerializationWriter, messageRulePredicates: MessageRulePredicates | undefined = {} as MessageRulePredicates) : void {
+        writer.writeCollectionOfPrimitiveValues<string>("bodyContains", messageRulePredicates.bodyContains);
+        writer.writeCollectionOfPrimitiveValues<string>("bodyOrSubjectContains", messageRulePredicates.bodyOrSubjectContains);
+        writer.writeCollectionOfPrimitiveValues<string>("categories", messageRulePredicates.categories);
+        writer.writeCollectionOfObjectValues<Recipient>("fromAddresses", messageRulePredicates.fromAddresses, );
+        writer.writeBooleanValue("hasAttachments", messageRulePredicates.hasAttachments);
+        writer.writeCollectionOfPrimitiveValues<string>("headerContains", messageRulePredicates.headerContains);
+        writer.writeEnumValue<Importance>("importance", messageRulePredicates.importance);
+        writer.writeBooleanValue("isApprovalRequest", messageRulePredicates.isApprovalRequest);
+        writer.writeBooleanValue("isAutomaticForward", messageRulePredicates.isAutomaticForward);
+        writer.writeBooleanValue("isAutomaticReply", messageRulePredicates.isAutomaticReply);
+        writer.writeBooleanValue("isEncrypted", messageRulePredicates.isEncrypted);
+        writer.writeBooleanValue("isMeetingRequest", messageRulePredicates.isMeetingRequest);
+        writer.writeBooleanValue("isMeetingResponse", messageRulePredicates.isMeetingResponse);
+        writer.writeBooleanValue("isNonDeliveryReport", messageRulePredicates.isNonDeliveryReport);
+        writer.writeBooleanValue("isPermissionControlled", messageRulePredicates.isPermissionControlled);
+        writer.writeBooleanValue("isReadReceipt", messageRulePredicates.isReadReceipt);
+        writer.writeBooleanValue("isSigned", messageRulePredicates.isSigned);
+        writer.writeBooleanValue("isVoicemail", messageRulePredicates.isVoicemail);
+        writer.writeEnumValue<MessageActionFlag>("messageActionFlag", messageRulePredicates.messageActionFlag);
+        writer.writeBooleanValue("notSentToMe", messageRulePredicates.notSentToMe);
+        writer.writeCollectionOfPrimitiveValues<string>("recipientContains", messageRulePredicates.recipientContains);
+        writer.writeCollectionOfPrimitiveValues<string>("senderContains", messageRulePredicates.senderContains);
+        writer.writeEnumValue<Sensitivity>("sensitivity", messageRulePredicates.sensitivity);
+        writer.writeBooleanValue("sentCcMe", messageRulePredicates.sentCcMe);
+        writer.writeBooleanValue("sentOnlyToMe", messageRulePredicates.sentOnlyToMe);
+        writer.writeCollectionOfObjectValues<Recipient>("sentToAddresses", messageRulePredicates.sentToAddresses, );
+        writer.writeBooleanValue("sentToMe", messageRulePredicates.sentToMe);
+        writer.writeBooleanValue("sentToOrCcMe", messageRulePredicates.sentToOrCcMe);
+        writer.writeCollectionOfPrimitiveValues<string>("subjectContains", messageRulePredicates.subjectContains);
+        writer.writeObjectValue<SizeRange>("withinSizeRange", messageRulePredicates.withinSizeRange, );
+        writer.writeAdditionalData(messageRulePredicates.additionalData);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/multiValueLegacyExtendedProperty.ts b/packages/test/generatedCode/models/multiValueLegacyExtendedProperty.ts
index a11336624..289145794 100644
--- a/packages/test/generatedCode/models/multiValueLegacyExtendedProperty.ts
+++ b/packages/test/generatedCode/models/multiValueLegacyExtendedProperty.ts
@@ -1,9 +1,28 @@
-import type {Entity} from './entity';
-import type {Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { deserializeIntoEntity, serializeEntity, type Entity } from './entity';
+import { type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createMultiValueLegacyExtendedPropertyFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoMultiValueLegacyExtendedProperty;
+}
+export function deserializeIntoMultiValueLegacyExtendedProperty(multiValueLegacyExtendedProperty: MultiValueLegacyExtendedProperty | undefined = {} as MultiValueLegacyExtendedProperty) : Record<string, (node: ParseNode) => void> {
+    return {
+        ...deserializeIntoEntity(multiValueLegacyExtendedProperty),
+        "value": n => { multiValueLegacyExtendedProperty.value = n.getCollectionOfPrimitiveValues<string>(); },
+    }
+}
 export interface MultiValueLegacyExtendedProperty extends Entity, Parsable {
     /**
      * A collection of property values.
      */
-    value?: string[] | undefined;
+    value?: string[];
+}
+export function serializeMultiValueLegacyExtendedProperty(writer: SerializationWriter, multiValueLegacyExtendedProperty: MultiValueLegacyExtendedProperty | undefined = {} as MultiValueLegacyExtendedProperty) : void {
+        serializeEntity(writer, multiValueLegacyExtendedProperty)
+        writer.writeCollectionOfPrimitiveValues<string>("value", multiValueLegacyExtendedProperty.value);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/oDataErrors/errorDetails.ts b/packages/test/generatedCode/models/oDataErrors/errorDetails.ts
new file mode 100644
index 000000000..83742280b
--- /dev/null
+++ b/packages/test/generatedCode/models/oDataErrors/errorDetails.ts
@@ -0,0 +1,42 @@
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
+
+export function createErrorDetailsFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoErrorDetails;
+}
+export function deserializeIntoErrorDetails(errorDetails: ErrorDetails | undefined = {} as ErrorDetails) : Record<string, (node: ParseNode) => void> {
+    return {
+        "code": n => { errorDetails.code = n.getStringValue(); },
+        "message": n => { errorDetails.message = n.getStringValue(); },
+        "target": n => { errorDetails.target = n.getStringValue(); },
+    }
+}
+export interface ErrorDetails extends AdditionalDataHolder, Parsable {
+    /**
+     * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
+     */
+    additionalData?: Record<string, unknown>;
+    /**
+     * The code property
+     */
+    code?: string;
+    /**
+     * The message property
+     */
+    message?: string;
+    /**
+     * The target property
+     */
+    target?: string;
+}
+export function serializeErrorDetails(writer: SerializationWriter, errorDetails: ErrorDetails | undefined = {} as ErrorDetails) : void {
+        writer.writeStringValue("code", errorDetails.code);
+        writer.writeStringValue("message", errorDetails.message);
+        writer.writeStringValue("target", errorDetails.target);
+        writer.writeAdditionalData(errorDetails.additionalData);
+}
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/oDataErrors/index.ts b/packages/test/generatedCode/models/oDataErrors/index.ts
new file mode 100644
index 000000000..9c12cea17
--- /dev/null
+++ b/packages/test/generatedCode/models/oDataErrors/index.ts
@@ -0,0 +1,4 @@
+export * from './errorDetails'
+export * from './innerError'
+export * from './mainError'
+export * from './oDataError'
diff --git a/packages/test/generatedCode/models/oDataErrors/innerError.ts b/packages/test/generatedCode/models/oDataErrors/innerError.ts
new file mode 100644
index 000000000..3211320e7
--- /dev/null
+++ b/packages/test/generatedCode/models/oDataErrors/innerError.ts
@@ -0,0 +1,24 @@
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
+
+export function createInnerErrorFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoInnerError;
+}
+export function deserializeIntoInnerError(innerError: InnerError | undefined = {} as InnerError) : Record<string, (node: ParseNode) => void> {
+    return {
+    }
+}
+export interface InnerError extends AdditionalDataHolder, Parsable {
+    /**
+     * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
+     */
+    additionalData?: Record<string, unknown>;
+}
+export function serializeInnerError(writer: SerializationWriter, innerError: InnerError | undefined = {} as InnerError) : void {
+        writer.writeAdditionalData(innerError.additionalData);
+}
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/oDataErrors/mainError.ts b/packages/test/generatedCode/models/oDataErrors/mainError.ts
new file mode 100644
index 000000000..6636da13f
--- /dev/null
+++ b/packages/test/generatedCode/models/oDataErrors/mainError.ts
@@ -0,0 +1,56 @@
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createErrorDetailsFromDiscriminatorValue, serializeErrorDetails, type ErrorDetails } from './errorDetails';
+import { createInnerErrorFromDiscriminatorValue, serializeInnerError, type InnerError } from './innerError';
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
+
+export function createMainErrorFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoMainError;
+}
+export function deserializeIntoMainError(mainError: MainError | undefined = {} as MainError) : Record<string, (node: ParseNode) => void> {
+    return {
+        "code": n => { mainError.code = n.getStringValue(); },
+        "details": n => { mainError.details = n.getCollectionOfObjectValues<ErrorDetails>(createErrorDetailsFromDiscriminatorValue); },
+        "innerError": n => { mainError.innerError = n.getObjectValue<InnerError>(createInnerErrorFromDiscriminatorValue); },
+        "message": n => { mainError.message = n.getStringValue(); },
+        "target": n => { mainError.target = n.getStringValue(); },
+    }
+}
+export interface MainError extends AdditionalDataHolder, Parsable {
+    /**
+     * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
+     */
+    additionalData?: Record<string, unknown>;
+    /**
+     * The code property
+     */
+    code?: string;
+    /**
+     * The details property
+     */
+    details?: ErrorDetails[];
+    /**
+     * The structure of this object is service-specific
+     */
+    innerError?: InnerError;
+    /**
+     * The message property
+     */
+    message?: string;
+    /**
+     * The target property
+     */
+    target?: string;
+}
+export function serializeMainError(writer: SerializationWriter, mainError: MainError | undefined = {} as MainError) : void {
+        writer.writeStringValue("code", mainError.code);
+        writer.writeCollectionOfObjectValues<ErrorDetails>("details", mainError.details, );
+        writer.writeObjectValue<InnerError>("innerError", mainError.innerError, );
+        writer.writeStringValue("message", mainError.message);
+        writer.writeStringValue("target", mainError.target);
+        writer.writeAdditionalData(mainError.additionalData);
+}
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/oDataErrors/oDataError.ts b/packages/test/generatedCode/models/oDataErrors/oDataError.ts
new file mode 100644
index 000000000..9d6a8a6cd
--- /dev/null
+++ b/packages/test/generatedCode/models/oDataErrors/oDataError.ts
@@ -0,0 +1,31 @@
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createMainErrorFromDiscriminatorValue, serializeMainError, type MainError } from './mainError';
+import { type AdditionalDataHolder, type ApiError, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
+
+export function createODataErrorFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoODataError;
+}
+export function deserializeIntoODataError(oDataError: ODataError | undefined = {} as ODataError) : Record<string, (node: ParseNode) => void> {
+    return {
+        "error": n => { oDataError.errorEscaped = n.getObjectValue<MainError>(createMainErrorFromDiscriminatorValue); oDataError.message = oDataError.errorEscaped?.message ?? ""; },
+    }
+}
+export interface ODataError extends AdditionalDataHolder, ApiError, Parsable {
+    /**
+     * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
+     */
+    additionalData?: Record<string, unknown>;
+    /**
+     * The error property
+     */
+    errorEscaped?: MainError;
+}
+export function serializeODataError(writer: SerializationWriter, oDataError: ODataError | undefined = {} as ODataError) : void {
+        writer.writeObjectValue<MainError>("error", oDataError.errorEscaped, );
+        writer.writeAdditionalData(oDataError.additionalData);
+}
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/outlookItem.ts b/packages/test/generatedCode/models/outlookItem.ts
index 2eb0e78f6..6b7b0c913 100644
--- a/packages/test/generatedCode/models/outlookItem.ts
+++ b/packages/test/generatedCode/models/outlookItem.ts
@@ -1,21 +1,47 @@
-import type {Entity} from './entity';
-import type {Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { deserializeIntoEntity, serializeEntity, type Entity } from './entity';
+import { deserializeIntoMessage } from './message';
+import { type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createOutlookItemFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoOutlookItem;
+}
+export function deserializeIntoOutlookItem(outlookItem: OutlookItem | undefined = {} as OutlookItem) : Record<string, (node: ParseNode) => void> {
+    return {
+        ...deserializeIntoEntity(outlookItem),
+        "categories": n => { outlookItem.categories = n.getCollectionOfPrimitiveValues<string>(); },
+        "changeKey": n => { outlookItem.changeKey = n.getStringValue(); },
+        "createdDateTime": n => { outlookItem.createdDateTime = n.getDateValue(); },
+        "lastModifiedDateTime": n => { outlookItem.lastModifiedDateTime = n.getDateValue(); },
+    }
+}
 export interface OutlookItem extends Entity, Parsable {
     /**
      * The categories associated with the item
      */
-    categories?: string[] | undefined;
+    categories?: string[];
     /**
      * Identifies the version of the item. Every time the item is changed, changeKey changes as well. This allows Exchange to apply changes to the correct version of the object. Read-only.
      */
-    changeKey?: string | undefined;
+    changeKey?: string;
     /**
      * The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z
      */
-    createdDateTime?: Date | undefined;
+    createdDateTime?: Date;
     /**
      * The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z
      */
-    lastModifiedDateTime?: Date | undefined;
+    lastModifiedDateTime?: Date;
+}
+export function serializeOutlookItem(writer: SerializationWriter, outlookItem: OutlookItem | undefined = {} as OutlookItem) : void {
+        serializeEntity(writer, outlookItem)
+        writer.writeCollectionOfPrimitiveValues<string>("categories", outlookItem.categories);
+        writer.writeStringValue("changeKey", outlookItem.changeKey);
+        writer.writeDateValue("createdDateTime", outlookItem.createdDateTime);
+        writer.writeDateValue("lastModifiedDateTime", outlookItem.lastModifiedDateTime);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/recipient.ts b/packages/test/generatedCode/models/recipient.ts
index 1377a72d5..1c798c1a4 100644
--- a/packages/test/generatedCode/models/recipient.ts
+++ b/packages/test/generatedCode/models/recipient.ts
@@ -1,6 +1,18 @@
-import type {EmailAddress} from './emailAddress';
-import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createEmailAddressFromDiscriminatorValue, serializeEmailAddress, type EmailAddress } from './emailAddress';
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createRecipientFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoRecipient;
+}
+export function deserializeIntoRecipient(recipient: Recipient | undefined = {} as Recipient) : Record<string, (node: ParseNode) => void> {
+    return {
+        "emailAddress": n => { recipient.emailAddress = n.getObjectValue<EmailAddress>(createEmailAddressFromDiscriminatorValue); },
+    }
+}
 export interface Recipient extends AdditionalDataHolder, Parsable {
     /**
      * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
@@ -9,5 +21,11 @@ export interface Recipient extends AdditionalDataHolder, Parsable {
     /**
      * The emailAddress property
      */
-    emailAddress?: EmailAddress | undefined;
+    emailAddress?: EmailAddress;
+}
+export function serializeRecipient(writer: SerializationWriter, recipient: Recipient | undefined = {} as Recipient) : void {
+        writer.writeObjectValue<EmailAddress>("emailAddress", recipient.emailAddress, );
+        writer.writeAdditionalData(recipient.additionalData);
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/sensitivity.ts b/packages/test/generatedCode/models/sensitivity.ts
index 3777c94bf..cb7c41ac7 100644
--- a/packages/test/generatedCode/models/sensitivity.ts
+++ b/packages/test/generatedCode/models/sensitivity.ts
@@ -4,3 +4,5 @@ export enum Sensitivity {
     Private = "private",
     Confidential = "confidential",
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/serializeAttachment.ts b/packages/test/generatedCode/models/serializeAttachment.ts
deleted file mode 100644
index 08952b5aa..000000000
--- a/packages/test/generatedCode/models/serializeAttachment.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {Attachment} from './attachment';
-import {serializeEntity} from './serializeEntity';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeAttachment(writer: SerializationWriter, attachment: Attachment | undefined = {} as Attachment) : void {
-        serializeEntity(writer, attachment)
-        writer.writeStringValue("contentType", attachment.contentType);
-        writer.writeBooleanValue("isInline", attachment.isInline);
-        writer.writeDateValue("lastModifiedDateTime", attachment.lastModifiedDateTime);
-        writer.writeStringValue("name", attachment.name);
-        writer.writeNumberValue("size", attachment.size);
-}
diff --git a/packages/test/generatedCode/models/serializeAttachmentCollectionResponse.ts b/packages/test/generatedCode/models/serializeAttachmentCollectionResponse.ts
deleted file mode 100644
index 5da820b28..000000000
--- a/packages/test/generatedCode/models/serializeAttachmentCollectionResponse.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type {Attachment} from './attachment';
-import type {AttachmentCollectionResponse} from './attachmentCollectionResponse';
-import {serializeAttachment} from './serializeAttachment';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeAttachmentCollectionResponse(writer: SerializationWriter, attachmentCollectionResponse: AttachmentCollectionResponse | undefined = {} as AttachmentCollectionResponse) : void {
-        writer.writeStringValue("@odata.nextLink", attachmentCollectionResponse.odataNextLink);
-        writer.writeCollectionOfObjectValues<Attachment>("value", attachmentCollectionResponse.value, serializeAttachment);
-        writer.writeAdditionalData(attachmentCollectionResponse.additionalData);
-}
diff --git a/packages/test/generatedCode/models/serializeDateTimeTimeZone.ts b/packages/test/generatedCode/models/serializeDateTimeTimeZone.ts
deleted file mode 100644
index 39061bcf8..000000000
--- a/packages/test/generatedCode/models/serializeDateTimeTimeZone.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type {DateTimeTimeZone} from './dateTimeTimeZone';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeDateTimeTimeZone(writer: SerializationWriter, dateTimeTimeZone: DateTimeTimeZone | undefined = {} as DateTimeTimeZone) : void {
-        writer.writeStringValue("dateTime", dateTimeTimeZone.dateTime);
-        writer.writeStringValue("timeZone", dateTimeTimeZone.timeZone);
-        writer.writeAdditionalData(dateTimeTimeZone.additionalData);
-}
diff --git a/packages/test/generatedCode/models/serializeEmailAddress.ts b/packages/test/generatedCode/models/serializeEmailAddress.ts
deleted file mode 100644
index 9429b55c5..000000000
--- a/packages/test/generatedCode/models/serializeEmailAddress.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type {EmailAddress} from './emailAddress';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeEmailAddress(writer: SerializationWriter, emailAddress: EmailAddress | undefined = {} as EmailAddress) : void {
-        writer.writeStringValue("address", emailAddress.address);
-        writer.writeStringValue("name", emailAddress.name);
-        writer.writeAdditionalData(emailAddress.additionalData);
-}
diff --git a/packages/test/generatedCode/models/serializeEntity.ts b/packages/test/generatedCode/models/serializeEntity.ts
deleted file mode 100644
index beaff2785..000000000
--- a/packages/test/generatedCode/models/serializeEntity.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type {Entity} from './entity';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeEntity(writer: SerializationWriter, entity: Entity | undefined = {} as Entity) : void {
-        writer.writeStringValue("id", entity.id);
-        writer.writeAdditionalData(entity.additionalData);
-}
diff --git a/packages/test/generatedCode/models/serializeExtension.ts b/packages/test/generatedCode/models/serializeExtension.ts
deleted file mode 100644
index 2444d2e95..000000000
--- a/packages/test/generatedCode/models/serializeExtension.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type {Extension} from './extension';
-import {serializeEntity} from './serializeEntity';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeExtension(writer: SerializationWriter, extension: Extension | undefined = {} as Extension) : void {
-        serializeEntity(writer, extension)
-}
diff --git a/packages/test/generatedCode/models/serializeExtensionCollectionResponse.ts b/packages/test/generatedCode/models/serializeExtensionCollectionResponse.ts
deleted file mode 100644
index 2c3ecebeb..000000000
--- a/packages/test/generatedCode/models/serializeExtensionCollectionResponse.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type {Extension} from './extension';
-import type {ExtensionCollectionResponse} from './extensionCollectionResponse';
-import {serializeExtension} from './serializeExtension';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeExtensionCollectionResponse(writer: SerializationWriter, extensionCollectionResponse: ExtensionCollectionResponse | undefined = {} as ExtensionCollectionResponse) : void {
-        writer.writeStringValue("@odata.nextLink", extensionCollectionResponse.odataNextLink);
-        writer.writeCollectionOfObjectValues<Extension>("value", extensionCollectionResponse.value, serializeExtension);
-        writer.writeAdditionalData(extensionCollectionResponse.additionalData);
-}
diff --git a/packages/test/generatedCode/models/serializeFollowupFlag.ts b/packages/test/generatedCode/models/serializeFollowupFlag.ts
deleted file mode 100644
index 3e420e1a4..000000000
--- a/packages/test/generatedCode/models/serializeFollowupFlag.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type {DateTimeTimeZone} from './dateTimeTimeZone';
-import type {FollowupFlag} from './followupFlag';
-import {FollowupFlagStatus} from './followupFlagStatus';
-import {serializeDateTimeTimeZone} from './serializeDateTimeTimeZone';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeFollowupFlag(writer: SerializationWriter, followupFlag: FollowupFlag | undefined = {} as FollowupFlag) : void {
-        writer.writeObjectValue<DateTimeTimeZone>("completedDateTime", followupFlag.completedDateTime, serializeDateTimeTimeZone);
-        writer.writeObjectValue<DateTimeTimeZone>("dueDateTime", followupFlag.dueDateTime, serializeDateTimeTimeZone);
-        writer.writeEnumValue<FollowupFlagStatus>("flagStatus", followupFlag.flagStatus);
-        writer.writeObjectValue<DateTimeTimeZone>("startDateTime", followupFlag.startDateTime, serializeDateTimeTimeZone);
-        writer.writeAdditionalData(followupFlag.additionalData);
-}
diff --git a/packages/test/generatedCode/models/serializeInferenceClassification.ts b/packages/test/generatedCode/models/serializeInferenceClassification.ts
deleted file mode 100644
index bdd3ebfad..000000000
--- a/packages/test/generatedCode/models/serializeInferenceClassification.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type {InferenceClassification} from './inferenceClassification';
-import type {InferenceClassificationOverride} from './inferenceClassificationOverride';
-import {serializeEntity} from './serializeEntity';
-import {serializeInferenceClassificationOverride} from './serializeInferenceClassificationOverride';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeInferenceClassification(writer: SerializationWriter, inferenceClassification: InferenceClassification | undefined = {} as InferenceClassification) : void {
-        serializeEntity(writer, inferenceClassification)
-        writer.writeCollectionOfObjectValues<InferenceClassificationOverride>("overrides", inferenceClassification.overrides, serializeInferenceClassificationOverride);
-}
diff --git a/packages/test/generatedCode/models/serializeInferenceClassificationOverride.ts b/packages/test/generatedCode/models/serializeInferenceClassificationOverride.ts
deleted file mode 100644
index 6735c5444..000000000
--- a/packages/test/generatedCode/models/serializeInferenceClassificationOverride.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {EmailAddress} from './emailAddress';
-import type {InferenceClassificationOverride} from './inferenceClassificationOverride';
-import {InferenceClassificationType} from './inferenceClassificationType';
-import {serializeEmailAddress} from './serializeEmailAddress';
-import {serializeEntity} from './serializeEntity';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeInferenceClassificationOverride(writer: SerializationWriter, inferenceClassificationOverride: InferenceClassificationOverride | undefined = {} as InferenceClassificationOverride) : void {
-        serializeEntity(writer, inferenceClassificationOverride)
-        writer.writeEnumValue<InferenceClassificationType>("classifyAs", inferenceClassificationOverride.classifyAs);
-        writer.writeObjectValue<EmailAddress>("senderEmailAddress", inferenceClassificationOverride.senderEmailAddress, serializeEmailAddress);
-}
diff --git a/packages/test/generatedCode/models/serializeInferenceClassificationOverrideCollectionResponse.ts b/packages/test/generatedCode/models/serializeInferenceClassificationOverrideCollectionResponse.ts
deleted file mode 100644
index 58066ea2e..000000000
--- a/packages/test/generatedCode/models/serializeInferenceClassificationOverrideCollectionResponse.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type {InferenceClassificationOverride} from './inferenceClassificationOverride';
-import type {InferenceClassificationOverrideCollectionResponse} from './inferenceClassificationOverrideCollectionResponse';
-import {serializeInferenceClassificationOverride} from './serializeInferenceClassificationOverride';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeInferenceClassificationOverrideCollectionResponse(writer: SerializationWriter, inferenceClassificationOverrideCollectionResponse: InferenceClassificationOverrideCollectionResponse | undefined = {} as InferenceClassificationOverrideCollectionResponse) : void {
-        writer.writeStringValue("@odata.nextLink", inferenceClassificationOverrideCollectionResponse.odataNextLink);
-        writer.writeCollectionOfObjectValues<InferenceClassificationOverride>("value", inferenceClassificationOverrideCollectionResponse.value, serializeInferenceClassificationOverride);
-        writer.writeAdditionalData(inferenceClassificationOverrideCollectionResponse.additionalData);
-}
diff --git a/packages/test/generatedCode/models/serializeInternetMessageHeader.ts b/packages/test/generatedCode/models/serializeInternetMessageHeader.ts
deleted file mode 100644
index 022b785fc..000000000
--- a/packages/test/generatedCode/models/serializeInternetMessageHeader.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type {InternetMessageHeader} from './internetMessageHeader';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeInternetMessageHeader(writer: SerializationWriter, internetMessageHeader: InternetMessageHeader | undefined = {} as InternetMessageHeader) : void {
-        writer.writeStringValue("name", internetMessageHeader.name);
-        writer.writeStringValue("value", internetMessageHeader.value);
-        writer.writeAdditionalData(internetMessageHeader.additionalData);
-}
diff --git a/packages/test/generatedCode/models/serializeItemBody.ts b/packages/test/generatedCode/models/serializeItemBody.ts
deleted file mode 100644
index b6723e264..000000000
--- a/packages/test/generatedCode/models/serializeItemBody.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import {BodyType} from './bodyType';
-import type {ItemBody} from './itemBody';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeItemBody(writer: SerializationWriter, itemBody: ItemBody | undefined = {} as ItemBody) : void {
-        writer.writeStringValue("content", itemBody.content);
-        writer.writeEnumValue<BodyType>("contentType", itemBody.contentType);
-        writer.writeAdditionalData(itemBody.additionalData);
-}
diff --git a/packages/test/generatedCode/models/serializeMailFolder.ts b/packages/test/generatedCode/models/serializeMailFolder.ts
deleted file mode 100644
index 7882b6eb0..000000000
--- a/packages/test/generatedCode/models/serializeMailFolder.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import type {MailFolder} from './mailFolder';
-import type {Message} from './message';
-import type {MessageRule} from './messageRule';
-import type {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
-import {serializeEntity} from './serializeEntity';
-import {serializeMessage} from './serializeMessage';
-import {serializeMessageRule} from './serializeMessageRule';
-import {serializeMultiValueLegacyExtendedProperty} from './serializeMultiValueLegacyExtendedProperty';
-import {serializeSingleValueLegacyExtendedProperty} from './serializeSingleValueLegacyExtendedProperty';
-import type {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeMailFolder(writer: SerializationWriter, mailFolder: MailFolder | undefined = {} as MailFolder) : void {
-        serializeEntity(writer, mailFolder)
-        writer.writeNumberValue("childFolderCount", mailFolder.childFolderCount);
-        writer.writeCollectionOfObjectValues<MailFolder>("childFolders", mailFolder.childFolders, serializeMailFolder);
-        writer.writeStringValue("displayName", mailFolder.displayName);
-        writer.writeBooleanValue("isHidden", mailFolder.isHidden);
-        writer.writeCollectionOfObjectValues<MessageRule>("messageRules", mailFolder.messageRules, serializeMessageRule);
-        writer.writeCollectionOfObjectValues<Message>("messages", mailFolder.messages, serializeMessage);
-        writer.writeCollectionOfObjectValues<MultiValueLegacyExtendedProperty>("multiValueExtendedProperties", mailFolder.multiValueExtendedProperties, serializeMultiValueLegacyExtendedProperty);
-        writer.writeStringValue("parentFolderId", mailFolder.parentFolderId);
-        writer.writeCollectionOfObjectValues<SingleValueLegacyExtendedProperty>("singleValueExtendedProperties", mailFolder.singleValueExtendedProperties, serializeSingleValueLegacyExtendedProperty);
-        writer.writeNumberValue("totalItemCount", mailFolder.totalItemCount);
-        writer.writeNumberValue("unreadItemCount", mailFolder.unreadItemCount);
-}
diff --git a/packages/test/generatedCode/models/serializeMailFolderCollectionResponse.ts b/packages/test/generatedCode/models/serializeMailFolderCollectionResponse.ts
deleted file mode 100644
index 504710047..000000000
--- a/packages/test/generatedCode/models/serializeMailFolderCollectionResponse.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type {MailFolder} from './mailFolder';
-import type {MailFolderCollectionResponse} from './mailFolderCollectionResponse';
-import {serializeMailFolder} from './serializeMailFolder';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeMailFolderCollectionResponse(writer: SerializationWriter, mailFolderCollectionResponse: MailFolderCollectionResponse | undefined = {} as MailFolderCollectionResponse) : void {
-        writer.writeStringValue("@odata.nextLink", mailFolderCollectionResponse.odataNextLink);
-        writer.writeCollectionOfObjectValues<MailFolder>("value", mailFolderCollectionResponse.value, serializeMailFolder);
-        writer.writeAdditionalData(mailFolderCollectionResponse.additionalData);
-}
diff --git a/packages/test/generatedCode/models/serializeMessage.ts b/packages/test/generatedCode/models/serializeMessage.ts
deleted file mode 100644
index ab0aaccab..000000000
--- a/packages/test/generatedCode/models/serializeMessage.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import type {Attachment} from './attachment';
-import type {Extension} from './extension';
-import type {FollowupFlag} from './followupFlag';
-import {Importance} from './importance';
-import {InferenceClassificationType} from './inferenceClassificationType';
-import type {InternetMessageHeader} from './internetMessageHeader';
-import type {ItemBody} from './itemBody';
-import type {Message} from './message';
-import type {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
-import type {Recipient} from './recipient';
-import {serializeAttachment} from './serializeAttachment';
-import {serializeExtension} from './serializeExtension';
-import {serializeFollowupFlag} from './serializeFollowupFlag';
-import {serializeInternetMessageHeader} from './serializeInternetMessageHeader';
-import {serializeItemBody} from './serializeItemBody';
-import {serializeMultiValueLegacyExtendedProperty} from './serializeMultiValueLegacyExtendedProperty';
-import {serializeOutlookItem} from './serializeOutlookItem';
-import {serializeRecipient} from './serializeRecipient';
-import {serializeSingleValueLegacyExtendedProperty} from './serializeSingleValueLegacyExtendedProperty';
-import type {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeMessage(writer: SerializationWriter, message: Message | undefined = {} as Message) : void {
-        serializeOutlookItem(writer, message)
-        writer.writeCollectionOfObjectValues<Attachment>("attachments", message.attachments, serializeAttachment);
-        writer.writeCollectionOfObjectValues<Recipient>("bccRecipients", message.bccRecipients, serializeRecipient);
-        writer.writeObjectValue<ItemBody>("body", message.body, serializeItemBody);
-        writer.writeStringValue("bodyPreview", message.bodyPreview);
-        writer.writeCollectionOfObjectValues<Recipient>("ccRecipients", message.ccRecipients, serializeRecipient);
-        writer.writeStringValue("conversationId", message.conversationId);
-        writer.writeStringValue("conversationIndex", message.conversationIndex);
-        writer.writeCollectionOfObjectValues<Extension>("extensions", message.extensions, serializeExtension);
-        writer.writeObjectValue<FollowupFlag>("flag", message.flag, serializeFollowupFlag);
-        writer.writeObjectValue<Recipient>("from", message.from, serializeRecipient);
-        writer.writeBooleanValue("hasAttachments", message.hasAttachments);
-        writer.writeEnumValue<Importance>("importance", message.importance);
-        writer.writeEnumValue<InferenceClassificationType>("inferenceClassification", message.inferenceClassification);
-        writer.writeCollectionOfObjectValues<InternetMessageHeader>("internetMessageHeaders", message.internetMessageHeaders, serializeInternetMessageHeader);
-        writer.writeStringValue("internetMessageId", message.internetMessageId);
-        writer.writeBooleanValue("isDeliveryReceiptRequested", message.isDeliveryReceiptRequested);
-        writer.writeBooleanValue("isDraft", message.isDraft);
-        writer.writeBooleanValue("isRead", message.isRead);
-        writer.writeBooleanValue("isReadReceiptRequested", message.isReadReceiptRequested);
-        writer.writeCollectionOfObjectValues<MultiValueLegacyExtendedProperty>("multiValueExtendedProperties", message.multiValueExtendedProperties, serializeMultiValueLegacyExtendedProperty);
-        writer.writeStringValue("parentFolderId", message.parentFolderId);
-        writer.writeDateValue("receivedDateTime", message.receivedDateTime);
-        writer.writeCollectionOfObjectValues<Recipient>("replyTo", message.replyTo, serializeRecipient);
-        writer.writeObjectValue<Recipient>("sender", message.sender, serializeRecipient);
-        writer.writeDateValue("sentDateTime", message.sentDateTime);
-        writer.writeCollectionOfObjectValues<SingleValueLegacyExtendedProperty>("singleValueExtendedProperties", message.singleValueExtendedProperties, serializeSingleValueLegacyExtendedProperty);
-        writer.writeStringValue("subject", message.subject);
-        writer.writeCollectionOfObjectValues<Recipient>("toRecipients", message.toRecipients, serializeRecipient);
-        writer.writeObjectValue<ItemBody>("uniqueBody", message.uniqueBody, serializeItemBody);
-        writer.writeStringValue("webLink", message.webLink);
-}
diff --git a/packages/test/generatedCode/models/serializeMessageCollectionResponse.ts b/packages/test/generatedCode/models/serializeMessageCollectionResponse.ts
deleted file mode 100644
index 3f0282f90..000000000
--- a/packages/test/generatedCode/models/serializeMessageCollectionResponse.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type {Message} from './message';
-import type {MessageCollectionResponse} from './messageCollectionResponse';
-import {serializeMessage} from './serializeMessage';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeMessageCollectionResponse(writer: SerializationWriter, messageCollectionResponse: MessageCollectionResponse | undefined = {} as MessageCollectionResponse) : void {
-        writer.writeStringValue("@odata.nextLink", messageCollectionResponse.odataNextLink);
-        writer.writeCollectionOfObjectValues<Message>("value", messageCollectionResponse.value, serializeMessage);
-        writer.writeAdditionalData(messageCollectionResponse.additionalData);
-}
diff --git a/packages/test/generatedCode/models/serializeMessageRule.ts b/packages/test/generatedCode/models/serializeMessageRule.ts
deleted file mode 100644
index dc04199a6..000000000
--- a/packages/test/generatedCode/models/serializeMessageRule.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type {MessageRule} from './messageRule';
-import type {MessageRuleActions} from './messageRuleActions';
-import type {MessageRulePredicates} from './messageRulePredicates';
-import {serializeEntity} from './serializeEntity';
-import {serializeMessageRuleActions} from './serializeMessageRuleActions';
-import {serializeMessageRulePredicates} from './serializeMessageRulePredicates';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeMessageRule(writer: SerializationWriter, messageRule: MessageRule | undefined = {} as MessageRule) : void {
-        serializeEntity(writer, messageRule)
-        writer.writeObjectValue<MessageRuleActions>("actions", messageRule.actions, serializeMessageRuleActions);
-        writer.writeObjectValue<MessageRulePredicates>("conditions", messageRule.conditions, serializeMessageRulePredicates);
-        writer.writeStringValue("displayName", messageRule.displayName);
-        writer.writeObjectValue<MessageRulePredicates>("exceptions", messageRule.exceptions, serializeMessageRulePredicates);
-        writer.writeBooleanValue("hasError", messageRule.hasError);
-        writer.writeBooleanValue("isEnabled", messageRule.isEnabled);
-        writer.writeBooleanValue("isReadOnly", messageRule.isReadOnly);
-        writer.writeNumberValue("sequence", messageRule.sequence);
-}
diff --git a/packages/test/generatedCode/models/serializeMessageRuleActions.ts b/packages/test/generatedCode/models/serializeMessageRuleActions.ts
deleted file mode 100644
index 03f1c4c13..000000000
--- a/packages/test/generatedCode/models/serializeMessageRuleActions.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import {Importance} from './importance';
-import type {MessageRuleActions} from './messageRuleActions';
-import type {Recipient} from './recipient';
-import {serializeRecipient} from './serializeRecipient';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeMessageRuleActions(writer: SerializationWriter, messageRuleActions: MessageRuleActions | undefined = {} as MessageRuleActions) : void {
-        writer.writeCollectionOfPrimitiveValues<string>("assignCategories", messageRuleActions.assignCategories);
-        writer.writeStringValue("copyToFolder", messageRuleActions.copyToFolder);
-        writer.writeBooleanValue("delete", messageRuleActions.delete);
-        writer.writeCollectionOfObjectValues<Recipient>("forwardAsAttachmentTo", messageRuleActions.forwardAsAttachmentTo, serializeRecipient);
-        writer.writeCollectionOfObjectValues<Recipient>("forwardTo", messageRuleActions.forwardTo, serializeRecipient);
-        writer.writeBooleanValue("markAsRead", messageRuleActions.markAsRead);
-        writer.writeEnumValue<Importance>("markImportance", messageRuleActions.markImportance);
-        writer.writeStringValue("moveToFolder", messageRuleActions.moveToFolder);
-        writer.writeBooleanValue("permanentDelete", messageRuleActions.permanentDelete);
-        writer.writeCollectionOfObjectValues<Recipient>("redirectTo", messageRuleActions.redirectTo, serializeRecipient);
-        writer.writeBooleanValue("stopProcessingRules", messageRuleActions.stopProcessingRules);
-        writer.writeAdditionalData(messageRuleActions.additionalData);
-}
diff --git a/packages/test/generatedCode/models/serializeMessageRuleCollectionResponse.ts b/packages/test/generatedCode/models/serializeMessageRuleCollectionResponse.ts
deleted file mode 100644
index 61f0120de..000000000
--- a/packages/test/generatedCode/models/serializeMessageRuleCollectionResponse.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type {MessageRule} from './messageRule';
-import type {MessageRuleCollectionResponse} from './messageRuleCollectionResponse';
-import {serializeMessageRule} from './serializeMessageRule';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeMessageRuleCollectionResponse(writer: SerializationWriter, messageRuleCollectionResponse: MessageRuleCollectionResponse | undefined = {} as MessageRuleCollectionResponse) : void {
-        writer.writeStringValue("@odata.nextLink", messageRuleCollectionResponse.odataNextLink);
-        writer.writeCollectionOfObjectValues<MessageRule>("value", messageRuleCollectionResponse.value, serializeMessageRule);
-        writer.writeAdditionalData(messageRuleCollectionResponse.additionalData);
-}
diff --git a/packages/test/generatedCode/models/serializeMessageRulePredicates.ts b/packages/test/generatedCode/models/serializeMessageRulePredicates.ts
deleted file mode 100644
index 8b50b7350..000000000
--- a/packages/test/generatedCode/models/serializeMessageRulePredicates.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import {Importance} from './importance';
-import {MessageActionFlag} from './messageActionFlag';
-import type {MessageRulePredicates} from './messageRulePredicates';
-import type {Recipient} from './recipient';
-import {Sensitivity} from './sensitivity';
-import {serializeRecipient} from './serializeRecipient';
-import {serializeSizeRange} from './serializeSizeRange';
-import type {SizeRange} from './sizeRange';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeMessageRulePredicates(writer: SerializationWriter, messageRulePredicates: MessageRulePredicates | undefined = {} as MessageRulePredicates) : void {
-        writer.writeCollectionOfPrimitiveValues<string>("bodyContains", messageRulePredicates.bodyContains);
-        writer.writeCollectionOfPrimitiveValues<string>("bodyOrSubjectContains", messageRulePredicates.bodyOrSubjectContains);
-        writer.writeCollectionOfPrimitiveValues<string>("categories", messageRulePredicates.categories);
-        writer.writeCollectionOfObjectValues<Recipient>("fromAddresses", messageRulePredicates.fromAddresses, serializeRecipient);
-        writer.writeBooleanValue("hasAttachments", messageRulePredicates.hasAttachments);
-        writer.writeCollectionOfPrimitiveValues<string>("headerContains", messageRulePredicates.headerContains);
-        writer.writeEnumValue<Importance>("importance", messageRulePredicates.importance);
-        writer.writeBooleanValue("isApprovalRequest", messageRulePredicates.isApprovalRequest);
-        writer.writeBooleanValue("isAutomaticForward", messageRulePredicates.isAutomaticForward);
-        writer.writeBooleanValue("isAutomaticReply", messageRulePredicates.isAutomaticReply);
-        writer.writeBooleanValue("isEncrypted", messageRulePredicates.isEncrypted);
-        writer.writeBooleanValue("isMeetingRequest", messageRulePredicates.isMeetingRequest);
-        writer.writeBooleanValue("isMeetingResponse", messageRulePredicates.isMeetingResponse);
-        writer.writeBooleanValue("isNonDeliveryReport", messageRulePredicates.isNonDeliveryReport);
-        writer.writeBooleanValue("isPermissionControlled", messageRulePredicates.isPermissionControlled);
-        writer.writeBooleanValue("isReadReceipt", messageRulePredicates.isReadReceipt);
-        writer.writeBooleanValue("isSigned", messageRulePredicates.isSigned);
-        writer.writeBooleanValue("isVoicemail", messageRulePredicates.isVoicemail);
-        writer.writeEnumValue<MessageActionFlag>("messageActionFlag", messageRulePredicates.messageActionFlag);
-        writer.writeBooleanValue("notSentToMe", messageRulePredicates.notSentToMe);
-        writer.writeCollectionOfPrimitiveValues<string>("recipientContains", messageRulePredicates.recipientContains);
-        writer.writeCollectionOfPrimitiveValues<string>("senderContains", messageRulePredicates.senderContains);
-        writer.writeEnumValue<Sensitivity>("sensitivity", messageRulePredicates.sensitivity);
-        writer.writeBooleanValue("sentCcMe", messageRulePredicates.sentCcMe);
-        writer.writeBooleanValue("sentOnlyToMe", messageRulePredicates.sentOnlyToMe);
-        writer.writeCollectionOfObjectValues<Recipient>("sentToAddresses", messageRulePredicates.sentToAddresses, serializeRecipient);
-        writer.writeBooleanValue("sentToMe", messageRulePredicates.sentToMe);
-        writer.writeBooleanValue("sentToOrCcMe", messageRulePredicates.sentToOrCcMe);
-        writer.writeCollectionOfPrimitiveValues<string>("subjectContains", messageRulePredicates.subjectContains);
-        writer.writeObjectValue<SizeRange>("withinSizeRange", messageRulePredicates.withinSizeRange, serializeSizeRange);
-        writer.writeAdditionalData(messageRulePredicates.additionalData);
-}
diff --git a/packages/test/generatedCode/models/serializeMultiValueLegacyExtendedProperty.ts b/packages/test/generatedCode/models/serializeMultiValueLegacyExtendedProperty.ts
deleted file mode 100644
index 641775882..000000000
--- a/packages/test/generatedCode/models/serializeMultiValueLegacyExtendedProperty.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProperty';
-import {serializeEntity} from './serializeEntity';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeMultiValueLegacyExtendedProperty(writer: SerializationWriter, multiValueLegacyExtendedProperty: MultiValueLegacyExtendedProperty | undefined = {} as MultiValueLegacyExtendedProperty) : void {
-        serializeEntity(writer, multiValueLegacyExtendedProperty)
-        writer.writeCollectionOfPrimitiveValues<string>("value", multiValueLegacyExtendedProperty.value);
-}
diff --git a/packages/test/generatedCode/models/serializeOutlookItem.ts b/packages/test/generatedCode/models/serializeOutlookItem.ts
deleted file mode 100644
index 25a745fb8..000000000
--- a/packages/test/generatedCode/models/serializeOutlookItem.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type {OutlookItem} from './outlookItem';
-import {serializeEntity} from './serializeEntity';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeOutlookItem(writer: SerializationWriter, outlookItem: OutlookItem | undefined = {} as OutlookItem) : void {
-        serializeEntity(writer, outlookItem)
-        writer.writeCollectionOfPrimitiveValues<string>("categories", outlookItem.categories);
-        writer.writeStringValue("changeKey", outlookItem.changeKey);
-        writer.writeDateValue("createdDateTime", outlookItem.createdDateTime);
-        writer.writeDateValue("lastModifiedDateTime", outlookItem.lastModifiedDateTime);
-}
diff --git a/packages/test/generatedCode/models/serializeRecipient.ts b/packages/test/generatedCode/models/serializeRecipient.ts
deleted file mode 100644
index 5b8a46094..000000000
--- a/packages/test/generatedCode/models/serializeRecipient.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type {EmailAddress} from './emailAddress';
-import type {Recipient} from './recipient';
-import {serializeEmailAddress} from './serializeEmailAddress';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeRecipient(writer: SerializationWriter, recipient: Recipient | undefined = {} as Recipient) : void {
-        writer.writeObjectValue<EmailAddress>("emailAddress", recipient.emailAddress, serializeEmailAddress);
-        writer.writeAdditionalData(recipient.additionalData);
-}
diff --git a/packages/test/generatedCode/models/serializeSingleValueLegacyExtendedProperty.ts b/packages/test/generatedCode/models/serializeSingleValueLegacyExtendedProperty.ts
deleted file mode 100644
index fd0c03a5b..000000000
--- a/packages/test/generatedCode/models/serializeSingleValueLegacyExtendedProperty.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {serializeEntity} from './serializeEntity';
-import type {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty';
-import type {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeSingleValueLegacyExtendedProperty(writer: SerializationWriter, singleValueLegacyExtendedProperty: SingleValueLegacyExtendedProperty | undefined = {} as SingleValueLegacyExtendedProperty) : void {
-        serializeEntity(writer, singleValueLegacyExtendedProperty)
-        writer.writeStringValue("value", singleValueLegacyExtendedProperty.value);
-}
diff --git a/packages/test/generatedCode/models/serializeSizeRange.ts b/packages/test/generatedCode/models/serializeSizeRange.ts
deleted file mode 100644
index 0df84de96..000000000
--- a/packages/test/generatedCode/models/serializeSizeRange.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type {SizeRange} from './sizeRange';
-import type {AdditionalDataHolder, Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions';
-
-export function serializeSizeRange(writer: SerializationWriter, sizeRange: SizeRange | undefined = {} as SizeRange) : void {
-        writer.writeNumberValue("maximumSize", sizeRange.maximumSize);
-        writer.writeNumberValue("minimumSize", sizeRange.minimumSize);
-        writer.writeAdditionalData(sizeRange.additionalData);
-}
diff --git a/packages/test/generatedCode/models/singleValueLegacyExtendedProperty.ts b/packages/test/generatedCode/models/singleValueLegacyExtendedProperty.ts
index 778f5ad74..b5eee9c45 100644
--- a/packages/test/generatedCode/models/singleValueLegacyExtendedProperty.ts
+++ b/packages/test/generatedCode/models/singleValueLegacyExtendedProperty.ts
@@ -1,9 +1,28 @@
-import type {Entity} from './entity';
-import type {Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { deserializeIntoEntity, serializeEntity, type Entity } from './entity';
+import { type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createSingleValueLegacyExtendedPropertyFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoSingleValueLegacyExtendedProperty;
+}
+export function deserializeIntoSingleValueLegacyExtendedProperty(singleValueLegacyExtendedProperty: SingleValueLegacyExtendedProperty | undefined = {} as SingleValueLegacyExtendedProperty) : Record<string, (node: ParseNode) => void> {
+    return {
+        ...deserializeIntoEntity(singleValueLegacyExtendedProperty),
+        "value": n => { singleValueLegacyExtendedProperty.value = n.getStringValue(); },
+    }
+}
+export function serializeSingleValueLegacyExtendedProperty(writer: SerializationWriter, singleValueLegacyExtendedProperty: SingleValueLegacyExtendedProperty | undefined = {} as SingleValueLegacyExtendedProperty) : void {
+        serializeEntity(writer, singleValueLegacyExtendedProperty)
+        writer.writeStringValue("value", singleValueLegacyExtendedProperty.value);
+}
 export interface SingleValueLegacyExtendedProperty extends Entity, Parsable {
     /**
      * A property value.
      */
-    value?: string | undefined;
+    value?: string;
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/models/sizeRange.ts b/packages/test/generatedCode/models/sizeRange.ts
index 401ca0ca6..61e8e2f0a 100644
--- a/packages/test/generatedCode/models/sizeRange.ts
+++ b/packages/test/generatedCode/models/sizeRange.ts
@@ -1,5 +1,23 @@
-import type {AdditionalDataHolder, Parsable} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type AdditionalDataHolder, type Parsable, type ParseNode, type SerializationWriter } from '@microsoft/kiota-abstractions';
 
+export function createSizeRangeFromDiscriminatorValue(parseNode: ParseNode | undefined) {
+    if(!parseNode) throw new Error("parseNode cannot be undefined");
+    return deserializeIntoSizeRange;
+}
+export function deserializeIntoSizeRange(sizeRange: SizeRange | undefined = {} as SizeRange) : Record<string, (node: ParseNode) => void> {
+    return {
+        "maximumSize": n => { sizeRange.maximumSize = n.getNumberValue(); },
+        "minimumSize": n => { sizeRange.minimumSize = n.getNumberValue(); },
+    }
+}
+export function serializeSizeRange(writer: SerializationWriter, sizeRange: SizeRange | undefined = {} as SizeRange) : void {
+        writer.writeNumberValue("maximumSize", sizeRange.maximumSize);
+        writer.writeNumberValue("minimumSize", sizeRange.minimumSize);
+        writer.writeAdditionalData(sizeRange.additionalData);
+}
 export interface SizeRange extends AdditionalDataHolder, Parsable {
     /**
      * Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
@@ -8,9 +26,11 @@ export interface SizeRange extends AdditionalDataHolder, Parsable {
     /**
      * The maximum size (in kilobytes) that an incoming message must have in order for a condition or exception to apply.
      */
-    maximumSize?: number | undefined;
+    maximumSize?: number;
     /**
      * The minimum size (in kilobytes) that an incoming message must have in order for a condition or exception to apply.
      */
-    minimumSize?: number | undefined;
+    minimumSize?: number;
 }
+// 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 65302a885..5be9cac4e 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/index.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/index.ts
@@ -1,3 +1 @@
-export * from './inferenceClassificationRequestBuilderGetQueryParameters'
-export * from './inferenceClassificationRequestBuilderGetRequestConfiguration'
-export * from './inferenceClassificationRequestBuilderPatchRequestConfiguration'
+export * from './inferenceClassificationRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts b/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts
index 85af26958..b44c3f4c8 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts
@@ -1,13 +1,42 @@
-import {createInferenceClassificationFromDiscriminatorValue} from '../../../models/createInferenceClassificationFromDiscriminatorValue';
-import {deserializeIntoInferenceClassification} from '../../../models/deserializeIntoInferenceClassification';
-import type {InferenceClassification} from '../../../models/inferenceClassification';
-import {serializeInferenceClassification} from '../../../models/serializeInferenceClassification';
-import {InferenceClassificationRequestBuilderGetRequestConfiguration} from './inferenceClassificationRequestBuilderGetRequestConfiguration';
-import {InferenceClassificationRequestBuilderPatchRequestConfiguration} from './inferenceClassificationRequestBuilderPatchRequestConfiguration';
-import {OverridesRequestBuilder} from './overrides/overridesRequestBuilder';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createInferenceClassificationFromDiscriminatorValue, deserializeIntoInferenceClassification, serializeInferenceClassification, type InferenceClassification } from '../../../models/inferenceClassification';
+import { type ODataError } from '../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../models/oDataErrors/oDataError';
+import { OverridesRequestBuilder } from './overrides/overridesRequestBuilder';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface InferenceClassificationRequestBuilderGetQueryParameters {
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface InferenceClassificationRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: InferenceClassificationRequestBuilderGetQueryParameters;
+}
+export interface InferenceClassificationRequestBuilderPatchRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/inferenceClassification
  */
@@ -27,7 +56,7 @@ export class InferenceClassificationRequestBuilder extends BaseRequestBuilder {
         super(pathParameters, requestAdapter, "{+baseurl}/users/{user%2Did}/inferenceClassification{?%24select}");
     };
     /**
-     * Relevance classification of the user's messages based on explicit designations which override inferred relevance or importance.
+     * 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
      */
@@ -35,7 +64,11 @@ export class InferenceClassificationRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<InferenceClassification>(requestInfo, createInferenceClassificationFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<InferenceClassification>(requestInfo, createInferenceClassificationFromDiscriminatorValue, errorMapping);
     };
     /**
      * Update the navigation property inferenceClassification in users
@@ -47,10 +80,14 @@ export class InferenceClassificationRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<InferenceClassification>(requestInfo, createInferenceClassificationFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<InferenceClassification>(requestInfo, createInferenceClassificationFromDiscriminatorValue, errorMapping);
     };
     /**
-     * Relevance classification of the user's messages based on explicit designations which override inferred relevance or importance.
+     * 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
      */
@@ -87,4 +124,15 @@ export class InferenceClassificationRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeInferenceClassification);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a inferenceClassificationRequestBuilder
+     */
+    public withUrl(rawUrl: string) : InferenceClassificationRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new InferenceClassificationRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 96bcf6348..000000000
--- a/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-export interface InferenceClassificationRequestBuilderGetQueryParameters {
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 665aa961a..000000000
--- a/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {InferenceClassificationRequestBuilderGetQueryParameters} from './inferenceClassificationRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface InferenceClassificationRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: InferenceClassificationRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderPatchRequestConfiguration.ts
deleted file mode 100644
index ec305fa25..000000000
--- a/packages/test/generatedCode/users/item/inferenceClassification/inferenceClassificationRequestBuilderPatchRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface InferenceClassificationRequestBuilderPatchRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilder.ts
index d6711be99..ebf8c1ce9 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilder.ts
@@ -1,7 +1,30 @@
-import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface CountRequestBuilderGetQueryParameters {
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+}
+export interface CountRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: CountRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides/$count
  */
@@ -23,7 +46,11 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", errorMapping);
     };
     /**
      * Get the number of the resource
@@ -43,4 +70,15 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a CountRequestBuilder
+     */
+    public withUrl(rawUrl: string) : CountRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new CountRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 331c0c0a1..000000000
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-export interface CountRequestBuilderGetQueryParameters {
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 8aee05dfa..000000000
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/countRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface CountRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: CountRequestBuilderGetQueryParameters | undefined;
-}
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 133257ca9..6f4dcefa9 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/index.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/index.ts
@@ -1,2 +1 @@
-export * from './countRequestBuilderGetQueryParameters'
-export * from './countRequestBuilderGetRequestConfiguration'
+export * from './countRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/index.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/index.ts
index 1430acbb6..014ab01fe 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/index.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/index.ts
@@ -1,3 +1 @@
-export * from './overridesRequestBuilderGetQueryParameters'
-export * from './overridesRequestBuilderGetRequestConfiguration'
-export * from './overridesRequestBuilderPostRequestConfiguration'
+export * from './overridesRequestBuilder'
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 495837f36..60c8a8909 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/index.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/index.ts
@@ -1,4 +1 @@
-export * from './inferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration'
-export * from './inferenceClassificationOverrideItemRequestBuilderGetQueryParameters'
-export * from './inferenceClassificationOverrideItemRequestBuilderGetRequestConfiguration'
-export * from './inferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration'
+export * from './inferenceClassificationOverrideItemRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilder.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilder.ts
index 5d981f069..f7ebdbe56 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilder.ts
@@ -1,13 +1,51 @@
-import {createInferenceClassificationOverrideFromDiscriminatorValue} from '../../../../../models/createInferenceClassificationOverrideFromDiscriminatorValue';
-import {deserializeIntoInferenceClassificationOverride} from '../../../../../models/deserializeIntoInferenceClassificationOverride';
-import type {InferenceClassificationOverride} from '../../../../../models/inferenceClassificationOverride';
-import {serializeInferenceClassificationOverride} from '../../../../../models/serializeInferenceClassificationOverride';
-import {InferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration} from './inferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration';
-import {InferenceClassificationOverrideItemRequestBuilderGetRequestConfiguration} from './inferenceClassificationOverrideItemRequestBuilderGetRequestConfiguration';
-import {InferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration} from './inferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createInferenceClassificationOverrideFromDiscriminatorValue, deserializeIntoInferenceClassificationOverride, serializeInferenceClassificationOverride, type InferenceClassificationOverride } from '../../../../../models/inferenceClassificationOverride';
+import { type ODataError } from '../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface InferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface InferenceClassificationOverrideItemRequestBuilderGetQueryParameters {
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface InferenceClassificationOverrideItemRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: InferenceClassificationOverrideItemRequestBuilderGetQueryParameters;
+}
+export interface InferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides/{inferenceClassificationOverride-id}
  */
@@ -30,7 +68,11 @@ export class InferenceClassificationOverrideItemRequestBuilder extends BaseReque
         const requestInfo = this.toDeleteRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * A set of overrides for a user to always classify messages from specific senders in certain ways: focused, or other. Read-only. Nullable.
@@ -41,7 +83,11 @@ export class InferenceClassificationOverrideItemRequestBuilder extends BaseReque
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<InferenceClassificationOverride>(requestInfo, createInferenceClassificationOverrideFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<InferenceClassificationOverride>(requestInfo, createInferenceClassificationOverrideFromDiscriminatorValue, errorMapping);
     };
     /**
      * 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.
@@ -54,7 +100,11 @@ export class InferenceClassificationOverrideItemRequestBuilder extends BaseReque
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<InferenceClassificationOverride>(requestInfo, createInferenceClassificationOverrideFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<InferenceClassificationOverride>(requestInfo, createInferenceClassificationOverrideFromDiscriminatorValue, errorMapping);
     };
     /**
      * Delete an override specified by its ID.
@@ -110,4 +160,15 @@ export class InferenceClassificationOverrideItemRequestBuilder extends BaseReque
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeInferenceClassificationOverride);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a InferenceClassificationOverrideItemRequestBuilder
+     */
+    public withUrl(rawUrl: string) : InferenceClassificationOverrideItemRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new InferenceClassificationOverrideItemRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration.ts
deleted file mode 100644
index c88ce1e33..000000000
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface InferenceClassificationOverrideItemRequestBuilderDeleteRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index edcd09e92..000000000
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-export interface InferenceClassificationOverrideItemRequestBuilderGetQueryParameters {
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index d5a99844a..000000000
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {InferenceClassificationOverrideItemRequestBuilderGetQueryParameters} from './inferenceClassificationOverrideItemRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface InferenceClassificationOverrideItemRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: InferenceClassificationOverrideItemRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration.ts
deleted file mode 100644
index bf333482b..000000000
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface InferenceClassificationOverrideItemRequestBuilderPatchRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts
index de6b97c56..81e023887 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts
@@ -1,16 +1,65 @@
-import {InferenceClassificationOverrideCollectionResponse} from '../../../../models/';
-import {createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue} from '../../../../models/createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue';
-import {createInferenceClassificationOverrideFromDiscriminatorValue} from '../../../../models/createInferenceClassificationOverrideFromDiscriminatorValue';
-import {deserializeIntoInferenceClassificationOverride} from '../../../../models/deserializeIntoInferenceClassificationOverride';
-import type {InferenceClassificationOverride} from '../../../../models/inferenceClassificationOverride';
-import {serializeInferenceClassificationOverride} from '../../../../models/serializeInferenceClassificationOverride';
-import {CountRequestBuilder} from './count/countRequestBuilder';
-import {InferenceClassificationOverrideItemRequestBuilder} from './item/inferenceClassificationOverrideItemRequestBuilder';
-import {OverridesRequestBuilderGetRequestConfiguration} from './overridesRequestBuilderGetRequestConfiguration';
-import {OverridesRequestBuilderPostRequestConfiguration} from './overridesRequestBuilderPostRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type InferenceClassificationOverrideCollectionResponse } from '../../../../models/';
+import { createInferenceClassificationOverrideFromDiscriminatorValue, deserializeIntoInferenceClassificationOverride, serializeInferenceClassificationOverride, type InferenceClassificationOverride } from '../../../../models/inferenceClassificationOverride';
+import { createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue } from '../../../../models/inferenceClassificationOverrideCollectionResponse';
+import { type ODataError } from '../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../models/oDataErrors/oDataError';
+import { CountRequestBuilder } from './count/countRequestBuilder';
+import { InferenceClassificationOverrideItemRequestBuilder } from './item/inferenceClassificationOverrideItemRequestBuilder';
+import { BaseRequestBuilder, getPathParameters, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface OverridesRequestBuilderGetQueryParameters {
+    /**
+     * Include count of items
+     */
+    count?: boolean;
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Order items by property values
+     */
+    orderby?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+    /**
+     * Skip the first n items
+     */
+    skip?: number;
+    /**
+     * Show only the first n items
+     */
+    top?: number;
+}
+export interface OverridesRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: OverridesRequestBuilderGetQueryParameters;
+}
+export interface OverridesRequestBuilderPostRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides
  */
@@ -50,7 +99,11 @@ export class OverridesRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<InferenceClassificationOverrideCollectionResponse>(requestInfo, createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<InferenceClassificationOverrideCollectionResponse>(requestInfo, createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue, errorMapping);
     };
     /**
      * 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
@@ -63,7 +116,11 @@ export class OverridesRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<InferenceClassificationOverride>(requestInfo, createInferenceClassificationOverrideFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<InferenceClassificationOverride>(requestInfo, createInferenceClassificationOverrideFromDiscriminatorValue, errorMapping);
     };
     /**
      * 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.
@@ -103,4 +160,15 @@ export class OverridesRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeInferenceClassificationOverride);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a overridesRequestBuilder
+     */
+    public withUrl(rawUrl: string) : OverridesRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new OverridesRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index c989a213b..000000000
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-
-export interface OverridesRequestBuilderGetQueryParameters {
-    /**
-     * Include count of items
-     */
-    count?: boolean | undefined;
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Order items by property values
-     */
-    orderby?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-    /**
-     * Skip the first n items
-     */
-    skip?: number | undefined;
-    /**
-     * Show only the first n items
-     */
-    top?: number | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index eced106ac..000000000
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {OverridesRequestBuilderGetQueryParameters} from './overridesRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface OverridesRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: OverridesRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderPostRequestConfiguration.ts
deleted file mode 100644
index d08ad0106..000000000
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/overridesRequestBuilderPostRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface OverridesRequestBuilderPostRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilder.ts
index a485433b5..d23b2a4e6 100644
--- a/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilder.ts
@@ -1,7 +1,30 @@
-import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface CountRequestBuilderGetQueryParameters {
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+}
+export interface CountRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: CountRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/$count
  */
@@ -23,7 +46,11 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", errorMapping);
     };
     /**
      * Get the number of the resource
@@ -43,4 +70,15 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a CountRequestBuilder
+     */
+    public withUrl(rawUrl: string) : CountRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new CountRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 331c0c0a1..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-export interface CountRequestBuilderGetQueryParameters {
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 8aee05dfa..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/count/countRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface CountRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: CountRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/count/index.ts
index 133257ca9..6f4dcefa9 100644
--- a/packages/test/generatedCode/users/item/mailFolders/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/count/index.ts
@@ -1,2 +1 @@
-export * from './countRequestBuilderGetQueryParameters'
-export * from './countRequestBuilderGetRequestConfiguration'
+export * from './countRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/index.ts b/packages/test/generatedCode/users/item/mailFolders/index.ts
index 060668390..a05004282 100644
--- a/packages/test/generatedCode/users/item/mailFolders/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/index.ts
@@ -1,3 +1 @@
-export * from './mailFoldersRequestBuilderGetQueryParameters'
-export * from './mailFoldersRequestBuilderGetRequestConfiguration'
-export * from './mailFoldersRequestBuilderPostRequestConfiguration'
+export * from './mailFoldersRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts
index 4849a6fdd..06b6b89f2 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts
@@ -1,16 +1,73 @@
-import {MailFolderCollectionResponse} from '../../../../../models/';
-import {createMailFolderCollectionResponseFromDiscriminatorValue} from '../../../../../models/createMailFolderCollectionResponseFromDiscriminatorValue';
-import {createMailFolderFromDiscriminatorValue} from '../../../../../models/createMailFolderFromDiscriminatorValue';
-import {deserializeIntoMailFolder} from '../../../../../models/deserializeIntoMailFolder';
-import type {MailFolder} from '../../../../../models/mailFolder';
-import {serializeMailFolder} from '../../../../../models/serializeMailFolder';
-import {ChildFoldersRequestBuilderGetRequestConfiguration} from './childFoldersRequestBuilderGetRequestConfiguration';
-import {ChildFoldersRequestBuilderPostRequestConfiguration} from './childFoldersRequestBuilderPostRequestConfiguration';
-import {CountRequestBuilder} from './count/countRequestBuilder';
-import {MailFolderItemRequestBuilder} from './item/mailFolderItemRequestBuilder';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type MailFolderCollectionResponse } from '../../../../../models/';
+import { createMailFolderFromDiscriminatorValue, deserializeIntoMailFolder, serializeMailFolder, type MailFolder } from '../../../../../models/mailFolder';
+import { createMailFolderCollectionResponseFromDiscriminatorValue } from '../../../../../models/mailFolderCollectionResponse';
+import { type ODataError } from '../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../models/oDataErrors/oDataError';
+import { CountRequestBuilder } from './count/countRequestBuilder';
+import { MailFolderItemRequestBuilder } from './item/mailFolderItemRequestBuilder';
+import { BaseRequestBuilder, getPathParameters, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface ChildFoldersRequestBuilderGetQueryParameters {
+    /**
+     * Include count of items
+     */
+    count?: boolean;
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Include Hidden Folders
+     */
+    includeHiddenFolders?: string;
+    /**
+     * Order items by property values
+     */
+    orderby?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+    /**
+     * Skip the first n items
+     */
+    skip?: number;
+    /**
+     * Show only the first n items
+     */
+    top?: number;
+}
+export interface ChildFoldersRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: ChildFoldersRequestBuilderGetQueryParameters;
+}
+export interface ChildFoldersRequestBuilderPostRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders
  */
@@ -50,7 +107,11 @@ export class ChildFoldersRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MailFolderCollectionResponse>(requestInfo, createMailFolderCollectionResponseFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MailFolderCollectionResponse>(requestInfo, createMailFolderCollectionResponseFromDiscriminatorValue, errorMapping);
     };
     /**
      * Use this API to create a new child mailFolder. If you intend a new folder to be hidden, you must set the isHidden property to true on creation.
@@ -63,7 +124,11 @@ export class ChildFoldersRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MailFolder>(requestInfo, createMailFolderFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MailFolder>(requestInfo, createMailFolderFromDiscriminatorValue, errorMapping);
     };
     /**
      * The collection of child folders in the mailFolder.
@@ -103,4 +168,15 @@ export class ChildFoldersRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMailFolder);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a childFoldersRequestBuilder
+     */
+    public withUrl(rawUrl: string) : ChildFoldersRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new ChildFoldersRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 16b08322d..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-
-export interface ChildFoldersRequestBuilderGetQueryParameters {
-    /**
-     * Include count of items
-     */
-    count?: boolean | undefined;
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Include Hidden Folders
-     */
-    includeHiddenFolders?: string | undefined;
-    /**
-     * Order items by property values
-     */
-    orderby?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-    /**
-     * Skip the first n items
-     */
-    skip?: number | undefined;
-    /**
-     * Show only the first n items
-     */
-    top?: number | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index eeb47b884..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {ChildFoldersRequestBuilderGetQueryParameters} from './childFoldersRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ChildFoldersRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: ChildFoldersRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderPostRequestConfiguration.ts
deleted file mode 100644
index 7b40063fd..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/childFoldersRequestBuilderPostRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ChildFoldersRequestBuilderPostRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilder.ts
index 9b0faf772..9e7f7e3b7 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilder.ts
@@ -1,7 +1,30 @@
-import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface CountRequestBuilderGetQueryParameters {
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+}
+export interface CountRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: CountRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/$count
  */
@@ -23,7 +46,11 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", errorMapping);
     };
     /**
      * Get the number of the resource
@@ -43,4 +70,15 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a CountRequestBuilder
+     */
+    public withUrl(rawUrl: string) : CountRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new CountRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 331c0c0a1..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-export interface CountRequestBuilderGetQueryParameters {
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 8aee05dfa..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/countRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface CountRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: CountRequestBuilderGetQueryParameters | undefined;
-}
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 133257ca9..6f4dcefa9 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
@@ -1,2 +1 @@
-export * from './countRequestBuilderGetQueryParameters'
-export * from './countRequestBuilderGetRequestConfiguration'
+export * from './countRequestBuilder'
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 194ddff22..f1b45c761 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/index.ts
@@ -1,3 +1 @@
-export * from './childFoldersRequestBuilderGetQueryParameters'
-export * from './childFoldersRequestBuilderGetRequestConfiguration'
-export * from './childFoldersRequestBuilderPostRequestConfiguration'
+export * from './childFoldersRequestBuilder'
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 e24abb129..a5dc31207 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
@@ -1,4 +1 @@
-export * from './mailFolderItemRequestBuilderDeleteRequestConfiguration'
-export * from './mailFolderItemRequestBuilderGetQueryParameters'
-export * from './mailFolderItemRequestBuilderGetRequestConfiguration'
-export * from './mailFolderItemRequestBuilderPatchRequestConfiguration'
+export * from './mailFolderItemRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilder.ts
index e25d484e3..8deb161a6 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilder.ts
@@ -1,15 +1,61 @@
-import {createMailFolderFromDiscriminatorValue} from '../../../../../../models/createMailFolderFromDiscriminatorValue';
-import {deserializeIntoMailFolder} from '../../../../../../models/deserializeIntoMailFolder';
-import type {MailFolder} from '../../../../../../models/mailFolder';
-import {serializeMailFolder} from '../../../../../../models/serializeMailFolder';
-import {MailFolderItemRequestBuilderDeleteRequestConfiguration} from './mailFolderItemRequestBuilderDeleteRequestConfiguration';
-import {MailFolderItemRequestBuilderGetRequestConfiguration} from './mailFolderItemRequestBuilderGetRequestConfiguration';
-import {MailFolderItemRequestBuilderPatchRequestConfiguration} from './mailFolderItemRequestBuilderPatchRequestConfiguration';
-import {MessageRulesRequestBuilder} from './messageRules/messageRulesRequestBuilder';
-import {MessagesRequestBuilder} from './messages/messagesRequestBuilder';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createMailFolderFromDiscriminatorValue, deserializeIntoMailFolder, serializeMailFolder, type MailFolder } from '../../../../../../models/mailFolder';
+import { type ODataError } from '../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../models/oDataErrors/oDataError';
+import { MessageRulesRequestBuilder } from './messageRules/messageRulesRequestBuilder';
+import { MessagesRequestBuilder } from './messages/messagesRequestBuilder';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface MailFolderItemRequestBuilderDeleteRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface MailFolderItemRequestBuilderGetQueryParameters {
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Include Hidden Folders
+     */
+    includeHiddenFolders?: string;
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface MailFolderItemRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: MailFolderItemRequestBuilderGetQueryParameters;
+}
+export interface MailFolderItemRequestBuilderPatchRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}
  */
@@ -43,7 +89,11 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toDeleteRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * The collection of child folders in the mailFolder.
@@ -54,7 +104,11 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MailFolder>(requestInfo, createMailFolderFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MailFolder>(requestInfo, createMailFolderFromDiscriminatorValue, errorMapping);
     };
     /**
      * Update the navigation property childFolders in users
@@ -66,7 +120,11 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MailFolder>(requestInfo, createMailFolderFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MailFolder>(requestInfo, createMailFolderFromDiscriminatorValue, errorMapping);
     };
     /**
      * Delete navigation property childFolders for users
@@ -122,4 +180,15 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMailFolder);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a MailFolderItemRequestBuilder
+     */
+    public withUrl(rawUrl: string) : MailFolderItemRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new MailFolderItemRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderDeleteRequestConfiguration.ts
deleted file mode 100644
index db075adce..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderDeleteRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MailFolderItemRequestBuilderDeleteRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 4c303a776..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-
-export interface MailFolderItemRequestBuilderGetQueryParameters {
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Include Hidden Folders
-     */
-    includeHiddenFolders?: string | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 2bad54a29..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {MailFolderItemRequestBuilderGetQueryParameters} from './mailFolderItemRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MailFolderItemRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: MailFolderItemRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderPatchRequestConfiguration.ts
deleted file mode 100644
index fe2821123..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/mailFolderItemRequestBuilderPatchRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MailFolderItemRequestBuilderPatchRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilder.ts
index 56a4a918a..7a73f6eaf 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilder.ts
@@ -1,7 +1,30 @@
-import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface CountRequestBuilderGetQueryParameters {
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+}
+export interface CountRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: CountRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messageRules/$count
  */
@@ -23,7 +46,11 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", errorMapping);
     };
     /**
      * Get the number of the resource
@@ -43,4 +70,15 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a CountRequestBuilder
+     */
+    public withUrl(rawUrl: string) : CountRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new CountRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 331c0c0a1..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-export interface CountRequestBuilderGetQueryParameters {
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 8aee05dfa..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/countRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface CountRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: CountRequestBuilderGetQueryParameters | undefined;
-}
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 133257ca9..6f4dcefa9 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
@@ -1,2 +1 @@
-export * from './countRequestBuilderGetQueryParameters'
-export * from './countRequestBuilderGetRequestConfiguration'
+export * from './countRequestBuilder'
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 541faa337..38ab8d47a 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
@@ -1,3 +1 @@
-export * from './messageRulesRequestBuilderGetQueryParameters'
-export * from './messageRulesRequestBuilderGetRequestConfiguration'
-export * from './messageRulesRequestBuilderPostRequestConfiguration'
+export * from './messageRulesRequestBuilder'
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 93cda05e6..53274d05a 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
@@ -1,4 +1 @@
-export * from './messageRuleItemRequestBuilderDeleteRequestConfiguration'
-export * from './messageRuleItemRequestBuilderGetQueryParameters'
-export * from './messageRuleItemRequestBuilderGetRequestConfiguration'
-export * from './messageRuleItemRequestBuilderPatchRequestConfiguration'
+export * from './messageRuleItemRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilder.ts
index fc0f87eee..c96083a79 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilder.ts
@@ -1,13 +1,51 @@
-import {createMessageRuleFromDiscriminatorValue} from '../../../../../../../../models/createMessageRuleFromDiscriminatorValue';
-import {deserializeIntoMessageRule} from '../../../../../../../../models/deserializeIntoMessageRule';
-import type {MessageRule} from '../../../../../../../../models/messageRule';
-import {serializeMessageRule} from '../../../../../../../../models/serializeMessageRule';
-import {MessageRuleItemRequestBuilderDeleteRequestConfiguration} from './messageRuleItemRequestBuilderDeleteRequestConfiguration';
-import {MessageRuleItemRequestBuilderGetRequestConfiguration} from './messageRuleItemRequestBuilderGetRequestConfiguration';
-import {MessageRuleItemRequestBuilderPatchRequestConfiguration} from './messageRuleItemRequestBuilderPatchRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createMessageRuleFromDiscriminatorValue, deserializeIntoMessageRule, serializeMessageRule, type MessageRule } from '../../../../../../../../models/messageRule';
+import { type ODataError } from '../../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface MessageRuleItemRequestBuilderDeleteRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface MessageRuleItemRequestBuilderGetQueryParameters {
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface MessageRuleItemRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: MessageRuleItemRequestBuilderGetQueryParameters;
+}
+export interface MessageRuleItemRequestBuilderPatchRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messageRules/{messageRule-id}
  */
@@ -30,7 +68,11 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toDeleteRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * Get the properties and relationships of a messageRule object.
@@ -42,7 +84,11 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MessageRule>(requestInfo, createMessageRuleFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MessageRule>(requestInfo, createMessageRuleFromDiscriminatorValue, errorMapping);
     };
     /**
      * Change writable properties on a messageRule object and save the changes.
@@ -55,7 +101,11 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MessageRule>(requestInfo, createMessageRuleFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MessageRule>(requestInfo, createMessageRuleFromDiscriminatorValue, errorMapping);
     };
     /**
      * Delete the specified messageRule object.
@@ -111,4 +161,15 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessageRule);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a MessageRuleItemRequestBuilder
+     */
+    public withUrl(rawUrl: string) : MessageRuleItemRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new MessageRuleItemRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderDeleteRequestConfiguration.ts
deleted file mode 100644
index 2f71af4a3..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderDeleteRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageRuleItemRequestBuilderDeleteRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 0b497838d..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-export interface MessageRuleItemRequestBuilderGetQueryParameters {
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index bd5c6d537..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {MessageRuleItemRequestBuilderGetQueryParameters} from './messageRuleItemRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageRuleItemRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: MessageRuleItemRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderPatchRequestConfiguration.ts
deleted file mode 100644
index fb4e6f881..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/messageRuleItemRequestBuilderPatchRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageRuleItemRequestBuilderPatchRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilder.ts
index bc81be598..8a304656c 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilder.ts
@@ -1,16 +1,65 @@
-import {MessageRuleCollectionResponse} from '../../../../../../../models/';
-import {createMessageRuleCollectionResponseFromDiscriminatorValue} from '../../../../../../../models/createMessageRuleCollectionResponseFromDiscriminatorValue';
-import {createMessageRuleFromDiscriminatorValue} from '../../../../../../../models/createMessageRuleFromDiscriminatorValue';
-import {deserializeIntoMessageRule} from '../../../../../../../models/deserializeIntoMessageRule';
-import type {MessageRule} from '../../../../../../../models/messageRule';
-import {serializeMessageRule} from '../../../../../../../models/serializeMessageRule';
-import {CountRequestBuilder} from './count/countRequestBuilder';
-import {MessageRuleItemRequestBuilder} from './item/messageRuleItemRequestBuilder';
-import {MessageRulesRequestBuilderGetRequestConfiguration} from './messageRulesRequestBuilderGetRequestConfiguration';
-import {MessageRulesRequestBuilderPostRequestConfiguration} from './messageRulesRequestBuilderPostRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type MessageRuleCollectionResponse } from '../../../../../../../models/';
+import { createMessageRuleFromDiscriminatorValue, deserializeIntoMessageRule, serializeMessageRule, type MessageRule } from '../../../../../../../models/messageRule';
+import { createMessageRuleCollectionResponseFromDiscriminatorValue } from '../../../../../../../models/messageRuleCollectionResponse';
+import { type ODataError } from '../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../models/oDataErrors/oDataError';
+import { CountRequestBuilder } from './count/countRequestBuilder';
+import { MessageRuleItemRequestBuilder } from './item/messageRuleItemRequestBuilder';
+import { BaseRequestBuilder, getPathParameters, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface MessageRulesRequestBuilderGetQueryParameters {
+    /**
+     * Include count of items
+     */
+    count?: boolean;
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Order items by property values
+     */
+    orderby?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+    /**
+     * Skip the first n items
+     */
+    skip?: number;
+    /**
+     * Show only the first n items
+     */
+    top?: number;
+}
+export interface MessageRulesRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: MessageRulesRequestBuilderGetQueryParameters;
+}
+export interface MessageRulesRequestBuilderPostRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messageRules
  */
@@ -50,10 +99,14 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MessageRuleCollectionResponse>(requestInfo, createMessageRuleCollectionResponseFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MessageRuleCollectionResponse>(requestInfo, createMessageRuleCollectionResponseFromDiscriminatorValue, errorMapping);
     };
     /**
-     * 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.
+     * 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
@@ -63,7 +116,11 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MessageRule>(requestInfo, createMessageRuleFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MessageRule>(requestInfo, createMessageRuleFromDiscriminatorValue, errorMapping);
     };
     /**
      * Get all the messageRule objects defined for the user's inbox.
@@ -84,7 +141,7 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
         return requestInfo;
     };
     /**
-     * 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.
+     * 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
@@ -103,4 +160,15 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessageRule);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a messageRulesRequestBuilder
+     */
+    public withUrl(rawUrl: string) : MessageRulesRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new MessageRulesRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 43567ba09..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-
-export interface MessageRulesRequestBuilderGetQueryParameters {
-    /**
-     * Include count of items
-     */
-    count?: boolean | undefined;
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Order items by property values
-     */
-    orderby?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-    /**
-     * Skip the first n items
-     */
-    skip?: number | undefined;
-    /**
-     * Show only the first n items
-     */
-    top?: number | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 3f039e72b..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {MessageRulesRequestBuilderGetQueryParameters} from './messageRulesRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageRulesRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: MessageRulesRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderPostRequestConfiguration.ts
deleted file mode 100644
index 1c42756e9..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/messageRulesRequestBuilderPostRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageRulesRequestBuilderPostRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilder.ts
index 474126b38..5259ba664 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilder.ts
@@ -1,7 +1,34 @@
-import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface CountRequestBuilderGetQueryParameters {
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Search items by search phrases
+     */
+    search?: string;
+}
+export interface CountRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: CountRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/$count
  */
@@ -23,7 +50,11 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", errorMapping);
     };
     /**
      * Get the number of the resource
@@ -43,4 +74,15 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a CountRequestBuilder
+     */
+    public withUrl(rawUrl: string) : CountRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new CountRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 688fe5ed3..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-
-export interface CountRequestBuilderGetQueryParameters {
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Search items by search phrases
-     */
-    search?: string | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 8aee05dfa..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface CountRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: CountRequestBuilderGetQueryParameters | undefined;
-}
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 133257ca9..6f4dcefa9 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
@@ -1,2 +1 @@
-export * from './countRequestBuilderGetQueryParameters'
-export * from './countRequestBuilderGetRequestConfiguration'
+export * from './countRequestBuilder'
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 fe2edc27e..9f6fd0b31 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
@@ -1,3 +1 @@
-export * from './messagesRequestBuilderGetQueryParameters'
-export * from './messagesRequestBuilderGetRequestConfiguration'
-export * from './messagesRequestBuilderPostRequestConfiguration'
+export * from './messagesRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts
index 7107531c8..5da1a4e08 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts
@@ -1,16 +1,61 @@
-import {AttachmentCollectionResponse} from '../../../../../../../../../models/';
-import type {Attachment} from '../../../../../../../../../models/attachment';
-import {createAttachmentCollectionResponseFromDiscriminatorValue} from '../../../../../../../../../models/createAttachmentCollectionResponseFromDiscriminatorValue';
-import {createAttachmentFromDiscriminatorValue} from '../../../../../../../../../models/createAttachmentFromDiscriminatorValue';
-import {deserializeIntoAttachment} from '../../../../../../../../../models/deserializeIntoAttachment';
-import {serializeAttachment} from '../../../../../../../../../models/serializeAttachment';
-import {AttachmentsRequestBuilderGetRequestConfiguration} from './attachmentsRequestBuilderGetRequestConfiguration';
-import {AttachmentsRequestBuilderPostRequestConfiguration} from './attachmentsRequestBuilderPostRequestConfiguration';
-import {CountRequestBuilder} from './count/countRequestBuilder';
-import {AttachmentItemRequestBuilder} from './item/attachmentItemRequestBuilder';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type AttachmentCollectionResponse } from '../../../../../../../../../models/';
+import { createAttachmentFromDiscriminatorValue, deserializeIntoAttachment, serializeAttachment, type Attachment } from '../../../../../../../../../models/attachment';
+import { createAttachmentCollectionResponseFromDiscriminatorValue } from '../../../../../../../../../models/attachmentCollectionResponse';
+import { type ODataError } from '../../../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../../../models/oDataErrors/oDataError';
+import { CountRequestBuilder } from './count/countRequestBuilder';
+import { AttachmentItemRequestBuilder } from './item/attachmentItemRequestBuilder';
+import { BaseRequestBuilder, getPathParameters, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface AttachmentsRequestBuilderGetQueryParameters {
+    /**
+     * Include count of items
+     */
+    count?: boolean;
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Order items by property values
+     */
+    orderby?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface AttachmentsRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: AttachmentsRequestBuilderGetQueryParameters;
+}
+export interface AttachmentsRequestBuilderPostRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/attachments
  */
@@ -41,19 +86,23 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
         super(pathParameters, requestAdapter, "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/childFolders/{mailFolder%2Did1}/messages/{message%2Did}/attachments{?%24filter,%24count,%24orderby,%24select,%24expand}");
     };
     /**
-     * Retrieve a list of attachment objects.
+     * 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
-     * @see {@link https://learn.microsoft.com/graph/api/eventmessage-list-attachments?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/message-list-attachments?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: AttachmentsRequestBuilderGetRequestConfiguration | undefined) : Promise<AttachmentCollectionResponse | undefined> {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<AttachmentCollectionResponse>(requestInfo, createAttachmentCollectionResponseFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<AttachmentCollectionResponse>(requestInfo, createAttachmentCollectionResponseFromDiscriminatorValue, errorMapping);
     };
     /**
-     * Use this API to add an attachment to a message.  An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource.  You can add an attachment to an existing message by posting to its attachments collection, or you can add an attachment to a message that is being created and sent on the fly. This operation limits the size of the attachment you can add to under 3 MB.
+     * Use this API to add an attachment to a message. An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource. You can add an attachment to an existing message by posting to its attachments collection, or you canadd an attachment to a message that is being created and sent on the fly. This operation limits the size of the attachment you can add to under 3 MB.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of Attachment
@@ -63,10 +112,14 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Attachment>(requestInfo, createAttachmentFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Attachment>(requestInfo, createAttachmentFromDiscriminatorValue, errorMapping);
     };
     /**
-     * Retrieve a list of attachment objects.
+     * 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
      */
@@ -84,7 +137,7 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
         return requestInfo;
     };
     /**
-     * Use this API to add an attachment to a message.  An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource.  You can add an attachment to an existing message by posting to its attachments collection, or you can add an attachment to a message that is being created and sent on the fly. This operation limits the size of the attachment you can add to under 3 MB.
+     * Use this API to add an attachment to a message. An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource. You can add an attachment to an existing message by posting to its attachments collection, or you canadd an attachment to a message that is being created and sent on the fly. This operation limits the size of the attachment you can add to under 3 MB.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
@@ -103,4 +156,15 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeAttachment);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a attachmentsRequestBuilder
+     */
+    public withUrl(rawUrl: string) : AttachmentsRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new AttachmentsRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 02ebb50b4..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-
-export interface AttachmentsRequestBuilderGetQueryParameters {
-    /**
-     * Include count of items
-     */
-    count?: boolean | undefined;
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Order items by property values
-     */
-    orderby?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index e486e1cfb..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {AttachmentsRequestBuilderGetQueryParameters} from './attachmentsRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface AttachmentsRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: AttachmentsRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
deleted file mode 100644
index 404d93fc7..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface AttachmentsRequestBuilderPostRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilder.ts
index db54c4090..8ef307dab 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilder.ts
@@ -1,7 +1,30 @@
-import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface CountRequestBuilderGetQueryParameters {
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+}
+export interface CountRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: CountRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/attachments/$count
  */
@@ -23,7 +46,11 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", errorMapping);
     };
     /**
      * Get the number of the resource
@@ -43,4 +70,15 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a CountRequestBuilder
+     */
+    public withUrl(rawUrl: string) : CountRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new CountRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 331c0c0a1..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-export interface CountRequestBuilderGetQueryParameters {
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 8aee05dfa..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface CountRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: CountRequestBuilderGetQueryParameters | undefined;
-}
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 133257ca9..6f4dcefa9 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
@@ -1,2 +1 @@
-export * from './countRequestBuilderGetQueryParameters'
-export * from './countRequestBuilderGetRequestConfiguration'
+export * from './countRequestBuilder'
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 c14905fcc..6cc033f08 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
@@ -1,3 +1 @@
-export * from './attachmentsRequestBuilderGetQueryParameters'
-export * from './attachmentsRequestBuilderGetRequestConfiguration'
-export * from './attachmentsRequestBuilderPostRequestConfiguration'
+export * from './attachmentsRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
index bb2049869..a578159cd 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
@@ -1,10 +1,46 @@
-import {Attachment} from '../../../../../../../../../../models/';
-import {createAttachmentFromDiscriminatorValue} from '../../../../../../../../../../models/createAttachmentFromDiscriminatorValue';
-import {AttachmentItemRequestBuilderDeleteRequestConfiguration} from './attachmentItemRequestBuilderDeleteRequestConfiguration';
-import {AttachmentItemRequestBuilderGetRequestConfiguration} from './attachmentItemRequestBuilderGetRequestConfiguration';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type Attachment } from '../../../../../../../../../../models/';
+import { createAttachmentFromDiscriminatorValue } from '../../../../../../../../../../models/attachment';
+import { type ODataError } from '../../../../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface AttachmentItemRequestBuilderDeleteRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface AttachmentItemRequestBuilderGetQueryParameters {
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface AttachmentItemRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: AttachmentItemRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/attachments/{attachment-id}
  */
@@ -26,10 +62,14 @@ export class AttachmentItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toDeleteRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
-     * 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. 
+     * 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
      * @see {@link https://learn.microsoft.com/graph/api/attachment-get?view=graph-rest-1.0|Find more info here}
@@ -38,7 +78,11 @@ export class AttachmentItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Attachment>(requestInfo, createAttachmentFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Attachment>(requestInfo, createAttachmentFromDiscriminatorValue, errorMapping);
     };
     /**
      * Delete navigation property attachments for users
@@ -57,7 +101,7 @@ export class AttachmentItemRequestBuilder extends BaseRequestBuilder {
         return requestInfo;
     };
     /**
-     * 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. 
+     * 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
      */
@@ -74,4 +118,15 @@ export class AttachmentItemRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a AttachmentItemRequestBuilder
+     */
+    public withUrl(rawUrl: string) : AttachmentItemRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new AttachmentItemRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
deleted file mode 100644
index 3538f5b72..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface AttachmentItemRequestBuilderDeleteRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index f9c981ee8..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-
-export interface AttachmentItemRequestBuilderGetQueryParameters {
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index a62b74418..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {AttachmentItemRequestBuilderGetQueryParameters} from './attachmentItemRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface AttachmentItemRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: AttachmentItemRequestBuilderGetQueryParameters | undefined;
-}
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 486719c1b..614075b7e 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
@@ -1,3 +1 @@
-export * from './attachmentItemRequestBuilderDeleteRequestConfiguration'
-export * from './attachmentItemRequestBuilderGetQueryParameters'
-export * from './attachmentItemRequestBuilderGetRequestConfiguration'
+export * from './attachmentItemRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilder.ts
index c2746ae4c..4b952df84 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilder.ts
@@ -1,7 +1,30 @@
-import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface CountRequestBuilderGetQueryParameters {
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+}
+export interface CountRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: CountRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/extensions/$count
  */
@@ -23,7 +46,11 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", errorMapping);
     };
     /**
      * Get the number of the resource
@@ -43,4 +70,15 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a CountRequestBuilder
+     */
+    public withUrl(rawUrl: string) : CountRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new CountRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 331c0c0a1..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-export interface CountRequestBuilderGetQueryParameters {
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 8aee05dfa..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface CountRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: CountRequestBuilderGetQueryParameters | undefined;
-}
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 133257ca9..6f4dcefa9 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
@@ -1,2 +1 @@
-export * from './countRequestBuilderGetQueryParameters'
-export * from './countRequestBuilderGetRequestConfiguration'
+export * from './countRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilder.ts
index f6c7aa204..66c25a333 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilder.ts
@@ -1,16 +1,69 @@
-import {ExtensionCollectionResponse} from '../../../../../../../../../models/';
-import {createExtensionCollectionResponseFromDiscriminatorValue} from '../../../../../../../../../models/createExtensionCollectionResponseFromDiscriminatorValue';
-import {createExtensionFromDiscriminatorValue} from '../../../../../../../../../models/createExtensionFromDiscriminatorValue';
-import {deserializeIntoExtension} from '../../../../../../../../../models/deserializeIntoExtension';
-import type {Extension} from '../../../../../../../../../models/extension';
-import {serializeExtension} from '../../../../../../../../../models/serializeExtension';
-import {CountRequestBuilder} from './count/countRequestBuilder';
-import {ExtensionsRequestBuilderGetRequestConfiguration} from './extensionsRequestBuilderGetRequestConfiguration';
-import {ExtensionsRequestBuilderPostRequestConfiguration} from './extensionsRequestBuilderPostRequestConfiguration';
-import {ExtensionItemRequestBuilder} from './item/extensionItemRequestBuilder';
-import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ExtensionCollectionResponse } from '../../../../../../../../../models/';
+import { createExtensionFromDiscriminatorValue, deserializeIntoExtension, serializeExtension, type Extension } from '../../../../../../../../../models/extension';
+import { createExtensionCollectionResponseFromDiscriminatorValue } from '../../../../../../../../../models/extensionCollectionResponse';
+import { type ODataError } from '../../../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../../../models/oDataErrors/oDataError';
+import { CountRequestBuilder } from './count/countRequestBuilder';
+import { ExtensionItemRequestBuilder } from './item/extensionItemRequestBuilder';
+import { BaseRequestBuilder, getPathParameters, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface ExtensionsRequestBuilderGetQueryParameters {
+    /**
+     * Include count of items
+     */
+    count?: boolean;
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Order items by property values
+     */
+    orderby?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+    /**
+     * Skip the first n items
+     */
+    skip?: number;
+    /**
+     * Show only the first n items
+     */
+    top?: number;
+}
+export interface ExtensionsRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: ExtensionsRequestBuilderGetQueryParameters;
+}
+export interface ExtensionsRequestBuilderPostRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/extensions
  */
@@ -49,7 +102,11 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<ExtensionCollectionResponse>(requestInfo, createExtensionCollectionResponseFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<ExtensionCollectionResponse>(requestInfo, createExtensionCollectionResponseFromDiscriminatorValue, errorMapping);
     };
     /**
      * 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.
@@ -62,7 +119,11 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, errorMapping);
     };
     /**
      * 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.
@@ -102,4 +163,15 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeExtension);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a extensionsRequestBuilder
+     */
+    public withUrl(rawUrl: string) : ExtensionsRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new ExtensionsRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 7f67bf8f0..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-
-export interface ExtensionsRequestBuilderGetQueryParameters {
-    /**
-     * Include count of items
-     */
-    count?: boolean | undefined;
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Order items by property values
-     */
-    orderby?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-    /**
-     * Skip the first n items
-     */
-    skip?: number | undefined;
-    /**
-     * Show only the first n items
-     */
-    top?: number | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 296d2e099..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {ExtensionsRequestBuilderGetQueryParameters} from './extensionsRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ExtensionsRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: ExtensionsRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
deleted file mode 100644
index 2d639a33d..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ExtensionsRequestBuilderPostRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
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 d8e83434e..8ddb1ac86 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
@@ -1,3 +1 @@
-export * from './extensionsRequestBuilderGetQueryParameters'
-export * from './extensionsRequestBuilderGetRequestConfiguration'
-export * from './extensionsRequestBuilderPostRequestConfiguration'
+export * from './extensionsRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
index 7ace12f79..3b48954ea 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
@@ -1,13 +1,55 @@
-import {createExtensionFromDiscriminatorValue} from '../../../../../../../../../../models/createExtensionFromDiscriminatorValue';
-import {deserializeIntoExtension} from '../../../../../../../../../../models/deserializeIntoExtension';
-import type {Extension} from '../../../../../../../../../../models/extension';
-import {serializeExtension} from '../../../../../../../../../../models/serializeExtension';
-import {ExtensionItemRequestBuilderDeleteRequestConfiguration} from './extensionItemRequestBuilderDeleteRequestConfiguration';
-import {ExtensionItemRequestBuilderGetRequestConfiguration} from './extensionItemRequestBuilderGetRequestConfiguration';
-import {ExtensionItemRequestBuilderPatchRequestConfiguration} from './extensionItemRequestBuilderPatchRequestConfiguration';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createExtensionFromDiscriminatorValue, deserializeIntoExtension, serializeExtension, type Extension } from '../../../../../../../../../../models/extension';
+import { type ODataError } from '../../../../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface ExtensionItemRequestBuilderDeleteRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface ExtensionItemRequestBuilderGetQueryParameters {
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface ExtensionItemRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: ExtensionItemRequestBuilderGetQueryParameters;
+}
+export interface ExtensionItemRequestBuilderPatchRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/extensions/{extension-id}
  */
@@ -30,7 +72,11 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toDeleteRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * 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.
@@ -42,7 +88,11 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, errorMapping);
     };
     /**
      * Update the navigation property extensions in users
@@ -54,7 +104,11 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, errorMapping);
     };
     /**
      * 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.
@@ -110,4 +164,15 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeExtension);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a ExtensionItemRequestBuilder
+     */
+    public withUrl(rawUrl: string) : ExtensionItemRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new ExtensionItemRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
deleted file mode 100644
index dab7a050d..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ExtensionItemRequestBuilderDeleteRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 2d0516689..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-
-export interface ExtensionItemRequestBuilderGetQueryParameters {
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 9929a4faf..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {ExtensionItemRequestBuilderGetQueryParameters} from './extensionItemRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ExtensionItemRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: ExtensionItemRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
deleted file mode 100644
index c46dbb966..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ExtensionItemRequestBuilderPatchRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
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 73c01dfdc..0e1147d8c 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
@@ -1,4 +1 @@
-export * from './extensionItemRequestBuilderDeleteRequestConfiguration'
-export * from './extensionItemRequestBuilderGetQueryParameters'
-export * from './extensionItemRequestBuilderGetRequestConfiguration'
-export * from './extensionItemRequestBuilderPatchRequestConfiguration'
+export * from './extensionItemRequestBuilder'
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 65b74019e..9b0117e0f 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
@@ -1,4 +1 @@
-export * from './messageItemRequestBuilderDeleteRequestConfiguration'
-export * from './messageItemRequestBuilderGetQueryParameters'
-export * from './messageItemRequestBuilderGetRequestConfiguration'
-export * from './messageItemRequestBuilderPatchRequestConfiguration'
+export * from './messageItemRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilder.ts
index 508de9720..94514ee7c 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilder.ts
@@ -1,16 +1,58 @@
-import {createMessageFromDiscriminatorValue} from '../../../../../../../../models/createMessageFromDiscriminatorValue';
-import {deserializeIntoMessage} from '../../../../../../../../models/deserializeIntoMessage';
-import type {Message} from '../../../../../../../../models/message';
-import {serializeMessage} from '../../../../../../../../models/serializeMessage';
-import {AttachmentsRequestBuilder} from './attachments/attachmentsRequestBuilder';
-import {ExtensionsRequestBuilder} from './extensions/extensionsRequestBuilder';
-import {MessageItemRequestBuilderDeleteRequestConfiguration} from './messageItemRequestBuilderDeleteRequestConfiguration';
-import {MessageItemRequestBuilderGetRequestConfiguration} from './messageItemRequestBuilderGetRequestConfiguration';
-import {MessageItemRequestBuilderPatchRequestConfiguration} from './messageItemRequestBuilderPatchRequestConfiguration';
-import {ContentRequestBuilder} from './value/contentRequestBuilder';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createMessageFromDiscriminatorValue, deserializeIntoMessage, serializeMessage, type Message } from '../../../../../../../../models/message';
+import { type ODataError } from '../../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../../models/oDataErrors/oDataError';
+import { AttachmentsRequestBuilder } from './attachments/attachmentsRequestBuilder';
+import { ExtensionsRequestBuilder } from './extensions/extensionsRequestBuilder';
+import { ContentRequestBuilder } from './value/contentRequestBuilder';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface MessageItemRequestBuilderDeleteRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface MessageItemRequestBuilderGetQueryParameters {
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface MessageItemRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: MessageItemRequestBuilderGetQueryParameters;
+}
+export interface MessageItemRequestBuilderPatchRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}
  */
@@ -50,7 +92,11 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toDeleteRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * The collection of messages in the mailFolder.
@@ -61,7 +107,11 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, errorMapping);
     };
     /**
      * Update the navigation property messages in users
@@ -73,7 +123,11 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, errorMapping);
     };
     /**
      * Delete navigation property messages for users
@@ -129,4 +183,15 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessage);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a MessageItemRequestBuilder
+     */
+    public withUrl(rawUrl: string) : MessageItemRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new MessageItemRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
deleted file mode 100644
index 502dc2f91..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageItemRequestBuilderDeleteRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 45277f80a..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-
-export interface MessageItemRequestBuilderGetQueryParameters {
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index a659064b4..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {MessageItemRequestBuilderGetQueryParameters} from './messageItemRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageItemRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: MessageItemRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
deleted file mode 100644
index 00baca8f7..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageItemRequestBuilderPatchRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilder.ts
index c4325ea67..ceb592467 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilder.ts
@@ -1,8 +1,30 @@
-import {ContentRequestBuilderGetRequestConfiguration} from './contentRequestBuilderGetRequestConfiguration';
-import {ContentRequestBuilderPutRequestConfiguration} from './contentRequestBuilderPutRequestConfiguration';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface ContentRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface ContentRequestBuilderPutRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/$value
  */
@@ -25,7 +47,11 @@ export class ContentRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * Update media content for the navigation property messages in users
@@ -37,7 +63,11 @@ export class ContentRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPutRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * Get media content for the navigation property messages from users
@@ -74,4 +104,15 @@ export class ContentRequestBuilder extends BaseRequestBuilder {
         requestInfo.setStreamContent(body);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a ContentRequestBuilder
+     */
+    public withUrl(rawUrl: string) : ContentRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new ContentRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 10e67530a..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ContentRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
deleted file mode 100644
index 8a61d2a6d..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ContentRequestBuilderPutRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
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 260bf1e9a..28c86e75e 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
@@ -1,2 +1 @@
-export * from './contentRequestBuilderGetRequestConfiguration'
-export * from './contentRequestBuilderPutRequestConfiguration'
+export * from './contentRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilder.ts
index e160f872c..535002bfd 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilder.ts
@@ -1,16 +1,73 @@
-import {MessageCollectionResponse} from '../../../../../../../models/';
-import {createMessageCollectionResponseFromDiscriminatorValue} from '../../../../../../../models/createMessageCollectionResponseFromDiscriminatorValue';
-import {createMessageFromDiscriminatorValue} from '../../../../../../../models/createMessageFromDiscriminatorValue';
-import {deserializeIntoMessage} from '../../../../../../../models/deserializeIntoMessage';
-import type {Message} from '../../../../../../../models/message';
-import {serializeMessage} from '../../../../../../../models/serializeMessage';
-import {CountRequestBuilder} from './count/countRequestBuilder';
-import {MessageItemRequestBuilder} from './item/messageItemRequestBuilder';
-import {MessagesRequestBuilderGetRequestConfiguration} from './messagesRequestBuilderGetRequestConfiguration';
-import {MessagesRequestBuilderPostRequestConfiguration} from './messagesRequestBuilderPostRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type MessageCollectionResponse } from '../../../../../../../models/';
+import { createMessageFromDiscriminatorValue, deserializeIntoMessage, serializeMessage, type Message } from '../../../../../../../models/message';
+import { createMessageCollectionResponseFromDiscriminatorValue } from '../../../../../../../models/messageCollectionResponse';
+import { type ODataError } from '../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../models/oDataErrors/oDataError';
+import { CountRequestBuilder } from './count/countRequestBuilder';
+import { MessageItemRequestBuilder } from './item/messageItemRequestBuilder';
+import { BaseRequestBuilder, getPathParameters, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface MessagesRequestBuilderGetQueryParameters {
+    /**
+     * Include count of items
+     */
+    count?: boolean;
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Order items by property values
+     */
+    orderby?: string[];
+    /**
+     * Search items by search phrases
+     */
+    search?: string;
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+    /**
+     * Skip the first n items
+     */
+    skip?: number;
+    /**
+     * Show only the first n items
+     */
+    top?: number;
+}
+export interface MessagesRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: MessagesRequestBuilderGetQueryParameters;
+}
+export interface MessagesRequestBuilderPostRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages
  */
@@ -50,7 +107,11 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MessageCollectionResponse>(requestInfo, createMessageCollectionResponseFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MessageCollectionResponse>(requestInfo, createMessageCollectionResponseFromDiscriminatorValue, errorMapping);
     };
     /**
      * Use this API to create a new Message in a mailfolder.
@@ -63,7 +124,11 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, errorMapping);
     };
     /**
      * Get all the messages in the specified user's mailbox, or those messages in a specified folder in the mailbox.
@@ -103,4 +168,15 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessage);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a messagesRequestBuilder
+     */
+    public withUrl(rawUrl: string) : MessagesRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new MessagesRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 7818dee1a..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-
-export interface MessagesRequestBuilderGetQueryParameters {
-    /**
-     * Include count of items
-     */
-    count?: boolean | undefined;
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Order items by property values
-     */
-    orderby?: string[] | undefined;
-    /**
-     * Search items by search phrases
-     */
-    search?: string | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-    /**
-     * Skip the first n items
-     */
-    skip?: number | undefined;
-    /**
-     * Show only the first n items
-     */
-    top?: number | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 73034f00f..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {MessagesRequestBuilderGetQueryParameters} from './messagesRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessagesRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: MessagesRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
deleted file mode 100644
index a6d72f7d2..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessagesRequestBuilderPostRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/index.ts
index e24abb129..a5dc31207 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/index.ts
@@ -1,4 +1 @@
-export * from './mailFolderItemRequestBuilderDeleteRequestConfiguration'
-export * from './mailFolderItemRequestBuilderGetQueryParameters'
-export * from './mailFolderItemRequestBuilderGetRequestConfiguration'
-export * from './mailFolderItemRequestBuilderPatchRequestConfiguration'
+export * from './mailFolderItemRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilder.ts
index 36e6e80a1..30e861970 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilder.ts
@@ -1,16 +1,62 @@
-import {createMailFolderFromDiscriminatorValue} from '../../../../models/createMailFolderFromDiscriminatorValue';
-import {deserializeIntoMailFolder} from '../../../../models/deserializeIntoMailFolder';
-import type {MailFolder} from '../../../../models/mailFolder';
-import {serializeMailFolder} from '../../../../models/serializeMailFolder';
-import {ChildFoldersRequestBuilder} from './childFolders/childFoldersRequestBuilder';
-import {MailFolderItemRequestBuilderDeleteRequestConfiguration} from './mailFolderItemRequestBuilderDeleteRequestConfiguration';
-import {MailFolderItemRequestBuilderGetRequestConfiguration} from './mailFolderItemRequestBuilderGetRequestConfiguration';
-import {MailFolderItemRequestBuilderPatchRequestConfiguration} from './mailFolderItemRequestBuilderPatchRequestConfiguration';
-import {MessageRulesRequestBuilder} from './messageRules/messageRulesRequestBuilder';
-import {MessagesRequestBuilder} from './messages/messagesRequestBuilder';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createMailFolderFromDiscriminatorValue, deserializeIntoMailFolder, serializeMailFolder, type MailFolder } from '../../../../models/mailFolder';
+import { type ODataError } from '../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../models/oDataErrors/oDataError';
+import { ChildFoldersRequestBuilder } from './childFolders/childFoldersRequestBuilder';
+import { MessageRulesRequestBuilder } from './messageRules/messageRulesRequestBuilder';
+import { MessagesRequestBuilder } from './messages/messagesRequestBuilder';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface MailFolderItemRequestBuilderDeleteRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface MailFolderItemRequestBuilderGetQueryParameters {
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Include Hidden Folders
+     */
+    includeHiddenFolders?: string;
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface MailFolderItemRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: MailFolderItemRequestBuilderGetQueryParameters;
+}
+export interface MailFolderItemRequestBuilderPatchRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}
  */
@@ -51,7 +97,11 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toDeleteRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * The user's mail folders. Read-only. Nullable.
@@ -63,7 +113,11 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MailFolder>(requestInfo, createMailFolderFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MailFolder>(requestInfo, createMailFolderFromDiscriminatorValue, errorMapping);
     };
     /**
      * Update the writable properties of a mailSearchFolder object.
@@ -76,7 +130,11 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MailFolder>(requestInfo, createMailFolderFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MailFolder>(requestInfo, createMailFolderFromDiscriminatorValue, errorMapping);
     };
     /**
      * 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.
@@ -132,4 +190,15 @@ export class MailFolderItemRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMailFolder);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a MailFolderItemRequestBuilder
+     */
+    public withUrl(rawUrl: string) : MailFolderItemRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new MailFolderItemRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderDeleteRequestConfiguration.ts
deleted file mode 100644
index db075adce..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderDeleteRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MailFolderItemRequestBuilderDeleteRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 4c303a776..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-
-export interface MailFolderItemRequestBuilderGetQueryParameters {
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Include Hidden Folders
-     */
-    includeHiddenFolders?: string | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 2bad54a29..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {MailFolderItemRequestBuilderGetQueryParameters} from './mailFolderItemRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MailFolderItemRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: MailFolderItemRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderPatchRequestConfiguration.ts
deleted file mode 100644
index fe2821123..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/mailFolderItemRequestBuilderPatchRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MailFolderItemRequestBuilderPatchRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilder.ts
index e9d4b7dce..54256842b 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilder.ts
@@ -1,7 +1,30 @@
-import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface CountRequestBuilderGetQueryParameters {
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+}
+export interface CountRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: CountRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules/$count
  */
@@ -23,7 +46,11 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", errorMapping);
     };
     /**
      * Get the number of the resource
@@ -43,4 +70,15 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a CountRequestBuilder
+     */
+    public withUrl(rawUrl: string) : CountRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new CountRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 331c0c0a1..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-export interface CountRequestBuilderGetQueryParameters {
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 8aee05dfa..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/countRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface CountRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: CountRequestBuilderGetQueryParameters | undefined;
-}
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 133257ca9..6f4dcefa9 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
@@ -1,2 +1 @@
-export * from './countRequestBuilderGetQueryParameters'
-export * from './countRequestBuilderGetRequestConfiguration'
+export * from './countRequestBuilder'
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 541faa337..38ab8d47a 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/index.ts
@@ -1,3 +1 @@
-export * from './messageRulesRequestBuilderGetQueryParameters'
-export * from './messageRulesRequestBuilderGetRequestConfiguration'
-export * from './messageRulesRequestBuilderPostRequestConfiguration'
+export * from './messageRulesRequestBuilder'
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 93cda05e6..53274d05a 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
@@ -1,4 +1 @@
-export * from './messageRuleItemRequestBuilderDeleteRequestConfiguration'
-export * from './messageRuleItemRequestBuilderGetQueryParameters'
-export * from './messageRuleItemRequestBuilderGetRequestConfiguration'
-export * from './messageRuleItemRequestBuilderPatchRequestConfiguration'
+export * from './messageRuleItemRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilder.ts
index f2a5f28e3..2c6d42970 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilder.ts
@@ -1,13 +1,51 @@
-import {createMessageRuleFromDiscriminatorValue} from '../../../../../../models/createMessageRuleFromDiscriminatorValue';
-import {deserializeIntoMessageRule} from '../../../../../../models/deserializeIntoMessageRule';
-import type {MessageRule} from '../../../../../../models/messageRule';
-import {serializeMessageRule} from '../../../../../../models/serializeMessageRule';
-import {MessageRuleItemRequestBuilderDeleteRequestConfiguration} from './messageRuleItemRequestBuilderDeleteRequestConfiguration';
-import {MessageRuleItemRequestBuilderGetRequestConfiguration} from './messageRuleItemRequestBuilderGetRequestConfiguration';
-import {MessageRuleItemRequestBuilderPatchRequestConfiguration} from './messageRuleItemRequestBuilderPatchRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createMessageRuleFromDiscriminatorValue, deserializeIntoMessageRule, serializeMessageRule, type MessageRule } from '../../../../../../models/messageRule';
+import { type ODataError } from '../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface MessageRuleItemRequestBuilderDeleteRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface MessageRuleItemRequestBuilderGetQueryParameters {
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface MessageRuleItemRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: MessageRuleItemRequestBuilderGetQueryParameters;
+}
+export interface MessageRuleItemRequestBuilderPatchRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules/{messageRule-id}
  */
@@ -30,7 +68,11 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toDeleteRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * Get the properties and relationships of a messageRule object.
@@ -42,7 +84,11 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MessageRule>(requestInfo, createMessageRuleFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MessageRule>(requestInfo, createMessageRuleFromDiscriminatorValue, errorMapping);
     };
     /**
      * Change writable properties on a messageRule object and save the changes.
@@ -55,7 +101,11 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MessageRule>(requestInfo, createMessageRuleFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MessageRule>(requestInfo, createMessageRuleFromDiscriminatorValue, errorMapping);
     };
     /**
      * Delete the specified messageRule object.
@@ -111,4 +161,15 @@ export class MessageRuleItemRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessageRule);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a MessageRuleItemRequestBuilder
+     */
+    public withUrl(rawUrl: string) : MessageRuleItemRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new MessageRuleItemRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderDeleteRequestConfiguration.ts
deleted file mode 100644
index 2f71af4a3..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderDeleteRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageRuleItemRequestBuilderDeleteRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 0b497838d..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-export interface MessageRuleItemRequestBuilderGetQueryParameters {
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index bd5c6d537..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {MessageRuleItemRequestBuilderGetQueryParameters} from './messageRuleItemRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageRuleItemRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: MessageRuleItemRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderPatchRequestConfiguration.ts
deleted file mode 100644
index fb4e6f881..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/messageRuleItemRequestBuilderPatchRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageRuleItemRequestBuilderPatchRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts
index b6290e218..086ef4e9c 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts
@@ -1,16 +1,65 @@
-import {MessageRuleCollectionResponse} from '../../../../../models/';
-import {createMessageRuleCollectionResponseFromDiscriminatorValue} from '../../../../../models/createMessageRuleCollectionResponseFromDiscriminatorValue';
-import {createMessageRuleFromDiscriminatorValue} from '../../../../../models/createMessageRuleFromDiscriminatorValue';
-import {deserializeIntoMessageRule} from '../../../../../models/deserializeIntoMessageRule';
-import type {MessageRule} from '../../../../../models/messageRule';
-import {serializeMessageRule} from '../../../../../models/serializeMessageRule';
-import {CountRequestBuilder} from './count/countRequestBuilder';
-import {MessageRuleItemRequestBuilder} from './item/messageRuleItemRequestBuilder';
-import {MessageRulesRequestBuilderGetRequestConfiguration} from './messageRulesRequestBuilderGetRequestConfiguration';
-import {MessageRulesRequestBuilderPostRequestConfiguration} from './messageRulesRequestBuilderPostRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type MessageRuleCollectionResponse } from '../../../../../models/';
+import { createMessageRuleFromDiscriminatorValue, deserializeIntoMessageRule, serializeMessageRule, type MessageRule } from '../../../../../models/messageRule';
+import { createMessageRuleCollectionResponseFromDiscriminatorValue } from '../../../../../models/messageRuleCollectionResponse';
+import { type ODataError } from '../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../models/oDataErrors/oDataError';
+import { CountRequestBuilder } from './count/countRequestBuilder';
+import { MessageRuleItemRequestBuilder } from './item/messageRuleItemRequestBuilder';
+import { BaseRequestBuilder, getPathParameters, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface MessageRulesRequestBuilderGetQueryParameters {
+    /**
+     * Include count of items
+     */
+    count?: boolean;
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Order items by property values
+     */
+    orderby?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+    /**
+     * Skip the first n items
+     */
+    skip?: number;
+    /**
+     * Show only the first n items
+     */
+    top?: number;
+}
+export interface MessageRulesRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: MessageRulesRequestBuilderGetQueryParameters;
+}
+export interface MessageRulesRequestBuilderPostRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules
  */
@@ -50,10 +99,14 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MessageRuleCollectionResponse>(requestInfo, createMessageRuleCollectionResponseFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MessageRuleCollectionResponse>(requestInfo, createMessageRuleCollectionResponseFromDiscriminatorValue, errorMapping);
     };
     /**
-     * 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.
+     * 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
@@ -63,7 +116,11 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MessageRule>(requestInfo, createMessageRuleFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MessageRule>(requestInfo, createMessageRuleFromDiscriminatorValue, errorMapping);
     };
     /**
      * Get all the messageRule objects defined for the user's inbox.
@@ -84,7 +141,7 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
         return requestInfo;
     };
     /**
-     * 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.
+     * 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
@@ -103,4 +160,15 @@ export class MessageRulesRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessageRule);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a messageRulesRequestBuilder
+     */
+    public withUrl(rawUrl: string) : MessageRulesRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new MessageRulesRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 43567ba09..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-
-export interface MessageRulesRequestBuilderGetQueryParameters {
-    /**
-     * Include count of items
-     */
-    count?: boolean | undefined;
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Order items by property values
-     */
-    orderby?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-    /**
-     * Skip the first n items
-     */
-    skip?: number | undefined;
-    /**
-     * Show only the first n items
-     */
-    top?: number | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 3f039e72b..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {MessageRulesRequestBuilderGetQueryParameters} from './messageRulesRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageRulesRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: MessageRulesRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderPostRequestConfiguration.ts
deleted file mode 100644
index 1c42756e9..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/messageRulesRequestBuilderPostRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageRulesRequestBuilderPostRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilder.ts
index a5cd680e3..ef5592f33 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilder.ts
@@ -1,7 +1,34 @@
-import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface CountRequestBuilderGetQueryParameters {
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Search items by search phrases
+     */
+    search?: string;
+}
+export interface CountRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: CountRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/$count
  */
@@ -23,7 +50,11 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", errorMapping);
     };
     /**
      * Get the number of the resource
@@ -43,4 +74,15 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a CountRequestBuilder
+     */
+    public withUrl(rawUrl: string) : CountRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new CountRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 688fe5ed3..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-
-export interface CountRequestBuilderGetQueryParameters {
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Search items by search phrases
-     */
-    search?: string | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 8aee05dfa..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface CountRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: CountRequestBuilderGetQueryParameters | undefined;
-}
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 133257ca9..6f4dcefa9 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
@@ -1,2 +1 @@
-export * from './countRequestBuilderGetQueryParameters'
-export * from './countRequestBuilderGetRequestConfiguration'
+export * from './countRequestBuilder'
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 fe2edc27e..9f6fd0b31 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/index.ts
@@ -1,3 +1 @@
-export * from './messagesRequestBuilderGetQueryParameters'
-export * from './messagesRequestBuilderGetRequestConfiguration'
-export * from './messagesRequestBuilderPostRequestConfiguration'
+export * from './messagesRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts
index 731350e55..2489030a1 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts
@@ -1,16 +1,61 @@
-import {AttachmentCollectionResponse} from '../../../../../../../models/';
-import type {Attachment} from '../../../../../../../models/attachment';
-import {createAttachmentCollectionResponseFromDiscriminatorValue} from '../../../../../../../models/createAttachmentCollectionResponseFromDiscriminatorValue';
-import {createAttachmentFromDiscriminatorValue} from '../../../../../../../models/createAttachmentFromDiscriminatorValue';
-import {deserializeIntoAttachment} from '../../../../../../../models/deserializeIntoAttachment';
-import {serializeAttachment} from '../../../../../../../models/serializeAttachment';
-import {AttachmentsRequestBuilderGetRequestConfiguration} from './attachmentsRequestBuilderGetRequestConfiguration';
-import {AttachmentsRequestBuilderPostRequestConfiguration} from './attachmentsRequestBuilderPostRequestConfiguration';
-import {CountRequestBuilder} from './count/countRequestBuilder';
-import {AttachmentItemRequestBuilder} from './item/attachmentItemRequestBuilder';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type AttachmentCollectionResponse } from '../../../../../../../models/';
+import { createAttachmentFromDiscriminatorValue, deserializeIntoAttachment, serializeAttachment, type Attachment } from '../../../../../../../models/attachment';
+import { createAttachmentCollectionResponseFromDiscriminatorValue } from '../../../../../../../models/attachmentCollectionResponse';
+import { type ODataError } from '../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../models/oDataErrors/oDataError';
+import { CountRequestBuilder } from './count/countRequestBuilder';
+import { AttachmentItemRequestBuilder } from './item/attachmentItemRequestBuilder';
+import { BaseRequestBuilder, getPathParameters, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface AttachmentsRequestBuilderGetQueryParameters {
+    /**
+     * Include count of items
+     */
+    count?: boolean;
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Order items by property values
+     */
+    orderby?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface AttachmentsRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: AttachmentsRequestBuilderGetQueryParameters;
+}
+export interface AttachmentsRequestBuilderPostRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments
  */
@@ -41,19 +86,23 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
         super(pathParameters, requestAdapter, "{+baseurl}/users/{user%2Did}/mailFolders/{mailFolder%2Did}/messages/{message%2Did}/attachments{?%24filter,%24count,%24orderby,%24select,%24expand}");
     };
     /**
-     * Retrieve a list of attachment objects.
+     * 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
-     * @see {@link https://learn.microsoft.com/graph/api/eventmessage-list-attachments?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/message-list-attachments?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: AttachmentsRequestBuilderGetRequestConfiguration | undefined) : Promise<AttachmentCollectionResponse | undefined> {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<AttachmentCollectionResponse>(requestInfo, createAttachmentCollectionResponseFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<AttachmentCollectionResponse>(requestInfo, createAttachmentCollectionResponseFromDiscriminatorValue, errorMapping);
     };
     /**
-     * Use this API to add an attachment to a message.  An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource.  You can add an attachment to an existing message by posting to its attachments collection, or you can add an attachment to a message that is being created and sent on the fly. This operation limits the size of the attachment you can add to under 3 MB.
+     * Use this API to add an attachment to a message. An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource. You can add an attachment to an existing message by posting to its attachments collection, or you canadd an attachment to a message that is being created and sent on the fly. This operation limits the size of the attachment you can add to under 3 MB.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of Attachment
@@ -63,10 +112,14 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Attachment>(requestInfo, createAttachmentFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Attachment>(requestInfo, createAttachmentFromDiscriminatorValue, errorMapping);
     };
     /**
-     * Retrieve a list of attachment objects.
+     * 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
      */
@@ -84,7 +137,7 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
         return requestInfo;
     };
     /**
-     * Use this API to add an attachment to a message.  An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource.  You can add an attachment to an existing message by posting to its attachments collection, or you can add an attachment to a message that is being created and sent on the fly. This operation limits the size of the attachment you can add to under 3 MB.
+     * Use this API to add an attachment to a message. An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource. You can add an attachment to an existing message by posting to its attachments collection, or you canadd an attachment to a message that is being created and sent on the fly. This operation limits the size of the attachment you can add to under 3 MB.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
@@ -103,4 +156,15 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeAttachment);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a attachmentsRequestBuilder
+     */
+    public withUrl(rawUrl: string) : AttachmentsRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new AttachmentsRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 02ebb50b4..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-
-export interface AttachmentsRequestBuilderGetQueryParameters {
-    /**
-     * Include count of items
-     */
-    count?: boolean | undefined;
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Order items by property values
-     */
-    orderby?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index e486e1cfb..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {AttachmentsRequestBuilderGetQueryParameters} from './attachmentsRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface AttachmentsRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: AttachmentsRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
deleted file mode 100644
index 404d93fc7..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface AttachmentsRequestBuilderPostRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilder.ts
index 3db573462..dcaa41ed2 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilder.ts
@@ -1,7 +1,30 @@
-import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface CountRequestBuilderGetQueryParameters {
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+}
+export interface CountRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: CountRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments/$count
  */
@@ -23,7 +46,11 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", errorMapping);
     };
     /**
      * Get the number of the resource
@@ -43,4 +70,15 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a CountRequestBuilder
+     */
+    public withUrl(rawUrl: string) : CountRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new CountRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 331c0c0a1..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-export interface CountRequestBuilderGetQueryParameters {
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 8aee05dfa..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface CountRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: CountRequestBuilderGetQueryParameters | undefined;
-}
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 133257ca9..6f4dcefa9 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
@@ -1,2 +1 @@
-export * from './countRequestBuilderGetQueryParameters'
-export * from './countRequestBuilderGetRequestConfiguration'
+export * from './countRequestBuilder'
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 c14905fcc..6cc033f08 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
@@ -1,3 +1 @@
-export * from './attachmentsRequestBuilderGetQueryParameters'
-export * from './attachmentsRequestBuilderGetRequestConfiguration'
-export * from './attachmentsRequestBuilderPostRequestConfiguration'
+export * from './attachmentsRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
index b10698796..65a74e9e7 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
@@ -1,10 +1,46 @@
-import {Attachment} from '../../../../../../../../models/';
-import {createAttachmentFromDiscriminatorValue} from '../../../../../../../../models/createAttachmentFromDiscriminatorValue';
-import {AttachmentItemRequestBuilderDeleteRequestConfiguration} from './attachmentItemRequestBuilderDeleteRequestConfiguration';
-import {AttachmentItemRequestBuilderGetRequestConfiguration} from './attachmentItemRequestBuilderGetRequestConfiguration';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type Attachment } from '../../../../../../../../models/';
+import { createAttachmentFromDiscriminatorValue } from '../../../../../../../../models/attachment';
+import { type ODataError } from '../../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface AttachmentItemRequestBuilderDeleteRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface AttachmentItemRequestBuilderGetQueryParameters {
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface AttachmentItemRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: AttachmentItemRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments/{attachment-id}
  */
@@ -26,10 +62,14 @@ export class AttachmentItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toDeleteRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
-     * 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. 
+     * 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
      * @see {@link https://learn.microsoft.com/graph/api/attachment-get?view=graph-rest-1.0|Find more info here}
@@ -38,7 +78,11 @@ export class AttachmentItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Attachment>(requestInfo, createAttachmentFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Attachment>(requestInfo, createAttachmentFromDiscriminatorValue, errorMapping);
     };
     /**
      * Delete navigation property attachments for users
@@ -57,7 +101,7 @@ export class AttachmentItemRequestBuilder extends BaseRequestBuilder {
         return requestInfo;
     };
     /**
-     * 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. 
+     * 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
      */
@@ -74,4 +118,15 @@ export class AttachmentItemRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a AttachmentItemRequestBuilder
+     */
+    public withUrl(rawUrl: string) : AttachmentItemRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new AttachmentItemRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
deleted file mode 100644
index 3538f5b72..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface AttachmentItemRequestBuilderDeleteRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index f9c981ee8..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-
-export interface AttachmentItemRequestBuilderGetQueryParameters {
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index a62b74418..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {AttachmentItemRequestBuilderGetQueryParameters} from './attachmentItemRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface AttachmentItemRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: AttachmentItemRequestBuilderGetQueryParameters | undefined;
-}
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 486719c1b..614075b7e 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
@@ -1,3 +1 @@
-export * from './attachmentItemRequestBuilderDeleteRequestConfiguration'
-export * from './attachmentItemRequestBuilderGetQueryParameters'
-export * from './attachmentItemRequestBuilderGetRequestConfiguration'
+export * from './attachmentItemRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilder.ts
index 5949b1569..d088e1530 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilder.ts
@@ -1,7 +1,30 @@
-import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface CountRequestBuilderGetQueryParameters {
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+}
+export interface CountRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: CountRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions/$count
  */
@@ -23,7 +46,11 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", errorMapping);
     };
     /**
      * Get the number of the resource
@@ -43,4 +70,15 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a CountRequestBuilder
+     */
+    public withUrl(rawUrl: string) : CountRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new CountRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 331c0c0a1..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-export interface CountRequestBuilderGetQueryParameters {
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 8aee05dfa..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface CountRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: CountRequestBuilderGetQueryParameters | undefined;
-}
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 133257ca9..6f4dcefa9 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
@@ -1,2 +1 @@
-export * from './countRequestBuilderGetQueryParameters'
-export * from './countRequestBuilderGetRequestConfiguration'
+export * from './countRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts
index 084c8c224..9b9f274a7 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts
@@ -1,16 +1,69 @@
-import {ExtensionCollectionResponse} from '../../../../../../../models/';
-import {createExtensionCollectionResponseFromDiscriminatorValue} from '../../../../../../../models/createExtensionCollectionResponseFromDiscriminatorValue';
-import {createExtensionFromDiscriminatorValue} from '../../../../../../../models/createExtensionFromDiscriminatorValue';
-import {deserializeIntoExtension} from '../../../../../../../models/deserializeIntoExtension';
-import type {Extension} from '../../../../../../../models/extension';
-import {serializeExtension} from '../../../../../../../models/serializeExtension';
-import {CountRequestBuilder} from './count/countRequestBuilder';
-import {ExtensionsRequestBuilderGetRequestConfiguration} from './extensionsRequestBuilderGetRequestConfiguration';
-import {ExtensionsRequestBuilderPostRequestConfiguration} from './extensionsRequestBuilderPostRequestConfiguration';
-import {ExtensionItemRequestBuilder} from './item/extensionItemRequestBuilder';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ExtensionCollectionResponse } from '../../../../../../../models/';
+import { createExtensionFromDiscriminatorValue, deserializeIntoExtension, serializeExtension, type Extension } from '../../../../../../../models/extension';
+import { createExtensionCollectionResponseFromDiscriminatorValue } from '../../../../../../../models/extensionCollectionResponse';
+import { type ODataError } from '../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../models/oDataErrors/oDataError';
+import { CountRequestBuilder } from './count/countRequestBuilder';
+import { ExtensionItemRequestBuilder } from './item/extensionItemRequestBuilder';
+import { BaseRequestBuilder, getPathParameters, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface ExtensionsRequestBuilderGetQueryParameters {
+    /**
+     * Include count of items
+     */
+    count?: boolean;
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Order items by property values
+     */
+    orderby?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+    /**
+     * Skip the first n items
+     */
+    skip?: number;
+    /**
+     * Show only the first n items
+     */
+    top?: number;
+}
+export interface ExtensionsRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: ExtensionsRequestBuilderGetQueryParameters;
+}
+export interface ExtensionsRequestBuilderPostRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions
  */
@@ -49,7 +102,11 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<ExtensionCollectionResponse>(requestInfo, createExtensionCollectionResponseFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<ExtensionCollectionResponse>(requestInfo, createExtensionCollectionResponseFromDiscriminatorValue, errorMapping);
     };
     /**
      * 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.
@@ -62,7 +119,11 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, errorMapping);
     };
     /**
      * 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.
@@ -102,4 +163,15 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeExtension);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a extensionsRequestBuilder
+     */
+    public withUrl(rawUrl: string) : ExtensionsRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new ExtensionsRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 7f67bf8f0..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-
-export interface ExtensionsRequestBuilderGetQueryParameters {
-    /**
-     * Include count of items
-     */
-    count?: boolean | undefined;
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Order items by property values
-     */
-    orderby?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-    /**
-     * Skip the first n items
-     */
-    skip?: number | undefined;
-    /**
-     * Show only the first n items
-     */
-    top?: number | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 296d2e099..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {ExtensionsRequestBuilderGetQueryParameters} from './extensionsRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ExtensionsRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: ExtensionsRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
deleted file mode 100644
index 2d639a33d..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ExtensionsRequestBuilderPostRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
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 d8e83434e..8ddb1ac86 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
@@ -1,3 +1 @@
-export * from './extensionsRequestBuilderGetQueryParameters'
-export * from './extensionsRequestBuilderGetRequestConfiguration'
-export * from './extensionsRequestBuilderPostRequestConfiguration'
+export * from './extensionsRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
index e06f3a1eb..cc455e177 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
@@ -1,13 +1,55 @@
-import {createExtensionFromDiscriminatorValue} from '../../../../../../../../models/createExtensionFromDiscriminatorValue';
-import {deserializeIntoExtension} from '../../../../../../../../models/deserializeIntoExtension';
-import type {Extension} from '../../../../../../../../models/extension';
-import {serializeExtension} from '../../../../../../../../models/serializeExtension';
-import {ExtensionItemRequestBuilderDeleteRequestConfiguration} from './extensionItemRequestBuilderDeleteRequestConfiguration';
-import {ExtensionItemRequestBuilderGetRequestConfiguration} from './extensionItemRequestBuilderGetRequestConfiguration';
-import {ExtensionItemRequestBuilderPatchRequestConfiguration} from './extensionItemRequestBuilderPatchRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createExtensionFromDiscriminatorValue, deserializeIntoExtension, serializeExtension, type Extension } from '../../../../../../../../models/extension';
+import { type ODataError } from '../../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface ExtensionItemRequestBuilderDeleteRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface ExtensionItemRequestBuilderGetQueryParameters {
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface ExtensionItemRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: ExtensionItemRequestBuilderGetQueryParameters;
+}
+export interface ExtensionItemRequestBuilderPatchRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions/{extension-id}
  */
@@ -30,7 +72,11 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toDeleteRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * 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.
@@ -42,7 +88,11 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, errorMapping);
     };
     /**
      * Update the navigation property extensions in users
@@ -54,7 +104,11 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, errorMapping);
     };
     /**
      * 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.
@@ -110,4 +164,15 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeExtension);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a ExtensionItemRequestBuilder
+     */
+    public withUrl(rawUrl: string) : ExtensionItemRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new ExtensionItemRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
deleted file mode 100644
index dab7a050d..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ExtensionItemRequestBuilderDeleteRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 2d0516689..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-
-export interface ExtensionItemRequestBuilderGetQueryParameters {
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 9929a4faf..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {ExtensionItemRequestBuilderGetQueryParameters} from './extensionItemRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ExtensionItemRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: ExtensionItemRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
deleted file mode 100644
index c46dbb966..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ExtensionItemRequestBuilderPatchRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
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 73c01dfdc..0e1147d8c 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
@@ -1,4 +1 @@
-export * from './extensionItemRequestBuilderDeleteRequestConfiguration'
-export * from './extensionItemRequestBuilderGetQueryParameters'
-export * from './extensionItemRequestBuilderGetRequestConfiguration'
-export * from './extensionItemRequestBuilderPatchRequestConfiguration'
+export * from './extensionItemRequestBuilder'
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 65b74019e..9b0117e0f 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
@@ -1,4 +1 @@
-export * from './messageItemRequestBuilderDeleteRequestConfiguration'
-export * from './messageItemRequestBuilderGetQueryParameters'
-export * from './messageItemRequestBuilderGetRequestConfiguration'
-export * from './messageItemRequestBuilderPatchRequestConfiguration'
+export * from './messageItemRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilder.ts
index d4624a97e..b90cf130d 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilder.ts
@@ -1,16 +1,58 @@
-import {createMessageFromDiscriminatorValue} from '../../../../../../models/createMessageFromDiscriminatorValue';
-import {deserializeIntoMessage} from '../../../../../../models/deserializeIntoMessage';
-import type {Message} from '../../../../../../models/message';
-import {serializeMessage} from '../../../../../../models/serializeMessage';
-import {AttachmentsRequestBuilder} from './attachments/attachmentsRequestBuilder';
-import {ExtensionsRequestBuilder} from './extensions/extensionsRequestBuilder';
-import {MessageItemRequestBuilderDeleteRequestConfiguration} from './messageItemRequestBuilderDeleteRequestConfiguration';
-import {MessageItemRequestBuilderGetRequestConfiguration} from './messageItemRequestBuilderGetRequestConfiguration';
-import {MessageItemRequestBuilderPatchRequestConfiguration} from './messageItemRequestBuilderPatchRequestConfiguration';
-import {ContentRequestBuilder} from './value/contentRequestBuilder';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createMessageFromDiscriminatorValue, deserializeIntoMessage, serializeMessage, type Message } from '../../../../../../models/message';
+import { type ODataError } from '../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../models/oDataErrors/oDataError';
+import { AttachmentsRequestBuilder } from './attachments/attachmentsRequestBuilder';
+import { ExtensionsRequestBuilder } from './extensions/extensionsRequestBuilder';
+import { ContentRequestBuilder } from './value/contentRequestBuilder';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface MessageItemRequestBuilderDeleteRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface MessageItemRequestBuilderGetQueryParameters {
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface MessageItemRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: MessageItemRequestBuilderGetQueryParameters;
+}
+export interface MessageItemRequestBuilderPatchRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}
  */
@@ -50,7 +92,11 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toDeleteRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * The collection of messages in the mailFolder.
@@ -61,7 +107,11 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, errorMapping);
     };
     /**
      * Update the navigation property messages in users
@@ -73,7 +123,11 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, errorMapping);
     };
     /**
      * Delete navigation property messages for users
@@ -129,4 +183,15 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessage);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a MessageItemRequestBuilder
+     */
+    public withUrl(rawUrl: string) : MessageItemRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new MessageItemRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
deleted file mode 100644
index 502dc2f91..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageItemRequestBuilderDeleteRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 45277f80a..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-
-export interface MessageItemRequestBuilderGetQueryParameters {
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index a659064b4..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {MessageItemRequestBuilderGetQueryParameters} from './messageItemRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageItemRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: MessageItemRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
deleted file mode 100644
index 00baca8f7..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageItemRequestBuilderPatchRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts
index 363bfd3b4..4427f250b 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts
@@ -1,8 +1,30 @@
-import {ContentRequestBuilderGetRequestConfiguration} from './contentRequestBuilderGetRequestConfiguration';
-import {ContentRequestBuilderPutRequestConfiguration} from './contentRequestBuilderPutRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface ContentRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface ContentRequestBuilderPutRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/$value
  */
@@ -25,7 +47,11 @@ export class ContentRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * Update media content for the navigation property messages in users
@@ -37,7 +63,11 @@ export class ContentRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPutRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * Get media content for the navigation property messages from users
@@ -74,4 +104,15 @@ export class ContentRequestBuilder extends BaseRequestBuilder {
         requestInfo.setStreamContent(body);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a ContentRequestBuilder
+     */
+    public withUrl(rawUrl: string) : ContentRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new ContentRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 10e67530a..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ContentRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
deleted file mode 100644
index 8a61d2a6d..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ContentRequestBuilderPutRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
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 260bf1e9a..28c86e75e 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
@@ -1,2 +1 @@
-export * from './contentRequestBuilderGetRequestConfiguration'
-export * from './contentRequestBuilderPutRequestConfiguration'
+export * from './contentRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilder.ts
index a4c187557..73446eeb8 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilder.ts
@@ -1,16 +1,73 @@
-import {MessageCollectionResponse} from '../../../../../models/';
-import {createMessageCollectionResponseFromDiscriminatorValue} from '../../../../../models/createMessageCollectionResponseFromDiscriminatorValue';
-import {createMessageFromDiscriminatorValue} from '../../../../../models/createMessageFromDiscriminatorValue';
-import {deserializeIntoMessage} from '../../../../../models/deserializeIntoMessage';
-import type {Message} from '../../../../../models/message';
-import {serializeMessage} from '../../../../../models/serializeMessage';
-import {CountRequestBuilder} from './count/countRequestBuilder';
-import {MessageItemRequestBuilder} from './item/messageItemRequestBuilder';
-import {MessagesRequestBuilderGetRequestConfiguration} from './messagesRequestBuilderGetRequestConfiguration';
-import {MessagesRequestBuilderPostRequestConfiguration} from './messagesRequestBuilderPostRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type MessageCollectionResponse } from '../../../../../models/';
+import { createMessageFromDiscriminatorValue, deserializeIntoMessage, serializeMessage, type Message } from '../../../../../models/message';
+import { createMessageCollectionResponseFromDiscriminatorValue } from '../../../../../models/messageCollectionResponse';
+import { type ODataError } from '../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../models/oDataErrors/oDataError';
+import { CountRequestBuilder } from './count/countRequestBuilder';
+import { MessageItemRequestBuilder } from './item/messageItemRequestBuilder';
+import { BaseRequestBuilder, getPathParameters, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface MessagesRequestBuilderGetQueryParameters {
+    /**
+     * Include count of items
+     */
+    count?: boolean;
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Order items by property values
+     */
+    orderby?: string[];
+    /**
+     * Search items by search phrases
+     */
+    search?: string;
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+    /**
+     * Skip the first n items
+     */
+    skip?: number;
+    /**
+     * Show only the first n items
+     */
+    top?: number;
+}
+export interface MessagesRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: MessagesRequestBuilderGetQueryParameters;
+}
+export interface MessagesRequestBuilderPostRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages
  */
@@ -50,7 +107,11 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MessageCollectionResponse>(requestInfo, createMessageCollectionResponseFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MessageCollectionResponse>(requestInfo, createMessageCollectionResponseFromDiscriminatorValue, errorMapping);
     };
     /**
      * Use this API to create a new Message in a mailfolder.
@@ -63,7 +124,11 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, errorMapping);
     };
     /**
      * Get all the messages in the specified user's mailbox, or those messages in a specified folder in the mailbox.
@@ -103,4 +168,15 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessage);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a messagesRequestBuilder
+     */
+    public withUrl(rawUrl: string) : MessagesRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new MessagesRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 7818dee1a..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-
-export interface MessagesRequestBuilderGetQueryParameters {
-    /**
-     * Include count of items
-     */
-    count?: boolean | undefined;
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Order items by property values
-     */
-    orderby?: string[] | undefined;
-    /**
-     * Search items by search phrases
-     */
-    search?: string | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-    /**
-     * Skip the first n items
-     */
-    skip?: number | undefined;
-    /**
-     * Show only the first n items
-     */
-    top?: number | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 73034f00f..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {MessagesRequestBuilderGetQueryParameters} from './messagesRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessagesRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: MessagesRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
deleted file mode 100644
index a6d72f7d2..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessagesRequestBuilderPostRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilder.ts b/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilder.ts
index c89ad8ea1..ae6287069 100644
--- a/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilder.ts
@@ -1,16 +1,73 @@
-import {MailFolderCollectionResponse} from '../../../models/';
-import {createMailFolderCollectionResponseFromDiscriminatorValue} from '../../../models/createMailFolderCollectionResponseFromDiscriminatorValue';
-import {createMailFolderFromDiscriminatorValue} from '../../../models/createMailFolderFromDiscriminatorValue';
-import {deserializeIntoMailFolder} from '../../../models/deserializeIntoMailFolder';
-import type {MailFolder} from '../../../models/mailFolder';
-import {serializeMailFolder} from '../../../models/serializeMailFolder';
-import {CountRequestBuilder} from './count/countRequestBuilder';
-import {MailFolderItemRequestBuilder} from './item/mailFolderItemRequestBuilder';
-import {MailFoldersRequestBuilderGetRequestConfiguration} from './mailFoldersRequestBuilderGetRequestConfiguration';
-import {MailFoldersRequestBuilderPostRequestConfiguration} from './mailFoldersRequestBuilderPostRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type MailFolderCollectionResponse } from '../../../models/';
+import { createMailFolderFromDiscriminatorValue, deserializeIntoMailFolder, serializeMailFolder, type MailFolder } from '../../../models/mailFolder';
+import { createMailFolderCollectionResponseFromDiscriminatorValue } from '../../../models/mailFolderCollectionResponse';
+import { type ODataError } from '../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../models/oDataErrors/oDataError';
+import { CountRequestBuilder } from './count/countRequestBuilder';
+import { MailFolderItemRequestBuilder } from './item/mailFolderItemRequestBuilder';
+import { BaseRequestBuilder, getPathParameters, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface MailFoldersRequestBuilderGetQueryParameters {
+    /**
+     * Include count of items
+     */
+    count?: boolean;
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Include Hidden Folders
+     */
+    includeHiddenFolders?: string;
+    /**
+     * Order items by property values
+     */
+    orderby?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+    /**
+     * Skip the first n items
+     */
+    skip?: number;
+    /**
+     * Show only the first n items
+     */
+    top?: number;
+}
+export interface MailFoldersRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: MailFoldersRequestBuilderGetQueryParameters;
+}
+export interface MailFoldersRequestBuilderPostRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders
  */
@@ -50,7 +107,11 @@ export class MailFoldersRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MailFolderCollectionResponse>(requestInfo, createMailFolderCollectionResponseFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MailFolderCollectionResponse>(requestInfo, createMailFolderCollectionResponseFromDiscriminatorValue, errorMapping);
     };
     /**
      * 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.
@@ -63,7 +124,11 @@ export class MailFoldersRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MailFolder>(requestInfo, createMailFolderFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MailFolder>(requestInfo, createMailFolderFromDiscriminatorValue, errorMapping);
     };
     /**
      * The user's mail folders. Read-only. Nullable.
@@ -103,4 +168,15 @@ export class MailFoldersRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMailFolder);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a mailFoldersRequestBuilder
+     */
+    public withUrl(rawUrl: string) : MailFoldersRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new MailFoldersRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index c1c615ddc..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-
-export interface MailFoldersRequestBuilderGetQueryParameters {
-    /**
-     * Include count of items
-     */
-    count?: boolean | undefined;
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Include Hidden Folders
-     */
-    includeHiddenFolders?: string | undefined;
-    /**
-     * Order items by property values
-     */
-    orderby?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-    /**
-     * Skip the first n items
-     */
-    skip?: number | undefined;
-    /**
-     * Show only the first n items
-     */
-    top?: number | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 858b256ae..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {MailFoldersRequestBuilderGetQueryParameters} from './mailFoldersRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MailFoldersRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: MailFoldersRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderPostRequestConfiguration.ts
deleted file mode 100644
index 05d945d05..000000000
--- a/packages/test/generatedCode/users/item/mailFolders/mailFoldersRequestBuilderPostRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MailFoldersRequestBuilderPostRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/count/countRequestBuilder.ts
index 028c6f1c0..a255f79dc 100644
--- a/packages/test/generatedCode/users/item/messages/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/count/countRequestBuilder.ts
@@ -1,7 +1,34 @@
-import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface CountRequestBuilderGetQueryParameters {
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Search items by search phrases
+     */
+    search?: string;
+}
+export interface CountRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: CountRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/$count
  */
@@ -23,7 +50,11 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", errorMapping);
     };
     /**
      * Get the number of the resource
@@ -43,4 +74,15 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a CountRequestBuilder
+     */
+    public withUrl(rawUrl: string) : CountRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new CountRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/messages/count/countRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/messages/count/countRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 688fe5ed3..000000000
--- a/packages/test/generatedCode/users/item/messages/count/countRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-
-export interface CountRequestBuilderGetQueryParameters {
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Search items by search phrases
-     */
-    search?: string | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 8aee05dfa..000000000
--- a/packages/test/generatedCode/users/item/messages/count/countRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface CountRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: CountRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/count/index.ts b/packages/test/generatedCode/users/item/messages/count/index.ts
index 133257ca9..6f4dcefa9 100644
--- a/packages/test/generatedCode/users/item/messages/count/index.ts
+++ b/packages/test/generatedCode/users/item/messages/count/index.ts
@@ -1,2 +1 @@
-export * from './countRequestBuilderGetQueryParameters'
-export * from './countRequestBuilderGetRequestConfiguration'
+export * from './countRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/messages/index.ts b/packages/test/generatedCode/users/item/messages/index.ts
index fe2edc27e..9f6fd0b31 100644
--- a/packages/test/generatedCode/users/item/messages/index.ts
+++ b/packages/test/generatedCode/users/item/messages/index.ts
@@ -1,3 +1 @@
-export * from './messagesRequestBuilderGetQueryParameters'
-export * from './messagesRequestBuilderGetRequestConfiguration'
-export * from './messagesRequestBuilderPostRequestConfiguration'
+export * from './messagesRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilder.ts
index 52ebaa466..de7d2952b 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilder.ts
@@ -1,16 +1,61 @@
-import {AttachmentCollectionResponse} from '../../../../../models/';
-import type {Attachment} from '../../../../../models/attachment';
-import {createAttachmentCollectionResponseFromDiscriminatorValue} from '../../../../../models/createAttachmentCollectionResponseFromDiscriminatorValue';
-import {createAttachmentFromDiscriminatorValue} from '../../../../../models/createAttachmentFromDiscriminatorValue';
-import {deserializeIntoAttachment} from '../../../../../models/deserializeIntoAttachment';
-import {serializeAttachment} from '../../../../../models/serializeAttachment';
-import {AttachmentsRequestBuilderGetRequestConfiguration} from './attachmentsRequestBuilderGetRequestConfiguration';
-import {AttachmentsRequestBuilderPostRequestConfiguration} from './attachmentsRequestBuilderPostRequestConfiguration';
-import {CountRequestBuilder} from './count/countRequestBuilder';
-import {AttachmentItemRequestBuilder} from './item/attachmentItemRequestBuilder';
-import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type AttachmentCollectionResponse } from '../../../../../models/';
+import { createAttachmentFromDiscriminatorValue, deserializeIntoAttachment, serializeAttachment, type Attachment } from '../../../../../models/attachment';
+import { createAttachmentCollectionResponseFromDiscriminatorValue } from '../../../../../models/attachmentCollectionResponse';
+import { type ODataError } from '../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../models/oDataErrors/oDataError';
+import { CountRequestBuilder } from './count/countRequestBuilder';
+import { AttachmentItemRequestBuilder } from './item/attachmentItemRequestBuilder';
+import { BaseRequestBuilder, getPathParameters, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface AttachmentsRequestBuilderGetQueryParameters {
+    /**
+     * Include count of items
+     */
+    count?: boolean;
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Order items by property values
+     */
+    orderby?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface AttachmentsRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: AttachmentsRequestBuilderGetQueryParameters;
+}
+export interface AttachmentsRequestBuilderPostRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments
  */
@@ -41,19 +86,23 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
         super(pathParameters, requestAdapter, "{+baseurl}/users/{user%2Did}/messages/{message%2Did}/attachments{?%24filter,%24count,%24orderby,%24select,%24expand}");
     };
     /**
-     * Retrieve a list of attachment objects.
+     * 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
-     * @see {@link https://learn.microsoft.com/graph/api/eventmessage-list-attachments?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/message-list-attachments?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: AttachmentsRequestBuilderGetRequestConfiguration | undefined) : Promise<AttachmentCollectionResponse | undefined> {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<AttachmentCollectionResponse>(requestInfo, createAttachmentCollectionResponseFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<AttachmentCollectionResponse>(requestInfo, createAttachmentCollectionResponseFromDiscriminatorValue, errorMapping);
     };
     /**
-     * Use this API to add an attachment to a message.  An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource.  You can add an attachment to an existing message by posting to its attachments collection, or you can add an attachment to a message that is being created and sent on the fly. This operation limits the size of the attachment you can add to under 3 MB.
+     * Use this API to add an attachment to a message. An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource. You can add an attachment to an existing message by posting to its attachments collection, or you canadd an attachment to a message that is being created and sent on the fly. This operation limits the size of the attachment you can add to under 3 MB.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of Attachment
@@ -63,10 +112,14 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Attachment>(requestInfo, createAttachmentFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Attachment>(requestInfo, createAttachmentFromDiscriminatorValue, errorMapping);
     };
     /**
-     * Retrieve a list of attachment objects.
+     * 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
      */
@@ -84,7 +137,7 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
         return requestInfo;
     };
     /**
-     * Use this API to add an attachment to a message.  An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource.  You can add an attachment to an existing message by posting to its attachments collection, or you can add an attachment to a message that is being created and sent on the fly. This operation limits the size of the attachment you can add to under 3 MB.
+     * Use this API to add an attachment to a message. An attachment can be one of the following types: All these types of attachment resources are derived from the attachmentresource. You can add an attachment to an existing message by posting to its attachments collection, or you canadd an attachment to a message that is being created and sent on the fly. This operation limits the size of the attachment you can add to under 3 MB.
      * @param body The request body
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
@@ -103,4 +156,15 @@ export class AttachmentsRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeAttachment);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a attachmentsRequestBuilder
+     */
+    public withUrl(rawUrl: string) : AttachmentsRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new AttachmentsRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 02ebb50b4..000000000
--- a/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-
-export interface AttachmentsRequestBuilderGetQueryParameters {
-    /**
-     * Include count of items
-     */
-    count?: boolean | undefined;
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Order items by property values
-     */
-    orderby?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index e486e1cfb..000000000
--- a/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {AttachmentsRequestBuilderGetQueryParameters} from './attachmentsRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface AttachmentsRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: AttachmentsRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
deleted file mode 100644
index 404d93fc7..000000000
--- a/packages/test/generatedCode/users/item/messages/item/attachments/attachmentsRequestBuilderPostRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface AttachmentsRequestBuilderPostRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilder.ts
index 4a4335dc7..957c7ee70 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilder.ts
@@ -1,7 +1,30 @@
-import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface CountRequestBuilderGetQueryParameters {
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+}
+export interface CountRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: CountRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments/$count
  */
@@ -23,7 +46,11 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", errorMapping);
     };
     /**
      * Get the number of the resource
@@ -43,4 +70,15 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a CountRequestBuilder
+     */
+    public withUrl(rawUrl: string) : CountRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new CountRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 331c0c0a1..000000000
--- a/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-export interface CountRequestBuilderGetQueryParameters {
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 8aee05dfa..000000000
--- a/packages/test/generatedCode/users/item/messages/item/attachments/count/countRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface CountRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: CountRequestBuilderGetQueryParameters | undefined;
-}
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 133257ca9..6f4dcefa9 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
@@ -1,2 +1 @@
-export * from './countRequestBuilderGetQueryParameters'
-export * from './countRequestBuilderGetRequestConfiguration'
+export * from './countRequestBuilder'
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 c14905fcc..6cc033f08 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/index.ts
@@ -1,3 +1 @@
-export * from './attachmentsRequestBuilderGetQueryParameters'
-export * from './attachmentsRequestBuilderGetRequestConfiguration'
-export * from './attachmentsRequestBuilderPostRequestConfiguration'
+export * from './attachmentsRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
index 917fddd3a..f5811a3b7 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilder.ts
@@ -1,10 +1,46 @@
-import {Attachment} from '../../../../../../models/';
-import {createAttachmentFromDiscriminatorValue} from '../../../../../../models/createAttachmentFromDiscriminatorValue';
-import {AttachmentItemRequestBuilderDeleteRequestConfiguration} from './attachmentItemRequestBuilderDeleteRequestConfiguration';
-import {AttachmentItemRequestBuilderGetRequestConfiguration} from './attachmentItemRequestBuilderGetRequestConfiguration';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type Attachment } from '../../../../../../models/';
+import { createAttachmentFromDiscriminatorValue } from '../../../../../../models/attachment';
+import { type ODataError } from '../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface AttachmentItemRequestBuilderDeleteRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface AttachmentItemRequestBuilderGetQueryParameters {
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface AttachmentItemRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: AttachmentItemRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments/{attachment-id}
  */
@@ -26,10 +62,14 @@ export class AttachmentItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toDeleteRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
-     * 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. 
+     * 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
      * @see {@link https://learn.microsoft.com/graph/api/attachment-get?view=graph-rest-1.0|Find more info here}
@@ -38,7 +78,11 @@ export class AttachmentItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Attachment>(requestInfo, createAttachmentFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Attachment>(requestInfo, createAttachmentFromDiscriminatorValue, errorMapping);
     };
     /**
      * Delete navigation property attachments for users
@@ -57,7 +101,7 @@ export class AttachmentItemRequestBuilder extends BaseRequestBuilder {
         return requestInfo;
     };
     /**
-     * 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. 
+     * 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
      */
@@ -74,4 +118,15 @@ export class AttachmentItemRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a AttachmentItemRequestBuilder
+     */
+    public withUrl(rawUrl: string) : AttachmentItemRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new AttachmentItemRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
deleted file mode 100644
index 3538f5b72..000000000
--- a/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderDeleteRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface AttachmentItemRequestBuilderDeleteRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index f9c981ee8..000000000
--- a/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-
-export interface AttachmentItemRequestBuilderGetQueryParameters {
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index a62b74418..000000000
--- a/packages/test/generatedCode/users/item/messages/item/attachments/item/attachmentItemRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {AttachmentItemRequestBuilderGetQueryParameters} from './attachmentItemRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface AttachmentItemRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: AttachmentItemRequestBuilderGetQueryParameters | undefined;
-}
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 486719c1b..614075b7e 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
@@ -1,3 +1 @@
-export * from './attachmentItemRequestBuilderDeleteRequestConfiguration'
-export * from './attachmentItemRequestBuilderGetQueryParameters'
-export * from './attachmentItemRequestBuilderGetRequestConfiguration'
+export * from './attachmentItemRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilder.ts
index d7c01a6db..92ebe88b5 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilder.ts
@@ -1,7 +1,30 @@
-import {CountRequestBuilderGetRequestConfiguration} from './countRequestBuilderGetRequestConfiguration';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface CountRequestBuilderGetQueryParameters {
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+}
+export interface CountRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: CountRequestBuilderGetQueryParameters;
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions/$count
  */
@@ -23,7 +46,11 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<number>(requestInfo, "number", errorMapping);
     };
     /**
      * Get the number of the resource
@@ -43,4 +70,15 @@ export class CountRequestBuilder extends BaseRequestBuilder {
         }
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a CountRequestBuilder
+     */
+    public withUrl(rawUrl: string) : CountRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new CountRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 331c0c0a1..000000000
--- a/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-export interface CountRequestBuilderGetQueryParameters {
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 8aee05dfa..000000000
--- a/packages/test/generatedCode/users/item/messages/item/extensions/count/countRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {CountRequestBuilderGetQueryParameters} from './countRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface CountRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: CountRequestBuilderGetQueryParameters | undefined;
-}
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 133257ca9..6f4dcefa9 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
@@ -1,2 +1 @@
-export * from './countRequestBuilderGetQueryParameters'
-export * from './countRequestBuilderGetRequestConfiguration'
+export * from './countRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilder.ts
index c31985a55..41be0065e 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilder.ts
@@ -1,16 +1,69 @@
-import {ExtensionCollectionResponse} from '../../../../../models/';
-import {createExtensionCollectionResponseFromDiscriminatorValue} from '../../../../../models/createExtensionCollectionResponseFromDiscriminatorValue';
-import {createExtensionFromDiscriminatorValue} from '../../../../../models/createExtensionFromDiscriminatorValue';
-import {deserializeIntoExtension} from '../../../../../models/deserializeIntoExtension';
-import type {Extension} from '../../../../../models/extension';
-import {serializeExtension} from '../../../../../models/serializeExtension';
-import {CountRequestBuilder} from './count/countRequestBuilder';
-import {ExtensionsRequestBuilderGetRequestConfiguration} from './extensionsRequestBuilderGetRequestConfiguration';
-import {ExtensionsRequestBuilderPostRequestConfiguration} from './extensionsRequestBuilderPostRequestConfiguration';
-import {ExtensionItemRequestBuilder} from './item/extensionItemRequestBuilder';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ExtensionCollectionResponse } from '../../../../../models/';
+import { createExtensionFromDiscriminatorValue, deserializeIntoExtension, serializeExtension, type Extension } from '../../../../../models/extension';
+import { createExtensionCollectionResponseFromDiscriminatorValue } from '../../../../../models/extensionCollectionResponse';
+import { type ODataError } from '../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../models/oDataErrors/oDataError';
+import { CountRequestBuilder } from './count/countRequestBuilder';
+import { ExtensionItemRequestBuilder } from './item/extensionItemRequestBuilder';
+import { BaseRequestBuilder, getPathParameters, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface ExtensionsRequestBuilderGetQueryParameters {
+    /**
+     * Include count of items
+     */
+    count?: boolean;
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Order items by property values
+     */
+    orderby?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+    /**
+     * Skip the first n items
+     */
+    skip?: number;
+    /**
+     * Show only the first n items
+     */
+    top?: number;
+}
+export interface ExtensionsRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: ExtensionsRequestBuilderGetQueryParameters;
+}
+export interface ExtensionsRequestBuilderPostRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions
  */
@@ -49,7 +102,11 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<ExtensionCollectionResponse>(requestInfo, createExtensionCollectionResponseFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<ExtensionCollectionResponse>(requestInfo, createExtensionCollectionResponseFromDiscriminatorValue, errorMapping);
     };
     /**
      * 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.
@@ -62,7 +119,11 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, errorMapping);
     };
     /**
      * 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.
@@ -102,4 +163,15 @@ export class ExtensionsRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeExtension);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a extensionsRequestBuilder
+     */
+    public withUrl(rawUrl: string) : ExtensionsRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new ExtensionsRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 7f67bf8f0..000000000
--- a/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-
-export interface ExtensionsRequestBuilderGetQueryParameters {
-    /**
-     * Include count of items
-     */
-    count?: boolean | undefined;
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Order items by property values
-     */
-    orderby?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-    /**
-     * Skip the first n items
-     */
-    skip?: number | undefined;
-    /**
-     * Show only the first n items
-     */
-    top?: number | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 296d2e099..000000000
--- a/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {ExtensionsRequestBuilderGetQueryParameters} from './extensionsRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ExtensionsRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: ExtensionsRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
deleted file mode 100644
index 2d639a33d..000000000
--- a/packages/test/generatedCode/users/item/messages/item/extensions/extensionsRequestBuilderPostRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ExtensionsRequestBuilderPostRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
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 d8e83434e..8ddb1ac86 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/index.ts
@@ -1,3 +1 @@
-export * from './extensionsRequestBuilderGetQueryParameters'
-export * from './extensionsRequestBuilderGetRequestConfiguration'
-export * from './extensionsRequestBuilderPostRequestConfiguration'
+export * from './extensionsRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
index d3911cedd..cc772a3b7 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilder.ts
@@ -1,13 +1,55 @@
-import {createExtensionFromDiscriminatorValue} from '../../../../../../models/createExtensionFromDiscriminatorValue';
-import {deserializeIntoExtension} from '../../../../../../models/deserializeIntoExtension';
-import type {Extension} from '../../../../../../models/extension';
-import {serializeExtension} from '../../../../../../models/serializeExtension';
-import {ExtensionItemRequestBuilderDeleteRequestConfiguration} from './extensionItemRequestBuilderDeleteRequestConfiguration';
-import {ExtensionItemRequestBuilderGetRequestConfiguration} from './extensionItemRequestBuilderGetRequestConfiguration';
-import {ExtensionItemRequestBuilderPatchRequestConfiguration} from './extensionItemRequestBuilderPatchRequestConfiguration';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createExtensionFromDiscriminatorValue, deserializeIntoExtension, serializeExtension, type Extension } from '../../../../../../models/extension';
+import { type ODataError } from '../../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface ExtensionItemRequestBuilderDeleteRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface ExtensionItemRequestBuilderGetQueryParameters {
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface ExtensionItemRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: ExtensionItemRequestBuilderGetQueryParameters;
+}
+export interface ExtensionItemRequestBuilderPatchRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions/{extension-id}
  */
@@ -30,7 +72,11 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toDeleteRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * 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.
@@ -42,7 +88,11 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, errorMapping);
     };
     /**
      * Update the navigation property extensions in users
@@ -54,7 +104,11 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Extension>(requestInfo, createExtensionFromDiscriminatorValue, errorMapping);
     };
     /**
      * 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.
@@ -110,4 +164,15 @@ export class ExtensionItemRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeExtension);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a ExtensionItemRequestBuilder
+     */
+    public withUrl(rawUrl: string) : ExtensionItemRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new ExtensionItemRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
deleted file mode 100644
index dab7a050d..000000000
--- a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderDeleteRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ExtensionItemRequestBuilderDeleteRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 2d0516689..000000000
--- a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-
-export interface ExtensionItemRequestBuilderGetQueryParameters {
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 9929a4faf..000000000
--- a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {ExtensionItemRequestBuilderGetQueryParameters} from './extensionItemRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ExtensionItemRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: ExtensionItemRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
deleted file mode 100644
index c46dbb966..000000000
--- a/packages/test/generatedCode/users/item/messages/item/extensions/item/extensionItemRequestBuilderPatchRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ExtensionItemRequestBuilderPatchRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
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 73c01dfdc..0e1147d8c 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
@@ -1,4 +1 @@
-export * from './extensionItemRequestBuilderDeleteRequestConfiguration'
-export * from './extensionItemRequestBuilderGetQueryParameters'
-export * from './extensionItemRequestBuilderGetRequestConfiguration'
-export * from './extensionItemRequestBuilderPatchRequestConfiguration'
+export * from './extensionItemRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/messages/item/index.ts b/packages/test/generatedCode/users/item/messages/item/index.ts
index 65b74019e..9b0117e0f 100644
--- a/packages/test/generatedCode/users/item/messages/item/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/index.ts
@@ -1,4 +1 @@
-export * from './messageItemRequestBuilderDeleteRequestConfiguration'
-export * from './messageItemRequestBuilderGetQueryParameters'
-export * from './messageItemRequestBuilderGetRequestConfiguration'
-export * from './messageItemRequestBuilderPatchRequestConfiguration'
+export * from './messageItemRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilder.ts
index 67f6c9807..ca38de0de 100644
--- a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilder.ts
@@ -1,16 +1,62 @@
-import {createMessageFromDiscriminatorValue} from '../../../../models/createMessageFromDiscriminatorValue';
-import {deserializeIntoMessage} from '../../../../models/deserializeIntoMessage';
-import type {Message} from '../../../../models/message';
-import {serializeMessage} from '../../../../models/serializeMessage';
-import {AttachmentsRequestBuilder} from './attachments/attachmentsRequestBuilder';
-import {ExtensionsRequestBuilder} from './extensions/extensionsRequestBuilder';
-import {MessageItemRequestBuilderDeleteRequestConfiguration} from './messageItemRequestBuilderDeleteRequestConfiguration';
-import {MessageItemRequestBuilderGetRequestConfiguration} from './messageItemRequestBuilderGetRequestConfiguration';
-import {MessageItemRequestBuilderPatchRequestConfiguration} from './messageItemRequestBuilderPatchRequestConfiguration';
-import {ContentRequestBuilder} from './value/contentRequestBuilder';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { createMessageFromDiscriminatorValue, deserializeIntoMessage, serializeMessage, type Message } from '../../../../models/message';
+import { type ODataError } from '../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../models/oDataErrors/oDataError';
+import { AttachmentsRequestBuilder } from './attachments/attachmentsRequestBuilder';
+import { ExtensionsRequestBuilder } from './extensions/extensionsRequestBuilder';
+import { ContentRequestBuilder } from './value/contentRequestBuilder';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface MessageItemRequestBuilderDeleteRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface MessageItemRequestBuilderGetQueryParameters {
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Include Hidden Messages
+     */
+    includeHiddenMessages?: string;
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+}
+export interface MessageItemRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: MessageItemRequestBuilderGetQueryParameters;
+}
+export interface MessageItemRequestBuilderPatchRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}
  */
@@ -42,16 +88,20 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
         super(pathParameters, requestAdapter, "{+baseurl}/users/{user%2Did}/messages/{message%2Did}{?includeHiddenMessages,%24select,%24expand}");
     };
     /**
-     * Delete a message in the specified user's mailbox, or delete a relationship of the message.
+     * Delete eventMessage.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a Promise of ArrayBuffer
-     * @see {@link https://learn.microsoft.com/graph/api/message-delete?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/eventmessage-delete?view=graph-rest-1.0|Find more info here}
      */
     public delete(requestConfiguration?: MessageItemRequestBuilderDeleteRequestConfiguration | undefined) : Promise<ArrayBuffer | undefined> {
         const requestInfo = this.toDeleteRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * The messages in a mailbox or folder. Read-only. Nullable.
@@ -63,7 +113,11 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, errorMapping);
     };
     /**
      * Update the properties of a message object.
@@ -76,10 +130,14 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPatchRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, errorMapping);
     };
     /**
-     * Delete a message in the specified user's mailbox, or delete a relationship of the message.
+     * Delete eventMessage.
      * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
      * @returns a RequestInformation
      */
@@ -132,4 +190,15 @@ export class MessageItemRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessage);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a MessageItemRequestBuilder
+     */
+    public withUrl(rawUrl: string) : MessageItemRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new MessageItemRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
deleted file mode 100644
index 502dc2f91..000000000
--- a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderDeleteRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageItemRequestBuilderDeleteRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index a63500c94..000000000
--- a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-
-export interface MessageItemRequestBuilderGetQueryParameters {
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Include Hidden Messages
-     */
-    includeHiddenMessages?: string | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index a659064b4..000000000
--- a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {MessageItemRequestBuilderGetQueryParameters} from './messageItemRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageItemRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: MessageItemRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
deleted file mode 100644
index 00baca8f7..000000000
--- a/packages/test/generatedCode/users/item/messages/item/messageItemRequestBuilderPatchRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessageItemRequestBuilderPatchRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilder.ts
index a6f320a79..85b38e0fd 100644
--- a/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilder.ts
@@ -1,8 +1,30 @@
-import {ContentRequestBuilderGetRequestConfiguration} from './contentRequestBuilderGetRequestConfiguration';
-import {ContentRequestBuilderPutRequestConfiguration} from './contentRequestBuilderPutRequestConfiguration';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type ODataError } from '../../../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../../../models/oDataErrors/oDataError';
+import { BaseRequestBuilder, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface ContentRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
+export interface ContentRequestBuilderPutRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/$value
  */
@@ -19,13 +41,17 @@ export class ContentRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://learn.microsoft.com/graph/api/user-list-messages?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-get?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: ContentRequestBuilderGetRequestConfiguration | undefined) : Promise<ArrayBuffer | undefined> {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * Update media content for the navigation property messages in users
@@ -37,7 +63,11 @@ export class ContentRequestBuilder extends BaseRequestBuilder {
         const requestInfo = this.toPutRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendPrimitiveAsync<ArrayBuffer>(requestInfo, "ArrayBuffer", errorMapping);
     };
     /**
      * Get media content for the navigation property messages from users
@@ -74,4 +104,15 @@ export class ContentRequestBuilder extends BaseRequestBuilder {
         requestInfo.setStreamContent(body);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a ContentRequestBuilder
+     */
+    public withUrl(rawUrl: string) : ContentRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new ContentRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 10e67530a..000000000
--- a/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ContentRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
deleted file mode 100644
index 8a61d2a6d..000000000
--- a/packages/test/generatedCode/users/item/messages/item/value/contentRequestBuilderPutRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface ContentRequestBuilderPutRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
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 260bf1e9a..28c86e75e 100644
--- a/packages/test/generatedCode/users/item/messages/item/value/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/value/index.ts
@@ -1,2 +1 @@
-export * from './contentRequestBuilderGetRequestConfiguration'
-export * from './contentRequestBuilderPutRequestConfiguration'
+export * from './contentRequestBuilder'
diff --git a/packages/test/generatedCode/users/item/messages/messagesRequestBuilder.ts b/packages/test/generatedCode/users/item/messages/messagesRequestBuilder.ts
index 62125bf44..40557de49 100644
--- a/packages/test/generatedCode/users/item/messages/messagesRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/messages/messagesRequestBuilder.ts
@@ -1,16 +1,77 @@
-import {MessageCollectionResponse} from '../../../models/';
-import {createMessageCollectionResponseFromDiscriminatorValue} from '../../../models/createMessageCollectionResponseFromDiscriminatorValue';
-import {createMessageFromDiscriminatorValue} from '../../../models/createMessageFromDiscriminatorValue';
-import {deserializeIntoMessage} from '../../../models/deserializeIntoMessage';
-import type {Message} from '../../../models/message';
-import {serializeMessage} from '../../../models/serializeMessage';
-import {CountRequestBuilder} from './count/countRequestBuilder';
-import {MessageItemRequestBuilder} from './item/messageItemRequestBuilder';
-import {MessagesRequestBuilderGetRequestConfiguration} from './messagesRequestBuilderGetRequestConfiguration';
-import {MessagesRequestBuilderPostRequestConfiguration} from './messagesRequestBuilderPostRequestConfiguration';
-import type {Parsable, ParsableFactory, RequestAdapter, RequestOption} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder, HttpMethod, RequestInformation, getPathParameters} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { type MessageCollectionResponse } from '../../../models/';
+import { createMessageFromDiscriminatorValue, deserializeIntoMessage, serializeMessage, type Message } from '../../../models/message';
+import { createMessageCollectionResponseFromDiscriminatorValue } from '../../../models/messageCollectionResponse';
+import { type ODataError } from '../../../models/oDataErrors/';
+import { createODataErrorFromDiscriminatorValue, deserializeIntoODataError, serializeODataError } from '../../../models/oDataErrors/oDataError';
+import { CountRequestBuilder } from './count/countRequestBuilder';
+import { MessageItemRequestBuilder } from './item/messageItemRequestBuilder';
+import { BaseRequestBuilder, getPathParameters, HttpMethod, RequestInformation, type Parsable, type ParsableFactory, type RequestAdapter, type RequestOption } from '@microsoft/kiota-abstractions';
 
+export interface MessagesRequestBuilderGetQueryParameters {
+    /**
+     * Include count of items
+     */
+    count?: boolean;
+    /**
+     * Expand related entities
+     */
+    expand?: string[];
+    /**
+     * Filter items by property values
+     */
+    filter?: string;
+    /**
+     * Include Hidden Messages
+     */
+    includeHiddenMessages?: string;
+    /**
+     * Order items by property values
+     */
+    orderby?: string[];
+    /**
+     * Search items by search phrases
+     */
+    search?: string;
+    /**
+     * Select properties to be returned
+     */
+    select?: string[];
+    /**
+     * Skip the first n items
+     */
+    skip?: number;
+    /**
+     * Show only the first n items
+     */
+    top?: number;
+}
+export interface MessagesRequestBuilderGetRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+    /**
+     * Request query parameters
+     */
+    queryParameters?: MessagesRequestBuilderGetQueryParameters;
+}
+export interface MessagesRequestBuilderPostRequestConfiguration {
+    /**
+     * Request headers
+     */
+    headers?: Record<string, string[]>;
+    /**
+     * Request options
+     */
+    options?: RequestOption[];
+}
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages
  */
@@ -44,26 +105,34 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
      * 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
-     * @see {@link https://learn.microsoft.com/graph/api/user-list-messages?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-get?view=graph-rest-1.0|Find more info here}
      */
     public get(requestConfiguration?: MessagesRequestBuilderGetRequestConfiguration | undefined) : Promise<MessageCollectionResponse | undefined> {
         const requestInfo = this.toGetRequestInformation(
             requestConfiguration
         );
-        return this.requestAdapter.sendAsync<MessageCollectionResponse>(requestInfo, createMessageCollectionResponseFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<MessageCollectionResponse>(requestInfo, createMessageCollectionResponseFromDiscriminatorValue, errorMapping);
     };
     /**
-     * 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.
+     * 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 Message
-     * @see {@link https://learn.microsoft.com/graph/api/user-post-messages?view=graph-rest-1.0|Find more info here}
+     * @see {@link https://learn.microsoft.com/graph/api/opentypeextension-post-opentypeextension?view=graph-rest-1.0|Find more info here}
      */
     public post(body: Message, requestConfiguration?: MessagesRequestBuilderPostRequestConfiguration | undefined) : Promise<Message | undefined> {
         const requestInfo = this.toPostRequestInformation(
             body, requestConfiguration
         );
-        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, undefined);
+        const errorMapping = {
+            "4XX": createODataErrorFromDiscriminatorValue,
+            "5XX": createODataErrorFromDiscriminatorValue,
+        } as Record<string, ParsableFactory<Parsable>>;
+        return this.requestAdapter.sendAsync<Message>(requestInfo, createMessageFromDiscriminatorValue, errorMapping);
     };
     /**
      * The messages in a mailbox or folder. Read-only. Nullable.
@@ -84,7 +153,7 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
         return requestInfo;
     };
     /**
-     * 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.
+     * 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
@@ -103,4 +172,15 @@ export class MessagesRequestBuilder extends BaseRequestBuilder {
         requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body, serializeMessage);
         return requestInfo;
     };
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @returns a messagesRequestBuilder
+     */
+    public withUrl(rawUrl: string) : MessagesRequestBuilder {
+        if(!rawUrl) throw new Error("rawUrl cannot be undefined");
+        return new MessagesRequestBuilder(rawUrl, this.requestAdapter);
+    };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/item/messages/messagesRequestBuilderGetQueryParameters.ts b/packages/test/generatedCode/users/item/messages/messagesRequestBuilderGetQueryParameters.ts
deleted file mode 100644
index 56215b9f4..000000000
--- a/packages/test/generatedCode/users/item/messages/messagesRequestBuilderGetQueryParameters.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-
-export interface MessagesRequestBuilderGetQueryParameters {
-    /**
-     * Include count of items
-     */
-    count?: boolean | undefined;
-    /**
-     * Expand related entities
-     */
-    expand?: string[] | undefined;
-    /**
-     * Filter items by property values
-     */
-    filter?: string | undefined;
-    /**
-     * Include Hidden Messages
-     */
-    includeHiddenMessages?: string | undefined;
-    /**
-     * Order items by property values
-     */
-    orderby?: string[] | undefined;
-    /**
-     * Search items by search phrases
-     */
-    search?: string | undefined;
-    /**
-     * Select properties to be returned
-     */
-    select?: string[] | undefined;
-    /**
-     * Skip the first n items
-     */
-    skip?: number | undefined;
-    /**
-     * Show only the first n items
-     */
-    top?: number | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/messagesRequestBuilderGetRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
deleted file mode 100644
index 73034f00f..000000000
--- a/packages/test/generatedCode/users/item/messages/messagesRequestBuilderGetRequestConfiguration.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {MessagesRequestBuilderGetQueryParameters} from './messagesRequestBuilderGetQueryParameters';
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessagesRequestBuilderGetRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-    /**
-     * Request query parameters
-     */
-    queryParameters?: MessagesRequestBuilderGetQueryParameters | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/messages/messagesRequestBuilderPostRequestConfiguration.ts b/packages/test/generatedCode/users/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
deleted file mode 100644
index a6d72f7d2..000000000
--- a/packages/test/generatedCode/users/item/messages/messagesRequestBuilderPostRequestConfiguration.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {RequestOption} from '@microsoft/kiota-abstractions';
-
-export interface MessagesRequestBuilderPostRequestConfiguration {
-    /**
-     * Request headers
-     */
-    headers?: Record<string, string[]> | undefined;
-    /**
-     * Request options
-     */
-    options?: RequestOption[] | undefined;
-}
diff --git a/packages/test/generatedCode/users/item/userItemRequestBuilder.ts b/packages/test/generatedCode/users/item/userItemRequestBuilder.ts
index 270b213d9..feea7fb3f 100644
--- a/packages/test/generatedCode/users/item/userItemRequestBuilder.ts
+++ b/packages/test/generatedCode/users/item/userItemRequestBuilder.ts
@@ -1,8 +1,10 @@
-import {InferenceClassificationRequestBuilder} from './inferenceClassification/inferenceClassificationRequestBuilder';
-import {MailFoldersRequestBuilder} from './mailFolders/mailFoldersRequestBuilder';
-import {MessagesRequestBuilder} from './messages/messagesRequestBuilder';
-import type {RequestAdapter} from '@microsoft/kiota-abstractions';
-import {BaseRequestBuilder} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { InferenceClassificationRequestBuilder } from './inferenceClassification/inferenceClassificationRequestBuilder';
+import { MailFoldersRequestBuilder } from './mailFolders/mailFoldersRequestBuilder';
+import { MessagesRequestBuilder } from './messages/messagesRequestBuilder';
+import { BaseRequestBuilder, type RequestAdapter } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}
@@ -35,3 +37,5 @@ export class UserItemRequestBuilder extends BaseRequestBuilder {
         super(pathParameters, requestAdapter, "{+baseurl}/users/{user%2Did}");
     };
 }
+// tslint:enable
+// eslint-enable
diff --git a/packages/test/generatedCode/users/usersRequestBuilder.ts b/packages/test/generatedCode/users/usersRequestBuilder.ts
index 60d42aac5..7f64c5268 100644
--- a/packages/test/generatedCode/users/usersRequestBuilder.ts
+++ b/packages/test/generatedCode/users/usersRequestBuilder.ts
@@ -1,6 +1,8 @@
-import {UserItemRequestBuilder} from './item/userItemRequestBuilder';
-import {BaseRequestBuilder, getPathParameters} from '@microsoft/kiota-abstractions';
-import type {RequestAdapter} from '@microsoft/kiota-abstractions';
+// tslint:disable
+// eslint-disable
+// Generated by Microsoft Kiota
+import { UserItemRequestBuilder } from './item/userItemRequestBuilder';
+import { BaseRequestBuilder, getPathParameters, type RequestAdapter } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users
@@ -26,3 +28,5 @@ export class UsersRequestBuilder extends BaseRequestBuilder {
         super(pathParameters, requestAdapter, "{+baseurl}/users");
     };
 }
+// tslint:enable
+// eslint-enable

From 0bc9e9bea9e766d254bd91597f212270290f481e Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 10 Oct 2023 10:41:46 -0400
Subject: [PATCH 11/11] - fixes unit test after refreshed client

---
 packages/test/tests/getTest.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/test/tests/getTest.ts b/packages/test/tests/getTest.ts
index dab6ab549..5cc023e57 100644
--- a/packages/test/tests/getTest.ts
+++ b/packages/test/tests/getTest.ts
@@ -1,7 +1,7 @@
 import { apiClient } from "./testClient";
 
 import { assert } from "chai";
-import { type MessagesRequestBuilderGetQueryParameters } from "../generatedCode/users/item/messages/messagesRequestBuilderGetQueryParameters";
+import { type MessagesRequestBuilderGetQueryParameters } from "../generatedCode/users/item/messages";
 
 describe("TestGet", () => {