diff --git a/__tests__/unit/backend/helpers/generate-form-data.ts b/__tests__/unit/backend/helpers/generate-form-data.ts
index ef0b5793f1..bde03c077f 100644
--- a/__tests__/unit/backend/helpers/generate-form-data.ts
+++ b/__tests__/unit/backend/helpers/generate-form-data.ts
@@ -275,9 +275,12 @@ export const generateNewSingleAnswerResponse = (
   customParams?: Partial<ProcessedSingleAnswerResponse>,
 ): ProcessedSingleAnswerResponse => {
   if (
-    [BasicField.Attachment, BasicField.Table, BasicField.Checkbox].includes(
-      fieldType,
-    )
+    [
+      BasicField.Attachment,
+      BasicField.Table,
+      BasicField.Checkbox,
+      BasicField.Address,
+    ].includes(fieldType)
   ) {
     throw new Error(
       'Call the custom response generator functions for attachment, table and checkbox.',
diff --git a/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignContent/FieldRow/FieldRowContainer.tsx b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignContent/FieldRow/FieldRowContainer.tsx
index 55636375cc..67a1b7f96e 100644
--- a/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignContent/FieldRow/FieldRowContainer.tsx
+++ b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignContent/FieldRow/FieldRowContainer.tsx
@@ -23,6 +23,7 @@ import { useToast } from '~hooks/useToast'
 import IconButton from '~components/IconButton'
 import Tooltip from '~components/Tooltip'
 import {
+  AddressCompoundField,
   AttachmentField,
   CheckboxField,
   ChildrenCompoundField,
@@ -512,5 +513,7 @@ const FieldRow = ({ field, ...rest }: FieldRowProps) => {
       return <TableField schema={field} {...rest} />
     case BasicField.Children:
       return <ChildrenCompoundField schema={field} {...rest} />
+    case BasicField.Address:
+      return <AddressCompoundField schema={field} {...rest} />
   }
 }
diff --git a/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/EditFieldDrawer.tsx b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/EditFieldDrawer.tsx
index aaddf23aac..169cb46daa 100644
--- a/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/EditFieldDrawer.tsx
+++ b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/EditFieldDrawer.tsx
@@ -26,6 +26,7 @@ import {
   EditMyInfoChildren,
 } from './edit-fieldtype/EditMyInfoChildren'
 import {
+  EditAddress,
   EditAttachment,
   EditCheckbox,
   EditCountryRegion,
@@ -167,6 +168,8 @@ export const MemoFieldDrawerContent = memo<MemoFieldDrawerContentProps>(
         return <EditParagraph {...props} field={field} />
       case BasicField.Image:
         return <EditImage {...props} field={field} />
+      case BasicField.Address:
+        return <EditAddress {...props} field={field} />
       default:
         return <div>TODO: Insert field options here</div>
     }
diff --git a/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditAddress/EditAddress.stories.tsx b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditAddress/EditAddress.stories.tsx
new file mode 100644
index 0000000000..ee8815ec5a
--- /dev/null
+++ b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditAddress/EditAddress.stories.tsx
@@ -0,0 +1,57 @@
+import { Meta, StoryFn } from '@storybook/react'
+
+import { AddressCompoundFieldBase, BasicField } from '~shared/types'
+
+import { createFormBuilderMocks } from '~/mocks/msw/handlers/admin-form'
+
+import { EditFieldDrawerDecorator, StoryRouter } from '~utils/storybook'
+
+import { EditAddress, EditAddressProps } from './EditAddress'
+
+const DEFAULT_ADDRESS_FIELD: AddressCompoundFieldBase = {
+  title: 'Local address',
+  description: '',
+  required: true,
+  disabled: false,
+  fieldType: BasicField.Address,
+  globalId: 'unused',
+}
+
+export default {
+  title: 'Features/AdminForm/EditFieldDrawer/EditAddress',
+  component: EditAddress,
+  decorators: [
+    StoryRouter({
+      initialEntries: ['/61540ece3d4a6e50ac0cc6ff'],
+      path: '/:formId',
+    }),
+    EditFieldDrawerDecorator,
+  ],
+  parameters: {
+    // Required so skeleton "animation" does not hide content.
+    chromatic: { pauseAnimationAtEnd: true },
+    msw: createFormBuilderMocks({}, 0),
+  },
+  args: {
+    field: DEFAULT_ADDRESS_FIELD,
+  },
+} as Meta<EditAddressProps>
+
+interface StoryArgs {
+  field: AddressCompoundFieldBase
+}
+
+const Template: StoryFn<StoryArgs> = ({ field }) => {
+  return <EditAddress field={field} />
+}
+
+export const Default = Template.bind({})
+
+export const WithValues = Template.bind({})
+WithValues.args = {
+  field: {
+    ...DEFAULT_ADDRESS_FIELD,
+    title: 'Address Field Title',
+    description: 'Address Field Description',
+  },
+}
diff --git a/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditAddress/EditAddress.tsx b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditAddress/EditAddress.tsx
new file mode 100644
index 0000000000..69d1f2949e
--- /dev/null
+++ b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditAddress/EditAddress.tsx
@@ -0,0 +1,77 @@
+import { useMemo } from 'react'
+import { FormControl } from '@chakra-ui/react'
+import { extend, pick } from 'lodash'
+
+import { AddressCompoundFieldBase } from '~shared/types/field'
+
+import { createBaseValidationRules } from '~utils/fieldValidation'
+import FormErrorMessage from '~components/FormControl/FormErrorMessage'
+import FormLabel from '~components/FormControl/FormLabel'
+import Input from '~components/Input'
+import Textarea from '~components/Textarea'
+import Toggle from '~components/Toggle'
+
+import { CreatePageDrawerContentContainer } from '~features/admin-form/create/common'
+
+import { FormFieldDrawerActions } from '../common/FormFieldDrawerActions'
+import { EditFieldProps } from '../common/types'
+import { useEditFieldForm } from '../common/useEditFieldForm'
+
+export type EditAddressProps = EditFieldProps<AddressCompoundFieldBase>
+
+type EditAddressInputs = Pick<
+  AddressCompoundFieldBase,
+  'title' | 'description' | 'required'
+>
+
+export const EditAddress = ({ field }: EditAddressProps): JSX.Element => {
+  const {
+    register,
+    formState: { errors },
+    getValues,
+    buttonText,
+    handleUpdateField,
+    watch,
+    control,
+    clearErrors,
+    isLoading,
+    handleCancel,
+    setValue,
+  } = useEditFieldForm<EditAddressInputs, AddressCompoundFieldBase>({
+    field,
+    transform: {
+      input: (inputField) =>
+        pick(inputField, ['title', 'description', 'required']),
+      output: (formOutput, originalField) =>
+        extend({}, originalField, formOutput),
+    },
+  })
+
+  const requiredValidationRule = useMemo(
+    () => createBaseValidationRules({ required: true }),
+    [],
+  )
+  return (
+    <CreatePageDrawerContentContainer>
+      <FormControl isRequired isReadOnly={isLoading} isInvalid={!!errors.title}>
+        <FormLabel>Field Name</FormLabel>
+        <Input autoFocus {...register('title', requiredValidationRule)} />
+        <FormErrorMessage>{errors?.title?.message}</FormErrorMessage>
+      </FormControl>
+      <FormControl isReadOnly={isLoading} isInvalid={!!errors.description}>
+        <FormLabel>Description</FormLabel>
+        <Textarea {...register('description')} />
+        <FormErrorMessage>{errors?.description?.message}</FormErrorMessage>
+      </FormControl>
+      <FormControl isReadOnly={isLoading}>
+        <Toggle {...register('required')} label="Required" />
+      </FormControl>
+      <FormFieldDrawerActions
+        isLoading={isLoading}
+        buttonText={buttonText}
+        handleClick={handleUpdateField}
+        handleCancel={handleCancel}
+      />
+    </CreatePageDrawerContentContainer>
+  )
+}
diff --git a/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditAddress/index.ts b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditAddress/index.ts
new file mode 100644
index 0000000000..36343c400c
--- /dev/null
+++ b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditAddress/index.ts
@@ -0,0 +1 @@
+export { EditAddress } from './EditAddress'
diff --git a/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/index.ts b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/index.ts
index e88b152019..d2dd9b70ff 100644
--- a/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/index.ts
+++ b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/index.ts
@@ -1,3 +1,4 @@
+export * from './EditAddress'
 export * from './EditAttachment'
 export * from './EditCheckbox'
 export * from './EditCountryRegion'
diff --git a/frontend/src/features/admin-form/create/builder-and-design/constants.ts b/frontend/src/features/admin-form/create/builder-and-design/constants.ts
index 430c89ba6d..de469d9ece 100644
--- a/frontend/src/features/admin-form/create/builder-and-design/constants.ts
+++ b/frontend/src/features/admin-form/create/builder-and-design/constants.ts
@@ -27,6 +27,7 @@ export const BASIC_FIELDS_ORDERED = [
   BasicField.Email,
   BasicField.Mobile,
   BasicField.HomeNo,
+  BasicField.Address,
   BasicField.Date,
   BasicField.Image,
   BasicField.Table,
diff --git a/frontend/src/features/admin-form/create/builder-and-design/utils/fieldCreation.ts b/frontend/src/features/admin-form/create/builder-and-design/utils/fieldCreation.ts
index 0e818b8367..0eaf74dd11 100644
--- a/frontend/src/features/admin-form/create/builder-and-design/utils/fieldCreation.ts
+++ b/frontend/src/features/admin-form/create/builder-and-design/utils/fieldCreation.ts
@@ -212,6 +212,12 @@ export const getFieldCreationMeta = (fieldType: BasicField): FieldCreateDto => {
         ...baseMeta,
       }
     }
+    case BasicField.Address: {
+      return {
+        fieldType,
+        ...baseMeta,
+      }
+    }
   }
 }
 
diff --git a/frontend/src/features/admin-form/create/constants.ts b/frontend/src/features/admin-form/create/constants.ts
index 61b25c6783..0f72de6506 100644
--- a/frontend/src/features/admin-form/create/constants.ts
+++ b/frontend/src/features/admin-form/create/constants.ts
@@ -43,6 +43,7 @@ import {
   BiUser,
   BiUserVoice,
 } from 'react-icons/bi'
+import { SlLocationPin } from 'react-icons/sl'
 import { As } from '@chakra-ui/react'
 
 import { BasicField, MyInfoAttribute } from '~shared/types/field'
@@ -266,6 +267,12 @@ export const BASICFIELD_TO_DRAWER_META: {
     icon: BiGroup,
     isSubmitted: true,
   },
+
+  [BasicField.Address]: {
+    label: 'Local address',
+    icon: SlLocationPin,
+    isSubmitted: true,
+  },
 }
 
 const BiDummyIcon = BiCalendar // random icon that is not actually shown in app
diff --git a/frontend/src/features/public-form/PublicFormProvider.tsx b/frontend/src/features/public-form/PublicFormProvider.tsx
index 79bd1f6b77..6bfccf80fc 100644
--- a/frontend/src/features/public-form/PublicFormProvider.tsx
+++ b/frontend/src/features/public-form/PublicFormProvider.tsx
@@ -135,7 +135,6 @@ const transformFormInputCountryRegionToUpperCase =
         .filter((field) => field.fieldType === BasicField.CountryRegion)
         .map((field) => field._id),
     )
-
     return Object.keys(formInputs).reduce(
       (newFormInputs: typeof formInputs, fieldId) => {
         const currentInput = formInputs[fieldId]
diff --git a/frontend/src/features/public-form/PublicFormService.ts b/frontend/src/features/public-form/PublicFormService.ts
index 50aeaa73fa..fd50224cc8 100644
--- a/frontend/src/features/public-form/PublicFormService.ts
+++ b/frontend/src/features/public-form/PublicFormService.ts
@@ -186,7 +186,6 @@ export const submitEmailModeForm = async ({
     formInputs: filteredInputs,
     responseMetadata,
   })
-
   return ApiService.post<SubmissionResponseDto>(
     `${PUBLIC_FORMS_ENDPOINT}/${formId}/submissions/email`,
     formData,
@@ -272,7 +271,6 @@ export const submitStorageModeForm = async ({
     formInputs,
     formLogics,
   })
-
   const formData = createClearSubmissionWithVirusScanningFormData(
     {
       formFields,
@@ -285,7 +283,9 @@ export const submitStorageModeForm = async ({
     },
     fieldIdToQuarantineKeyMap,
   )
-
+  console.log('here i am')
+  console.log(formFields)
+  console.log(formData.get('body'))
   return ApiService.post<SubmissionResponseDto>(
     `${PUBLIC_FORMS_ENDPOINT}/${formId}/submissions/storage`,
     formData,
diff --git a/frontend/src/features/public-form/components/FormFields/FieldFactory.tsx b/frontend/src/features/public-form/components/FormFields/FieldFactory.tsx
index 2c433a3e44..aa58e1b426 100644
--- a/frontend/src/features/public-form/components/FormFields/FieldFactory.tsx
+++ b/frontend/src/features/public-form/components/FormFields/FieldFactory.tsx
@@ -4,6 +4,7 @@ import { BasicField } from '~shared/types/field'
 import { FormColorTheme, FormResponseMode } from '~shared/types/form'
 
 import {
+  AddressCompoundField,
   AttachmentField,
   CheckboxField,
   ChildrenCompoundField,
@@ -119,6 +120,8 @@ export const FieldFactory = memo(
         return <ImageField schema={field} {...rest} />
       case BasicField.Table:
         return <TableField schema={field} {...rest} />
+      case BasicField.Address:
+        return <AddressCompoundField schema={field} {...rest} />
       case BasicField.Children:
         return (
           <ChildrenCompoundField
diff --git a/frontend/src/features/public-form/utils/createSubmission.ts b/frontend/src/features/public-form/utils/createSubmission.ts
index f550a7b617..9ac6c893d5 100644
--- a/frontend/src/features/public-form/utils/createSubmission.ts
+++ b/frontend/src/features/public-form/utils/createSubmission.ts
@@ -163,6 +163,7 @@ export const createClearSubmissionWithVirusScanningFormData = (
       return response
     },
   )
+
   const attachments = getAttachmentsMap(formFields, formInputs)
 
   // Convert content to FormData object.
@@ -174,7 +175,6 @@ export const createClearSubmissionWithVirusScanningFormData = (
       ...formDataArgsRest,
     }),
   )
-
   if (!isEmpty(attachments)) {
     forOwn(attachments, (attachment, fieldId) => {
       if (attachment) {
@@ -281,6 +281,17 @@ const createResponsesV3 = (
         } as FieldResponseV3
         break
       }
+      case BasicField.Address: {
+        const input = formInputs[ff._id] as
+          | FormFieldValue<typeof ff.fieldType>
+          | undefined
+        if (!input) break
+        returnedInputs[ff._id] = {
+          fieldType: ff.fieldType,
+          answer: input,
+        } as FieldResponseV3
+        break
+      }
       case BasicField.Email:
       case BasicField.Mobile: {
         const input = formInputs[ff._id] as
diff --git a/frontend/src/features/public-form/utils/inputTransformation.ts b/frontend/src/features/public-form/utils/inputTransformation.ts
index c6a2bbf2ab..9b0c7b059d 100644
--- a/frontend/src/features/public-form/utils/inputTransformation.ts
+++ b/frontend/src/features/public-form/utils/inputTransformation.ts
@@ -1,8 +1,10 @@
+import { Address } from 'cluster'
 import { format, parse } from 'date-fns'
 import { times } from 'lodash'
 
 import { DATE_PARSE_FORMAT } from '~shared/constants/dates'
 import {
+  AddressCompoundFieldResponseV3,
   AttachmentFieldResponseV3,
   CheckboxFieldResponsesV3,
   ChildrenCompoundFieldResponsesV3,
@@ -12,8 +14,14 @@ import {
   VerifiableFieldResponseV3,
   YesNoFieldResponseV3,
 } from '~shared/types'
-import { BasicField, FormFieldDto } from '~shared/types/field'
 import {
+  AddressAttributes,
+  BasicField,
+  FormFieldDto,
+} from '~shared/types/field'
+import {
+  AddressResponse,
+  AddressSubField,
   AttachmentResponse,
   CheckboxResponse,
   ChildBirthRecordsResponse,
@@ -29,6 +37,8 @@ import { CHECKBOX_OTHERS_INPUT_VALUE } from '~templates/Field/Checkbox/constants
 import { RADIO_OTHERS_INPUT_VALUE } from '~templates/Field/Radio/constants'
 import { createTableRow } from '~templates/Field/Table/utils/createRow'
 import {
+  AddressCompoundFieldSchema,
+  AddressCompoundFieldValues,
   AttachmentFieldSchema,
   BaseFieldOutput,
   CheckboxFieldSchema,
@@ -217,6 +227,25 @@ const transformToChildOutput = (
   }
 }
 
+const transformToAddressOutput = (
+  schema: AddressCompoundFieldSchema,
+  input?: AddressCompoundFieldValues | AddressCompoundFieldResponseV3,
+): AddressResponse => {
+  console.log(input?.addressSubFields)
+  // const answerArray: AddressSubField[] = []
+  const answerArray: string[][] = []
+  if (input !== undefined) {
+    Object.entries(input.addressSubFields).map(([key, value]) => {
+      // answerArray.push({ key: key, value: value })
+      answerArray.push([`${key}:${value}`])
+    })
+  }
+  return {
+    ...pickBaseOutputFromSchema(schema),
+    answerArray,
+  }
+}
+
 type FormFieldValueOrFieldResponseAnswerV3<T extends BasicField> =
   | FormFieldValue<T>
   | FieldResponseAnswerMapV3<T>
@@ -296,5 +325,10 @@ export const transformInputsToOutputs = (
         field,
         input as FormFieldValueOrFieldResponseAnswerV3<typeof field.fieldType>,
       )
+    case BasicField.Address:
+      return transformToAddressOutput(
+        field,
+        input as FormFieldValueOrFieldResponseAnswerV3<typeof field.fieldType>,
+      )
   }
 }
diff --git a/frontend/src/features/public-form/utils/validateResponses.ts b/frontend/src/features/public-form/utils/validateResponses.ts
index 9443dd5434..bdaf410a67 100644
--- a/frontend/src/features/public-form/utils/validateResponses.ts
+++ b/frontend/src/features/public-form/utils/validateResponses.ts
@@ -1,4 +1,5 @@
 import {
+  AddressResponse,
   AttachmentResponse,
   BasicField,
   CheckboxResponse,
@@ -89,6 +90,8 @@ export const validateResponses = (responses: unknown): FieldResponse[] => {
         return YesNoResponse.parse(response)
       case BasicField.Children:
         return ChildBirthRecordsResponse.parse(response)
+      case BasicField.Address:
+        return AddressResponse.parse(response)
       default:
         throw new Error(
           `Invalid fieldType provided for response validation: ${response.fieldType}`,
diff --git a/frontend/src/services/ApiService.ts b/frontend/src/services/ApiService.ts
index e4c50470a2..c80dc9e541 100644
--- a/frontend/src/services/ApiService.ts
+++ b/frontend/src/services/ApiService.ts
@@ -109,6 +109,7 @@ export const processFetchResponse = async (response: Response) => {
       throw new Error(`Non-2XX response: ${response.status}`)
     } else {
       const data = await response.json()
+      // console.log(data)
       return data
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/frontend/src/templates/Field/Address/AddressField.stories.tsx b/frontend/src/templates/Field/Address/AddressField.stories.tsx
new file mode 100644
index 0000000000..79ba98d0c0
--- /dev/null
+++ b/frontend/src/templates/Field/Address/AddressField.stories.tsx
@@ -0,0 +1,211 @@
+import { useEffect, useState } from 'react'
+import { FormProvider, useForm } from 'react-hook-form'
+import { Text } from '@chakra-ui/react'
+import { Meta, StoryFn } from '@storybook/react'
+import { userEvent, within } from '@storybook/test'
+
+import { BasicField } from '~shared/types/field'
+
+import Button from '~components/Button'
+
+import { AddressCompoundFieldInput, AddressCompoundFieldSchema } from '../types'
+
+import {
+  AddressCompoundField as AddressFieldComponent,
+  AddressCompoundFieldProps,
+} from './AddressField'
+
+const baseSchema: AddressCompoundFieldSchema = {
+  title: 'Local address',
+  description: '',
+  required: true,
+  disabled: false,
+  fieldType: BasicField.Address,
+  _id: 'random-address-id',
+}
+
+export default {
+  title: 'Templates/Field/Address',
+  component: AddressFieldComponent,
+  decorators: [],
+  parameters: {
+    docs: {
+      // Required in this story due to react-hook-form conflicting with
+      // Storybook somehow.
+      // See https://github.com/storybookjs/storybook/issues/12747.
+      source: {
+        type: 'code',
+      },
+    },
+  },
+  args: {
+    schema: baseSchema,
+  },
+} as Meta
+
+interface StoryAddressFieldProps extends AddressCompoundFieldProps {
+  defaultValue?: AddressCompoundFieldInput
+  apiError?: string | null
+}
+
+const Template: StoryFn<StoryAddressFieldProps> = ({
+  defaultValue,
+  ...args
+}) => {
+  const formMethods = useForm<AddressCompoundFieldInput>({
+    defaultValues: defaultValue,
+  })
+
+  const [submitValues, setSubmitValues] = useState<string>()
+
+  // const onSubmit = (data: unknown) => alert(JSON.stringify(data))
+  const onSubmit = (values: AddressCompoundFieldInput) => {
+    const fieldValue = values[args.schema._id]?.addressSubFields || {}
+    const hasValues = Object.values(fieldValue).some((val) => val?.trim())
+    setSubmitValues(
+      hasValues ? JSON.stringify(fieldValue) : 'Nothing was selected',
+    )
+  }
+  return (
+    <FormProvider {...formMethods}>
+      <form onSubmit={formMethods.handleSubmit(onSubmit)} noValidate>
+        <AddressFieldComponent {...args} />
+        <Button
+          mt="1rem"
+          type="submit"
+          isLoading={formMethods.formState.isSubmitting}
+          loadingText="Submitting"
+        >
+          Submit
+        </Button>
+        {submitValues && <Text>You have submitted: {submitValues}</Text>}
+      </form>
+    </FormProvider>
+  )
+}
+
+export const WithValues = Template.bind({})
+WithValues.args = {
+  schema: baseSchema,
+  defaultValue: {
+    [baseSchema._id]: {
+      addressSubFields: {
+        postalCode: '123456',
+        blockNumber: '1',
+        streetName: 'Bukit Batok Street',
+        buildingName: '50',
+        levelNumber: '04',
+        unitNumber: '5A',
+      },
+    },
+  },
+}
+
+export const ValidationRequired = Template.bind({})
+ValidationRequired.args = {
+  schema: baseSchema,
+  defaultValue: {
+    [baseSchema._id]: {
+      addressSubFields: {
+        postalCode: '',
+        blockNumber: '',
+        streetName: '',
+        buildingName: '',
+        levelNumber: '',
+        unitNumber: '',
+      },
+    },
+  },
+}
+
+export const ValidationNotRequired = Template.bind({})
+ValidationNotRequired.args = {
+  schema: { ...baseSchema, required: false },
+  // defaultValue: {
+  //   [baseSchema._id]: {
+  //     addressSubFields: {
+  //       postalCode: '',
+  //       blockNumber: '',
+  //       streetName: '',
+  //       buildingName: '',
+  //       levelNumber: '',
+  //       unitNumber: '',
+  //     },
+  //   },
+  // },
+}
+
+export const InvalidPostalCode = Template.bind({})
+InvalidPostalCode.args = {
+  schema: baseSchema,
+  defaultValue: {
+    [baseSchema._id]: {
+      addressSubFields: {
+        postalCode: '123az#$%',
+        blockNumber: '',
+        streetName: '',
+        buildingName: '',
+        levelNumber: '',
+        unitNumber: '',
+      },
+    },
+  },
+}
+
+export const InvalidBlockAndUnit = Template.bind({})
+InvalidBlockAndUnit.args = {
+  schema: baseSchema,
+  defaultValue: {
+    [baseSchema._id]: {
+      addressSubFields: {
+        postalCode: '123456',
+        blockNumber: '%1',
+        streetName: 'Bukit Batok Street',
+        buildingName: '50',
+        levelNumber: '04',
+        unitNumber: '5A@',
+      },
+    },
+  },
+}
+
+export const InvalidLevelUnit = Template.bind({})
+InvalidLevelUnit.args = {
+  schema: baseSchema,
+  defaultValue: {
+    [baseSchema._id]: {
+      addressSubFields: {
+        postalCode: '123456',
+        blockNumber: '1',
+        streetName: 'Bukit Batok Street',
+        buildingName: '50',
+        levelNumber: '04#',
+        unitNumber: '5A',
+      },
+    },
+  },
+}
+
+export const ValidPostalCodeApiFail = Template.bind({})
+ValidPostalCodeApiFail.args = {
+  schema: baseSchema,
+  defaultValue: {
+    [baseSchema._id]: {
+      addressSubFields: {
+        postalCode: '000000',
+        blockNumber: '',
+        streetName: '',
+        buildingName: '',
+        levelNumber: '',
+        unitNumber: '',
+      },
+    },
+  },
+}
+
+ValidPostalCodeApiFail.play = async ({ canvasElement }) => {
+  const canvas = within(canvasElement)
+
+  // Simulate clicking the "Submit" button
+  userEvent.click(canvas.getByRole('button', { name: /Find Address/i }))
+}
diff --git a/frontend/src/templates/Field/Address/AddressField.test.tsx b/frontend/src/templates/Field/Address/AddressField.test.tsx
new file mode 100644
index 0000000000..c172a911fe
--- /dev/null
+++ b/frontend/src/templates/Field/Address/AddressField.test.tsx
@@ -0,0 +1,90 @@
+import { composeStories } from '@storybook/react'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { vi } from 'vitest'
+
+import {
+  INVALID_BLOCK_UNIT_ERROR,
+  INVALID_POSTAL_CODE_ERROR,
+  VALID_POSTAL_CODE_NO_ADDRESS_ERROR,
+} from '~shared/utils/address-validation'
+
+import { REQUIRED_ERROR } from '~constants/validation'
+
+import { verifyAddress } from '../../../../../src/app/services/address/address.service'
+
+import * as stories from './AddressField.stories'
+
+const {
+  ValidationRequired,
+  ValidationNotRequired,
+  InvalidPostalCode,
+  InvalidLevelUnit,
+  ValidPostalCodeApiFail,
+} = composeStories(stories)
+
+// Mock the verifyAddress function
+vi.mock('../../../../../src/app/services/address/address.service', () => ({
+  verifyAddress: vi.fn(),
+}))
+
+describe('validation required', () => {
+  it('renders error when field is not filled before submitting', async () => {
+    // Arrange
+    const user = userEvent.setup()
+    render(<ValidationRequired />)
+    const submitButton = screen.getByText('Submit')
+
+    // Act
+    await user.click(submitButton)
+
+    // Assert
+    // Should show error message.
+    const error = screen.getAllByText(REQUIRED_ERROR)
+    expect(error).toHaveLength(3)
+  })
+
+  it('renders success when field is not required & inputs are empty', async () => {
+    const user = userEvent.setup()
+    render(<ValidationNotRequired />)
+    const submitButton = screen.getByText('Submit')
+
+    await user.click(submitButton)
+
+    const success = screen.getByText('You have submitted: Nothing was selected')
+    expect(success).not.toBeNull()
+  })
+
+  it('renders invalid postal code error when postalCode has invalid format', async () => {
+    const user = userEvent.setup()
+    render(<InvalidPostalCode />)
+    const submitButton = screen.getByText('Submit')
+
+    await user.click(submitButton)
+    const error = screen.queryByText(INVALID_POSTAL_CODE_ERROR)
+    expect(error).not.toBeNull()
+  })
+
+  it('renders invalid block/unit number when input has special characters', async () => {
+    const user = userEvent.setup()
+    render(<InvalidLevelUnit />)
+    const submitButton = screen.getByText('Submit')
+
+    await user.click(submitButton)
+    const error = screen.queryByText(INVALID_BLOCK_UNIT_ERROR)
+    expect(error).not.toBeNull()
+  })
+
+  it('renders failed api resp when api fails to grab address info', async () => {
+    ;(verifyAddress as jest.Mock).mockResolvedValue({
+      success: false,
+    })
+    const user = userEvent.setup()
+    render(<ValidPostalCodeApiFail />)
+    const verifyButton = screen.getByRole('button', { name: /Find Address/i })
+
+    await user.click(verifyButton)
+    const error = screen.getAllByText(VALID_POSTAL_CODE_NO_ADDRESS_ERROR)
+    expect(error).toHaveLength(2)
+  })
+})
diff --git a/frontend/src/templates/Field/Address/AddressField.tsx b/frontend/src/templates/Field/Address/AddressField.tsx
new file mode 100644
index 0000000000..029dc8285f
--- /dev/null
+++ b/frontend/src/templates/Field/Address/AddressField.tsx
@@ -0,0 +1,310 @@
+import { useEffect, useMemo, useState } from 'react'
+import {
+  Controller,
+  FieldArrayWithId,
+  RegisterOptions,
+  useFieldArray,
+  useForm,
+  useFormContext,
+  useFormState,
+} from 'react-hook-form'
+import { Box, Flex, FormControl, Stack } from '@chakra-ui/react'
+
+import { AddressAttributes } from '~shared/types'
+import {
+  VALID_POSTAL_CODE_NO_ADDRESS_ERROR,
+  validatePostalCode,
+} from '~shared/utils/address-validation'
+
+import {
+  createBlockNumberValidationRules,
+  createPostalCodeValidationRules,
+  createStreetNameValidationRules,
+  createUnitLevelNumberValidationRules,
+} from '~utils/fieldValidation'
+import Button from '~components/Button'
+import FormErrorMessage from '~components/FormControl/FormErrorMessage'
+import FormLabel from '~components/FormControl/FormLabel'
+import Input from '~components/Input'
+
+import { verifyAddress } from '../../../../../src/app/services/address/address.service'
+import { BaseFieldProps } from '../FieldContainer'
+import { AddressCompoundFieldInput, AddressCompoundFieldSchema } from '../types'
+
+export interface AddressCompoundFieldProps extends BaseFieldProps {
+  schema: AddressCompoundFieldSchema
+  disableRequiredValidation?: boolean
+}
+
+export const AddressCompoundField = ({
+  schema,
+  disableRequiredValidation,
+}: AddressCompoundFieldProps): JSX.Element => {
+  const formContext = useFormContext<AddressCompoundFieldInput>()
+  const { getValues, setValue, trigger, setError } = formContext
+  const { isSubmitting, isValid, errors } =
+    useFormState<AddressCompoundFieldInput>({
+      name: schema._id,
+    })
+  const addressSubFieldErrors = errors?.[schema._id]?.addressSubFields // only one (first) set of address values
+
+  const postalCodeValidationRules = useMemo(
+    () => createPostalCodeValidationRules(schema, disableRequiredValidation),
+    [schema, disableRequiredValidation],
+  )
+
+  const blockNumberValidationRules = useMemo(
+    () => createBlockNumberValidationRules(schema, disableRequiredValidation),
+    [schema, disableRequiredValidation],
+  )
+
+  const streetNameValidationRules = useMemo(
+    () => createStreetNameValidationRules(schema, disableRequiredValidation),
+    [schema, disableRequiredValidation],
+  )
+
+  const unitLevelNumberValidationRules = useMemo(
+    () => createUnitLevelNumberValidationRules(schema),
+    [schema],
+  )
+
+  const [isButtonDisabled, setIsButtonDisabled] = useState(false)
+
+  const handleVerifyAddress = async () => {
+    setIsButtonDisabled(true)
+
+    const postalCode = getValues(`${schema._id}.addressSubFields.postalCode`)
+
+    if (validatePostalCode(postalCode) !== true) {
+      await trigger(['postalCode'])
+    } else {
+      // Call the service to verify the address
+      const result = await verifyAddress(postalCode)
+
+      if (result.success && result.data) {
+        setValue(
+          `${schema._id}.addressSubFields.blockNumber`,
+          result.data?.blockNumber,
+        )
+        setValue(
+          `${schema._id}.addressSubFields.streetName`,
+          result.data?.streetName,
+        )
+        await trigger(['blockNumber', 'streetName']) // clear errors if first verification failed
+      } else {
+        if (!result.success) {
+          setError(`${schema._id}.addressSubFields.blockNumber`, {
+            type: 'manual',
+            message: VALID_POSTAL_CODE_NO_ADDRESS_ERROR,
+          })
+          setError(`${schema._id}.addressSubFields.streetName`, {
+            type: 'manual',
+            message: VALID_POSTAL_CODE_NO_ADDRESS_ERROR,
+          })
+          setValue(`${schema._id}.addressSubFields.blockNumber`, '') // reset values if verification failure
+          setValue(`${schema._id}.addressSubFields.streetName`, '')
+          await trigger(['postalCode']) // show postalCode error upon verification failure
+        }
+      }
+    }
+
+    // disable verify address button to handle throttling
+    setTimeout(() => {
+      setIsButtonDisabled(false)
+    }, 2000)
+  }
+
+  return (
+    <Box>
+      <FormLabel
+        isRequired={schema.required}
+        questionNumber={
+          schema.questionNumber ? `${schema.questionNumber}.` : undefined
+        }
+        description={schema.description}
+      >
+        {schema.title}
+      </FormLabel>
+      {/** Postal Code */}
+      <FormControl
+        isRequired={schema.required}
+        isDisabled={schema.disabled}
+        isReadOnly={isValid && isSubmitting}
+        id={`${schema._id}-postalCode`}
+        isInvalid={!!addressSubFieldErrors?.postalCode}
+      >
+        <FormLabel isRequired>Postal code</FormLabel>
+        <Controller
+          name={`${schema._id}.addressSubFields.postalCode`}
+          control={formContext.control}
+          // defaultValue="" // error but still works?
+          defaultValue=""
+          rules={postalCodeValidationRules}
+          render={({ field }) => {
+            return (
+              <Stack direction="column" gap={0.5} marginBottom="1.5rem">
+                <Flex
+                  direction="row"
+                  gap={2}
+                  justify="space-between"
+                  width="100%"
+                >
+                  <Input
+                    {...field}
+                    aria-label={`${schema.questionNumber}. Postal Code`}
+                    placeholder="e.g. 650161"
+                  />
+                  <Button
+                    onClick={handleVerifyAddress}
+                    isLoading={isSubmitting}
+                    isDisabled={isButtonDisabled}
+                  >
+                    Find address
+                  </Button>
+                </Flex>
+                <FormErrorMessage>
+                  {addressSubFieldErrors?.postalCode?.message}
+                </FormErrorMessage>
+              </Stack>
+            )
+          }}
+        />
+      </FormControl>
+      {/** Block Number */}
+      <FormControl
+        isRequired={schema.required}
+        isDisabled={schema.disabled}
+        isReadOnly={isValid && isSubmitting}
+        id={`${schema._id}-blockNumber`}
+        isInvalid={!!addressSubFieldErrors?.blockNumber}
+      >
+        <FormLabel isRequired>Block number</FormLabel>
+        <Controller
+          name={`${schema._id}.addressSubFields.blockNumber`}
+          control={formContext.control}
+          defaultValue=""
+          rules={blockNumberValidationRules}
+          render={({ field }) => (
+            <Stack direction="column" gap={0.5} marginBottom="1.5rem">
+              <Input
+                {...field}
+                aria-label={`${schema.questionNumber}. Block Number`}
+                placeholder="e.g. 161"
+              />
+              <FormErrorMessage>
+                {addressSubFieldErrors?.blockNumber?.message}
+              </FormErrorMessage>
+            </Stack>
+          )}
+        />
+      </FormControl>
+      {/** Street Name */}
+      <FormControl
+        id={`${schema._id}-streetName`}
+        isRequired={schema.required}
+        isDisabled={schema.disabled}
+        isReadOnly={isValid && isSubmitting}
+        isInvalid={!!addressSubFieldErrors?.streetName}
+      >
+        <FormLabel isRequired>Street name</FormLabel>
+        <Controller
+          name={`${schema._id}.addressSubFields.streetName`}
+          control={formContext.control}
+          defaultValue=""
+          rules={streetNameValidationRules}
+          render={({ field }) => (
+            <Box marginBottom="1.5rem">
+              <Input
+                {...field}
+                aria-label={`${schema.questionNumber}. Street name`}
+                placeholder="e.g. Bukit Batok Street 11"
+              />
+              <FormErrorMessage>
+                {addressSubFieldErrors?.streetName?.message}
+              </FormErrorMessage>
+            </Box>
+          )}
+        />
+      </FormControl>
+      {/** Building name */}
+      <FormControl
+        id={`${schema._id}-buildingName`}
+        isRequired={false} // buildingName will always be optional
+        isDisabled={schema.disabled}
+        isReadOnly={isValid && isSubmitting}
+        isInvalid={!!addressSubFieldErrors?.buildingName}
+      >
+        <FormLabel>Building name</FormLabel>
+        <Controller
+          name={`${schema._id}.addressSubFields.buildingName`}
+          control={formContext.control}
+          defaultValue=""
+          render={({ field }) => (
+            <Box marginBottom="1.5rem">
+              <Input
+                {...field}
+                aria-label={`${schema.questionNumber}. Building name`}
+              />
+            </Box>
+          )}
+        />
+      </FormControl>
+      {/** Unit Number & Level Number */}
+      <FormLabel>Unit number</FormLabel>
+      <Flex direction="row" gap={2} width="100%">
+        <FormControl
+          id={`${schema._id}-levelNumber`}
+          isRequired={false} // unitNumber will always be optional
+          isDisabled={schema.disabled}
+          isReadOnly={isValid && isSubmitting}
+          isInvalid={!!addressSubFieldErrors?.levelNumber}
+        >
+          <Controller
+            name={`${schema._id}.addressSubFields.levelNumber`}
+            control={formContext.control}
+            defaultValue=""
+            rules={unitLevelNumberValidationRules}
+            render={({ field }) => (
+              <Stack direction="column" gap={0.5}>
+                <Input
+                  {...field}
+                  aria-label={`${schema.questionNumber}. Level number`}
+                  placeholder="Level number"
+                />
+                <FormErrorMessage>
+                  {addressSubFieldErrors?.levelNumber?.message}
+                </FormErrorMessage>
+              </Stack>
+            )}
+          />
+        </FormControl>
+        <FormControl
+          id={`${schema._id}-unitNumber`}
+          isRequired={false} // unitNumber will always be optional
+          isDisabled={schema.disabled}
+          isReadOnly={isValid && isSubmitting}
+          isInvalid={!!addressSubFieldErrors?.unitNumber}
+        >
+          <Controller
+            name={`${schema._id}.addressSubFields.unitNumber`}
+            control={formContext.control}
+            defaultValue=""
+            rules={unitLevelNumberValidationRules}
+            render={({ field }) => (
+              <Stack direction="column" gap={0.5}>
+                <Input
+                  {...field}
+                  aria-label={`${schema.questionNumber}. Unit Number`}
+                  placeholder="Unit number"
+                />
+                <FormErrorMessage>
+                  {addressSubFieldErrors?.unitNumber?.message}
+                </FormErrorMessage>
+              </Stack>
+            )}
+          />
+        </FormControl>
+      </Flex>
+    </Box>
+  )
+}
diff --git a/frontend/src/templates/Field/Address/index.ts b/frontend/src/templates/Field/Address/index.ts
new file mode 100644
index 0000000000..159ea5ec46
--- /dev/null
+++ b/frontend/src/templates/Field/Address/index.ts
@@ -0,0 +1 @@
+export { AddressCompoundField as default } from './AddressField'
diff --git a/frontend/src/templates/Field/ChildrenCompound/ChildrenCompoundField.tsx b/frontend/src/templates/Field/ChildrenCompound/ChildrenCompoundField.tsx
index ed763a3d32..9616897c6f 100644
--- a/frontend/src/templates/Field/ChildrenCompound/ChildrenCompoundField.tsx
+++ b/frontend/src/templates/Field/ChildrenCompound/ChildrenCompoundField.tsx
@@ -259,7 +259,7 @@ const ChildrenBody = ({
   }, [myInfoChildrenBirthRecords, allChildren, allSelectedNames])
 
   const childNameValues = useMemo(() => {
-    return [childName, ...namesNotSelected()].filter((name) => {
+    return [childName, ...namesNotSelected(), 'test'].filter((name) => {
       if (name === '' || name === undefined) {
         return false
       } else return true
diff --git a/frontend/src/templates/Field/index.ts b/frontend/src/templates/Field/index.ts
index 9f2eac2ab0..d9a2beb015 100644
--- a/frontend/src/templates/Field/index.ts
+++ b/frontend/src/templates/Field/index.ts
@@ -1,3 +1,4 @@
+import AddressCompoundField from './Address'
 import AttachmentField from './Attachment'
 import CheckboxField from './Checkbox'
 import ChildrenCompoundField from './ChildrenCompound'
@@ -27,6 +28,7 @@ export * from './types'
 const SectionField = SectionFieldContainer
 
 export {
+  AddressCompoundField,
   AttachmentField,
   CheckboxField,
   ChildrenCompoundField,
diff --git a/frontend/src/templates/Field/types.ts b/frontend/src/templates/Field/types.ts
index 85a9f5fded..5f08d639d5 100644
--- a/frontend/src/templates/Field/types.ts
+++ b/frontend/src/templates/Field/types.ts
@@ -11,6 +11,8 @@ import {
   VerifiableResponseBase,
 } from '~shared/types'
 import {
+  AddressAttributes,
+  AddressCompoundFieldBase,
   AttachmentFieldBase,
   BasicField,
   CheckboxFieldBase,
@@ -61,6 +63,7 @@ export type FormFieldValues = Record<
   [PAYMENT_PRODUCT_FIELD_ID]?: ProductItemInput[]
 }
 
+export type AddressCompoundFieldInput = FieldInput<AddressCompoundFieldValues>
 export type AttachmentFieldInput = FieldInput<File | null>
 export type CheckboxFieldInputs = FieldInput<CheckboxFieldValues>
 export type RadioFieldInputs = FieldInput<RadioFieldValues>
@@ -98,7 +101,9 @@ export type FormFieldValue<F extends BasicField = BasicField> = F extends
               ? CheckboxFieldValues
               : F extends BasicField.Children
                 ? ChildrenCompoundFieldValues
-                : never
+                : F extends BasicField.Address
+                  ? AddressCompoundFieldValues
+                  : never
 
 // Input values, what each field contains
 export type SingleAnswerValue = string
@@ -143,12 +148,18 @@ export type ChildrenCompoundFieldValues = {
   childFields: MyInfoChildAttributes[]
 }
 
+export type AddressCompoundFieldValues = {
+  addressSubFields: AddressAttributes
+}
+
 // Various schemas used by different fields
 export type SectionFieldSchema = FormFieldWithId<SectionFieldBase>
 export type ParagraphFieldSchema = FormFieldWithId<StatementFieldBase>
 export type ImageFieldSchema = FormFieldWithId<ImageFieldBase>
 
 // With question number
+export type AddressCompoundFieldSchema =
+  FormFieldWithQuestionNo<AddressCompoundFieldBase>
 export type AttachmentFieldSchema = FormFieldWithQuestionNo<AttachmentFieldBase>
 export type CheckboxFieldSchema = FormFieldWithQuestionNo<CheckboxFieldBase>
 export type DateFieldSchema = FormFieldWithQuestionNo<DateFieldBase>
diff --git a/frontend/src/utils/fieldValidation.ts b/frontend/src/utils/fieldValidation.ts
index 6e45f3cada..efead264f2 100644
--- a/frontend/src/utils/fieldValidation.ts
+++ b/frontend/src/utils/fieldValidation.ts
@@ -10,6 +10,7 @@ import validator from 'validator'
 
 import { DATE_PARSE_FORMAT } from '~shared/constants/dates'
 import {
+  AddressCompoundFieldBase,
   AttachmentFieldBase,
   BasicField,
   CheckboxFieldBase,
@@ -33,6 +34,10 @@ import {
   TextSelectedValidation,
   UenFieldBase,
 } from '~shared/types/field'
+import {
+  validateBlockUnit,
+  validatePostalCode,
+} from '~shared/utils/address-validation'
 import { isDateAnInvalidDay } from '~shared/utils/date-validation'
 import { isMFinSeriesValid, isNricValid } from '~shared/utils/nric-validation'
 import {
@@ -209,6 +214,65 @@ export const createHomeNoValidationRules: ValidationRuleFn<HomenoFieldBase> = (
   }
 }
 
+export const createPostalCodeValidationRules: ValidationRuleFn<
+  AddressCompoundFieldBase
+> = (schema, disableRequiredValidation): RegisterOptions => {
+  return {
+    validate: {
+      required: requiredSingleAnswerValidationFn(
+        schema,
+        disableRequiredValidation,
+      ),
+      validPostalCode: (value: string) => {
+        if (!schema.required && value == '') return true // if optional and empty, skip postal code validity //TODO fix
+        return validatePostalCode(value)
+      },
+    },
+  }
+}
+
+export const createBlockNumberValidationRules: ValidationRuleFn<
+  AddressCompoundFieldBase
+> = (schema, disableRequiredValidation): RegisterOptions => {
+  return {
+    validate: {
+      required: requiredSingleAnswerValidationFn(
+        schema,
+        disableRequiredValidation,
+      ),
+      validBlock: (value: string) => {
+        // Otherwise, run the standard validation logic
+        return validateBlockUnit(value)
+      },
+    },
+  }
+}
+
+export const createStreetNameValidationRules: ValidationRuleFn<
+  AddressCompoundFieldBase
+> = (schema, disableRequiredValidation): RegisterOptions => {
+  return {
+    validate: {
+      required: requiredSingleAnswerValidationFn(
+        schema,
+        disableRequiredValidation,
+      ),
+    },
+  }
+}
+
+export const createUnitLevelNumberValidationRules: ValidationRuleFn<
+  AddressCompoundFieldBase
+> = (): RegisterOptions => {
+  return {
+    validate: {
+      validUnitLevel: (value: string) => {
+        return validateBlockUnit(value)
+      },
+    },
+  }
+}
+
 export const createMobileValidationRules: ValidationRuleFnEmailAndMobile<
   MobileFieldBase
 > = (schema, disableRequiredValidation): RegisterOptions => {
diff --git a/package-lock.json b/package-lock.json
index fcee8bc948..8f44de5e94 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6301,12 +6301,6 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@jsdevtools/ono": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz",
-      "integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==",
-      "dev": true
-    },
     "node_modules/@mapbox/node-pre-gyp": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
@@ -7769,658 +7763,90 @@
     "node_modules/@smithy/util-stream/node_modules/tslib": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
-    },
-    "node_modules/@smithy/util-uri-escape": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-2.2.0.tgz",
-      "integrity": "sha512-jtmJMyt1xMD/d8OtbVJ2gFZOSKc+ueYJZPW20ULW1GOp/q/YIM0wNh+u8ZFao9UaIGz4WoPW8hC64qlWLIfoDA==",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@smithy/util-uri-escape/node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
-    },
-    "node_modules/@smithy/util-utf8": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
-      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
-      "dependencies": {
-        "@smithy/util-buffer-from": "^2.2.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@smithy/util-utf8/node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
-    },
-    "node_modules/@smithy/util-waiter": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-3.1.9.tgz",
-      "integrity": "sha512-/aMXPANhMOlMPjfPtSrDfPeVP8l56SJlz93xeiLmhLe5xvlXA5T3abZ2ilEsDEPeY9T/wnN/vNGn9wa1SbufWA==",
-      "dependencies": {
-        "@smithy/abort-controller": "^3.1.8",
-        "@smithy/types": "^3.7.1",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=16.0.0"
-      }
-    },
-    "node_modules/@smithy/util-waiter/node_modules/@smithy/abort-controller": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.8.tgz",
-      "integrity": "sha512-+3DOBcUn5/rVjlxGvUPKc416SExarAQ+Qe0bqk30YSUjbepwpS7QN0cyKUSifvLJhdMZ0WPzPP5ymut0oonrpQ==",
-      "dependencies": {
-        "@smithy/types": "^3.7.1",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=16.0.0"
-      }
-    },
-    "node_modules/@smithy/util-waiter/node_modules/@smithy/types": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.7.1.tgz",
-      "integrity": "sha512-XKLcLXZY7sUQgvvWyeaL/qwNPp6V3dWcUjqrQKjSb+tzYiCy340R/c64LV5j+Tnb2GhmunEX0eou+L+m2hJNYA==",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=16.0.0"
-      }
-    },
-    "node_modules/@smithy/util-waiter/node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
-    },
-    "node_modules/@socket.io/component-emitter": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
-      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="
-    },
-    "node_modules/@stablelib/base64": {
-      "version": "1.0.1",
-      "license": "MIT"
-    },
-    "node_modules/@stoplight/http-spec": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@stoplight/http-spec/-/http-spec-7.1.0.tgz",
-      "integrity": "sha512-Z2XqKX2SV8a1rrgSzFqccX2TolfcblT+l4pNvUU+THaLl50tKDoeidwWWZTzYUzqU0+UV97ponvqEbWWN3PaXg==",
-      "dev": true,
-      "dependencies": {
-        "@stoplight/json": "^3.18.1",
-        "@stoplight/json-schema-generator": "1.0.2",
-        "@stoplight/types": "14.1.0",
-        "@types/json-schema": "7.0.11",
-        "@types/swagger-schema-official": "~2.0.22",
-        "@types/type-is": "^1.6.3",
-        "fnv-plus": "^1.3.1",
-        "lodash": "^4.17.21",
-        "openapi3-ts": "^2.0.2",
-        "postman-collection": "^4.1.3",
-        "tslib": "^2.6.2",
-        "type-is": "^1.6.18"
-      },
-      "engines": {
-        "node": ">=14.13"
-      }
-    },
-    "node_modules/@stoplight/http-spec/node_modules/@stoplight/types": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@stoplight/types/-/types-14.1.0.tgz",
-      "integrity": "sha512-fL8Nzw03+diALw91xHEHA5Q0WCGeW9WpPgZQjodNUWogAgJ56aJs03P9YzsQ1J6fT7/XjDqHMgn7/RlsBzB/SQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.4",
-        "utility-types": "^3.10.0"
-      },
-      "engines": {
-        "node": "^12.20 || >=14.13"
-      }
-    },
-    "node_modules/@stoplight/http-spec/node_modules/tslib": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
-      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
-      "dev": true
-    },
-    "node_modules/@stoplight/json": {
-      "version": "3.21.7",
-      "resolved": "https://registry.npmjs.org/@stoplight/json/-/json-3.21.7.tgz",
-      "integrity": "sha512-xcJXgKFqv/uCEgtGlPxy3tPA+4I+ZI4vAuMJ885+ThkTHFVkC+0Fm58lA9NlsyjnkpxFh4YiQWpH+KefHdbA0A==",
-      "dev": true,
-      "dependencies": {
-        "@stoplight/ordered-object-literal": "^1.0.3",
-        "@stoplight/path": "^1.3.2",
-        "@stoplight/types": "^13.6.0",
-        "jsonc-parser": "~2.2.1",
-        "lodash": "^4.17.21",
-        "safe-stable-stringify": "^1.1"
-      },
-      "engines": {
-        "node": ">=8.3.0"
-      }
-    },
-    "node_modules/@stoplight/json-schema-generator": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@stoplight/json-schema-generator/-/json-schema-generator-1.0.2.tgz",
-      "integrity": "sha512-FzSLFoIZc6Lmw3oRE7kU6YUrl5gBmUs//rY59jdFipBoSyTPv5NyqeyTg5mvT6rY1F3qTLU3xgzRi/9Pb9eZpA==",
-      "dev": true,
-      "dependencies": {
-        "cross-fetch": "^3.1.5",
-        "json-promise": "1.1.x",
-        "minimist": "1.2.6",
-        "mkdirp": "0.5.x",
-        "pretty-data": "0.40.x"
-      },
-      "bin": {
-        "json-schema-generator": "bin/cli.js"
-      }
-    },
-    "node_modules/@stoplight/json-schema-merge-allof": {
-      "version": "0.7.8",
-      "resolved": "https://registry.npmjs.org/@stoplight/json-schema-merge-allof/-/json-schema-merge-allof-0.7.8.tgz",
-      "integrity": "sha512-JTDt6GYpCWQSb7+UW1P91IAp/pcLWis0mmEzWVFcLsrNgtUYK7JLtYYz0ZPSR4QVL0fJ0YQejM+MPq5iNDFO4g==",
-      "dev": true,
-      "dependencies": {
-        "compute-lcm": "^1.1.0",
-        "json-schema-compare": "^0.2.2",
-        "lodash": "^4.17.4"
-      }
-    },
-    "node_modules/@stoplight/json-schema-ref-parser": {
-      "version": "9.2.7",
-      "resolved": "https://registry.npmjs.org/@stoplight/json-schema-ref-parser/-/json-schema-ref-parser-9.2.7.tgz",
-      "integrity": "sha512-1vNzJ7iSrFTAFNbZHPyhI6GiJJw74+WaV61bARUQEDR4Jm80f9s0Tq9uCvGoMYwIFmWDJAoTiyegnUs6SvVxDw==",
-      "dev": true,
-      "dependencies": {
-        "@jsdevtools/ono": "^7.1.3",
-        "@stoplight/path": "^1.3.2",
-        "@stoplight/yaml": "^4.0.2",
-        "call-me-maybe": "^1.0.1",
-        "fastestsmallesttextencoderdecoder": "^1.0.22",
-        "isomorphic-fetch": "^3.0.0",
-        "node-abort-controller": "^3.0.1"
-      }
-    },
-    "node_modules/@stoplight/json-schema-sampler": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@stoplight/json-schema-sampler/-/json-schema-sampler-0.3.0.tgz",
-      "integrity": "sha512-G7QImi2xr9+8iPEg0D9YUi1BWhIiiEm19aMb91oWBSdxuhezOAqqRP3XNY6wczHV9jLWW18f+KkghTy9AG0BQA==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.7",
-        "json-pointer": "^0.6.1"
-      }
-    },
-    "node_modules/@stoplight/json/node_modules/@stoplight/types": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/@stoplight/types/-/types-13.20.0.tgz",
-      "integrity": "sha512-2FNTv05If7ib79VPDA/r9eUet76jewXFH2y2K5vuge6SXbRHtWBhcaRmu+6QpF4/WRNoJj5XYRSwLGXDxysBGA==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.4",
-        "utility-types": "^3.10.0"
-      },
-      "engines": {
-        "node": "^12.20 || >=14.13"
-      }
-    },
-    "node_modules/@stoplight/json/node_modules/safe-stable-stringify": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz",
-      "integrity": "sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw==",
-      "dev": true
-    },
-    "node_modules/@stoplight/ordered-object-literal": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@stoplight/ordered-object-literal/-/ordered-object-literal-1.0.5.tgz",
-      "integrity": "sha512-COTiuCU5bgMUtbIFBuyyh2/yVVzlr5Om0v5utQDgBCuQUOPgU1DwoffkTfg4UBQOvByi5foF4w4T+H9CoRe5wg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@stoplight/path": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@stoplight/path/-/path-1.3.2.tgz",
-      "integrity": "sha512-lyIc6JUlUA8Ve5ELywPC8I2Sdnh1zc1zmbYgVarhXIp9YeAB0ReeqmGEOWNtlHkbP2DAA1AL65Wfn2ncjK/jtQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@stoplight/prism-cli": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@stoplight/prism-cli/-/prism-cli-5.10.0.tgz",
-      "integrity": "sha512-U7XMCAlXZFh2GPvzpZeMJ4u5V47ncYxgIxbLy4Y8rjsBCKWKQqqUCFoENXDub2O6ibZKSQctIvO0HiMZlIWERw==",
-      "dev": true,
-      "dependencies": {
-        "@stoplight/json": "3.21.7",
-        "@stoplight/json-schema-ref-parser": "9.2.7",
-        "@stoplight/prism-core": "^5.8.0",
-        "@stoplight/prism-http": "5.10.0",
-        "@stoplight/prism-http-server": "^5.10.0",
-        "@stoplight/types": "^14.1.0",
-        "chalk": "^4.1.2",
-        "chokidar": "^3.5.2",
-        "fp-ts": "^2.11.5",
-        "json-schema-faker": "0.5.6",
-        "lodash": "^4.17.21",
-        "node-fetch": "^2.6.5",
-        "pino": "^6.13.3",
-        "signale": "^1.4.0",
-        "split2": "^3.2.2",
-        "tslib": "^2.3.1",
-        "uri-template-lite": "^22.9.0",
-        "urijs": "^1.19.11",
-        "yargs": "^16.2.0"
-      },
-      "bin": {
-        "prism": "dist/index.js"
-      },
-      "engines": {
-        "node": ">=18.20.1"
-      }
-    },
-    "node_modules/@stoplight/prism-cli/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@stoplight/prism-cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@stoplight/prism-cli/node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/@stoplight/prism-cli/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@stoplight/prism-cli/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@stoplight/prism-cli/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@stoplight/prism-cli/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@stoplight/prism-cli/node_modules/tslib": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
-      "dev": true
-    },
-    "node_modules/@stoplight/prism-cli/node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@stoplight/prism-cli/node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@stoplight/prism-cli/node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@stoplight/prism-core": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/@stoplight/prism-core/-/prism-core-5.8.0.tgz",
-      "integrity": "sha512-fmH7n6e0thzOGcD5uZBu/Xx1iFNfpc9ACTxPie+lFD54SJ214M2FIFXD7kV+NCFlC+w5OFw+lJRaYM859uMnAg==",
-      "dev": true,
-      "dependencies": {
-        "fp-ts": "^2.11.5",
-        "lodash": "^4.17.21",
-        "pino": "^6.13.3",
-        "tslib": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=18.20.1"
-      }
-    },
-    "node_modules/@stoplight/prism-core/node_modules/tslib": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
-      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
-      "dev": true
-    },
-    "node_modules/@stoplight/prism-http": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@stoplight/prism-http/-/prism-http-5.10.0.tgz",
-      "integrity": "sha512-OlWSv9XobxkNu4D1xfDfwjMSETrw4wNFkWcbKzQmepNERqJ6uuWDDjkIR2f1F7SYU61ElwhaXf1bA9dlze6U6g==",
-      "dev": true,
-      "dependencies": {
-        "@faker-js/faker": "^6.0.0",
-        "@stoplight/http-spec": "^7.0.3",
-        "@stoplight/json": "3.21.7",
-        "@stoplight/json-schema-merge-allof": "0.7.8",
-        "@stoplight/json-schema-ref-parser": "9.2.7",
-        "@stoplight/json-schema-sampler": "0.3.0",
-        "@stoplight/prism-core": "^5.8.0",
-        "@stoplight/types": "^14.1.0",
-        "@stoplight/yaml": "^4.2.3",
-        "abstract-logging": "^2.0.1",
-        "accepts": "^1.3.7",
-        "ajv": "^8.4.0",
-        "ajv-formats": "^2.1.1",
-        "caseless": "^0.12.0",
-        "chalk": "^4.1.2",
-        "content-type": "^1.0.4",
-        "fp-ts": "^2.11.5",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "json-schema-faker": "0.5.6",
-        "lodash": "^4.17.21",
-        "node-fetch": "^2.6.5",
-        "parse-multipart-data": "^1.5.0",
-        "pino": "^6.13.3",
-        "tslib": "^2.3.1",
-        "type-is": "^1.6.18",
-        "uri-template-lite": "^22.9.0",
-        "whatwg-mimetype": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=18.20.1"
-      }
-    },
-    "node_modules/@stoplight/prism-http-server": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@stoplight/prism-http-server/-/prism-http-server-5.10.0.tgz",
-      "integrity": "sha512-7sdMNzBY4+/96fLQn7/LR6ItDfNwcvCY9XCWrpruWeq5fHJHrb5OynpHvZs9vHcTpZNITBs/sgmukXn35wB5Sw==",
-      "dev": true,
-      "dependencies": {
-        "@stoplight/prism-core": "^5.8.0",
-        "@stoplight/prism-http": "^5.10.0",
-        "@stoplight/types": "^14.1.0",
-        "fast-xml-parser": "^4.2.0",
-        "fp-ts": "^2.11.5",
-        "io-ts": "^2.2.16",
-        "lodash": "^4.17.21",
-        "micri": "^4.3.0",
-        "node-fetch": "^2.6.5",
-        "parse-prefer-header": "1.0.0",
-        "tslib": "^2.3.1",
-        "type-is": "^1.6.18"
-      },
-      "engines": {
-        "node": ">=18.20.1"
-      }
-    },
-    "node_modules/@stoplight/prism-http-server/node_modules/tslib": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
-      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
-      "dev": true
-    },
-    "node_modules/@stoplight/prism-http/node_modules/@faker-js/faker": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-6.3.1.tgz",
-      "integrity": "sha512-8YXBE2ZcU/pImVOHX7MWrSR/X5up7t6rPWZlk34RwZEcdr3ua6X+32pSd6XuOQRN+vbuvYNfA6iey8NbrjuMFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.0.0",
-        "npm": ">=6.0.0"
-      }
-    },
-    "node_modules/@stoplight/prism-http/node_modules/ajv": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@stoplight/prism-http/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@stoplight/prism-http/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@stoplight/prism-http/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@stoplight/prism-http/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@stoplight/prism-http/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
-    "node_modules/@stoplight/prism-http/node_modules/http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-      "dev": true,
+    "node_modules/@smithy/util-uri-escape": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-2.2.0.tgz",
+      "integrity": "sha512-jtmJMyt1xMD/d8OtbVJ2gFZOSKc+ueYJZPW20ULW1GOp/q/YIM0wNh+u8ZFao9UaIGz4WoPW8hC64qlWLIfoDA==",
       "dependencies": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=14.0.0"
       }
     },
-    "node_modules/@stoplight/prism-http/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
+    "node_modules/@smithy/util-uri-escape/node_modules/tslib": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
-    "node_modules/@stoplight/prism-http/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
+    "node_modules/@smithy/util-utf8": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@smithy/util-buffer-from": "^2.2.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=14.0.0"
       }
     },
-    "node_modules/@stoplight/prism-http/node_modules/tslib": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
-      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
-      "dev": true
+    "node_modules/@smithy/util-utf8/node_modules/tslib": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
-    "node_modules/@stoplight/types": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmjs.org/@stoplight/types/-/types-14.1.1.tgz",
-      "integrity": "sha512-/kjtr+0t0tjKr+heVfviO9FrU/uGLc+QNX3fHJc19xsCNYqU7lVhaXxDmEID9BZTjG+/r9pK9xP/xU02XGg65g==",
-      "dev": true,
+    "node_modules/@smithy/util-waiter": {
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-3.1.9.tgz",
+      "integrity": "sha512-/aMXPANhMOlMPjfPtSrDfPeVP8l56SJlz93xeiLmhLe5xvlXA5T3abZ2ilEsDEPeY9T/wnN/vNGn9wa1SbufWA==",
       "dependencies": {
-        "@types/json-schema": "^7.0.4",
-        "utility-types": "^3.10.0"
+        "@smithy/abort-controller": "^3.1.8",
+        "@smithy/types": "^3.7.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": "^12.20 || >=14.13"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@stoplight/yaml": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/@stoplight/yaml/-/yaml-4.2.3.tgz",
-      "integrity": "sha512-Mx01wjRAR9C7yLMUyYFTfbUf5DimEpHMkRDQ1PKLe9dfNILbgdxyrncsOXM3vCpsQ1Hfj4bPiGl+u4u6e9Akqw==",
-      "dev": true,
+    "node_modules/@smithy/util-waiter/node_modules/@smithy/abort-controller": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.8.tgz",
+      "integrity": "sha512-+3DOBcUn5/rVjlxGvUPKc416SExarAQ+Qe0bqk30YSUjbepwpS7QN0cyKUSifvLJhdMZ0WPzPP5ymut0oonrpQ==",
       "dependencies": {
-        "@stoplight/ordered-object-literal": "^1.0.1",
-        "@stoplight/types": "^13.0.0",
-        "@stoplight/yaml-ast-parser": "0.0.48",
-        "tslib": "^2.2.0"
+        "@smithy/types": "^3.7.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=10.8"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@stoplight/yaml-ast-parser": {
-      "version": "0.0.48",
-      "resolved": "https://registry.npmjs.org/@stoplight/yaml-ast-parser/-/yaml-ast-parser-0.0.48.tgz",
-      "integrity": "sha512-sV+51I7WYnLJnKPn2EMWgS4EUfoP4iWEbrWwbXsj0MZCB/xOK8j6+C9fntIdOM50kpx45ZLC3s6kwKivWuqvyg==",
-      "dev": true
-    },
-    "node_modules/@stoplight/yaml/node_modules/@stoplight/types": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/@stoplight/types/-/types-13.20.0.tgz",
-      "integrity": "sha512-2FNTv05If7ib79VPDA/r9eUet76jewXFH2y2K5vuge6SXbRHtWBhcaRmu+6QpF4/WRNoJj5XYRSwLGXDxysBGA==",
-      "dev": true,
+    "node_modules/@smithy/util-waiter/node_modules/@smithy/types": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.7.1.tgz",
+      "integrity": "sha512-XKLcLXZY7sUQgvvWyeaL/qwNPp6V3dWcUjqrQKjSb+tzYiCy340R/c64LV5j+Tnb2GhmunEX0eou+L+m2hJNYA==",
       "dependencies": {
-        "@types/json-schema": "^7.0.4",
-        "utility-types": "^3.10.0"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": "^12.20 || >=14.13"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@stoplight/yaml/node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
-      "dev": true
+    "node_modules/@smithy/util-waiter/node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
+    },
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
+      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="
+    },
+    "node_modules/@stablelib/base64": {
+      "version": "1.0.1",
+      "license": "MIT"
     },
     "node_modules/@swc/counter": {
       "version": "0.1.3",
@@ -8754,12 +8180,6 @@
         "parse5": "^7.0.0"
       }
     },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
-      "dev": true
-    },
     "node_modules/@types/json-stringify-safe": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/@types/json-stringify-safe/-/json-stringify-safe-5.0.3.tgz",
@@ -8980,12 +8400,6 @@
         "@types/superagent": "*"
       }
     },
-    "node_modules/@types/swagger-schema-official": {
-      "version": "2.0.25",
-      "resolved": "https://registry.npmjs.org/@types/swagger-schema-official/-/swagger-schema-official-2.0.25.tgz",
-      "integrity": "sha512-T92Xav+Gf/Ik1uPW581nA+JftmjWPgskw/WBf4TJzxRG/SJ+DfNnNE+WuZ4mrXuzflQMqMkm1LSYjzYW7MB1Cg==",
-      "dev": true
-    },
     "node_modules/@types/tough-cookie": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz",
@@ -8996,15 +8410,6 @@
       "version": "1.3.2",
       "license": "MIT"
     },
-    "node_modules/@types/type-is": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/@types/type-is/-/type-is-1.6.6.tgz",
-      "integrity": "sha512-fs1KHv/f9OvmTMsu4sBNaUu32oyda9Y9uK25naJG8gayxNrfqGIjPQsbLIYyfe7xFkppnPlJB+BuTldOaX9bXw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/uid-generator": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/uid-generator/-/uid-generator-2.0.6.tgz",
@@ -9722,12 +9127,6 @@
         "node": ">=6.5"
       }
     },
-    "node_modules/abstract-logging": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.1.tgz",
-      "integrity": "sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA==",
-      "dev": true
-    },
     "node_modules/accepts": {
       "version": "1.3.7",
       "license": "MIT",
@@ -9825,45 +9224,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ajv-formats/node_modules/ajv": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
     "node_modules/ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
@@ -10162,15 +9522,6 @@
       "version": "0.4.0",
       "license": "MIT"
     },
-    "node_modules/atomic-sleep": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz",
-      "integrity": "sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/auto-changelog": {
       "version": "2.4.0",
       "dev": true,
@@ -10906,12 +10257,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/call-me-maybe": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz",
-      "integrity": "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==",
-      "dev": true
-    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "dev": true,
@@ -10947,12 +10292,6 @@
         }
       ]
     },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
-      "dev": true
-    },
     "node_modules/celebrate": {
       "version": "15.0.3",
       "resolved": "https://registry.npmjs.org/celebrate/-/celebrate-15.0.3.tgz",
@@ -10984,15 +10323,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/charset": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/charset/-/charset-1.0.1.tgz",
-      "integrity": "sha512-6dVyOOYjpfFcL1Y4qChrAoQLRHvj2ziyhcm0QJlhOcAhykL/k1kTUPbeo+87MNRTRdk2OIIsIXbuF3x2wi5EXg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/chokidar": {
       "version": "3.5.3",
       "dev": true,
@@ -11339,29 +10669,6 @@
       "version": "5.1.2",
       "license": "MIT"
     },
-    "node_modules/compute-gcd": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/compute-gcd/-/compute-gcd-1.2.1.tgz",
-      "integrity": "sha512-TwMbxBNz0l71+8Sc4czv13h4kEqnchV9igQZBi6QUaz09dnz13juGnnaWWJTRsP3brxOoxeB4SA2WELLw1hCtg==",
-      "dev": true,
-      "dependencies": {
-        "validate.io-array": "^1.0.3",
-        "validate.io-function": "^1.0.2",
-        "validate.io-integer-array": "^1.0.0"
-      }
-    },
-    "node_modules/compute-lcm": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/compute-lcm/-/compute-lcm-1.1.2.tgz",
-      "integrity": "sha512-OFNPdQAXnQhDSKioX8/XYT6sdUlXwpeMjfd6ApxMJfyZ4GxmLR1xvMERctlYhlHwIiz6CSpBc2+qYKjHGZw4TQ==",
-      "dev": true,
-      "dependencies": {
-        "compute-gcd": "^1.2.1",
-        "validate.io-array": "^1.0.3",
-        "validate.io-function": "^1.0.2",
-        "validate.io-integer-array": "^1.0.0"
-      }
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "license": "MIT"
@@ -11743,15 +11050,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/cross-fetch": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
-      "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
-      "dev": true,
-      "dependencies": {
-        "node-fetch": "^2.6.12"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -14168,25 +13466,10 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/fast-redact": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/fast-redact/-/fast-redact-3.5.0.tgz",
-      "integrity": "sha512-dwsoQlS7h9hMeYUq1W++23NDcBLV4KqONnITDV9DjfS3q1SgDGVrBdvvTLUotWtPSD7asWDV9/CmsZPy8Hf70A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/fast-safe-stringify": {
       "version": "2.1.1",
       "license": "MIT"
     },
-    "node_modules/fast-uri": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz",
-      "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==",
-      "dev": true
-    },
     "node_modules/fast-xml-parser": {
       "version": "4.2.5",
       "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz",
@@ -14208,12 +13491,6 @@
         "fxparser": "src/cli/cli.js"
       }
     },
-    "node_modules/fastestsmallesttextencoderdecoder": {
-      "version": "1.0.22",
-      "resolved": "https://registry.npmjs.org/fastestsmallesttextencoderdecoder/-/fastestsmallesttextencoderdecoder-1.0.22.tgz",
-      "integrity": "sha512-Pb8d48e+oIuY4MaM64Cd7OW1gt4nxCHs7/ddPPZ/Ic3sg8yVGM7O9wDvZ7us6ScaUupzM+pfBolwtYhN1IxBIw==",
-      "dev": true
-    },
     "node_modules/fastq": {
       "version": "1.8.0",
       "dev": true,
@@ -14243,18 +13520,6 @@
       "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz",
       "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="
     },
-    "node_modules/figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
       "dev": true,
@@ -14270,15 +13535,6 @@
       "version": "2.0.5",
       "license": "MIT"
     },
-    "node_modules/file-type": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
-      "integrity": "sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/file-uri-to-path": {
       "version": "1.0.0",
       "license": "MIT",
@@ -14414,12 +13670,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/flatstr": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/flatstr/-/flatstr-1.0.12.tgz",
-      "integrity": "sha512-4zPxDyhCyiN2wIAtSLI6gc82/EjqZc1onI4Mz/l0pWrAlsSfYH/2ZIcU+e3oA2wDwbzIWNKwa23F8rh6+DRWkw==",
-      "dev": true
-    },
     "node_modules/flatted": {
       "version": "3.1.1",
       "dev": true,
@@ -14429,12 +13679,6 @@
       "version": "1.1.0",
       "license": "MIT"
     },
-    "node_modules/fnv-plus": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/fnv-plus/-/fnv-plus-1.3.1.tgz",
-      "integrity": "sha512-Gz1EvfOneuFfk4yG458dJ3TLJ7gV19q3OM/vVvvHf7eT02Hm1DleB4edsia6ahbKgAYxO9gvyQ1ioWZR+a00Yw==",
-      "dev": true
-    },
     "node_modules/follow-redirects": {
       "version": "1.15.6",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
@@ -14461,12 +13705,6 @@
         "is-callable": "^1.1.3"
       }
     },
-    "node_modules/foreach": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.6.tgz",
-      "integrity": "sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg==",
-      "dev": true
-    },
     "node_modules/foreground-child": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
@@ -14510,12 +13748,6 @@
       "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.2.tgz",
       "integrity": "sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A=="
     },
-    "node_modules/format-util": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/format-util/-/format-util-1.0.5.tgz",
-      "integrity": "sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg==",
-      "dev": true
-    },
     "node_modules/formdata-node": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-4.4.1.tgz",
@@ -14910,12 +14142,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/handler-agent": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/handler-agent/-/handler-agent-0.2.0.tgz",
-      "integrity": "sha512-cUduQxa5p3TFtGmb55mrRbkk/3EJCsLSeFrCIuTakQHQlYVWXeW2L9IUQUHyoHLI4UgpBNaN2JrZ0He1jPu+vg==",
-      "dev": true
-    },
     "node_modules/has-bigints": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
@@ -15257,12 +14483,6 @@
         "node": ">= 14"
       }
     },
-    "node_modules/http-reasons": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/http-reasons/-/http-reasons-0.1.0.tgz",
-      "integrity": "sha512-P6kYh0lKZ+y29T2Gqz+RlC9WBLhKe8kDmcJ+A+611jFfxdPsbMRQ5aNmFRM3lENqFkK+HTTL+tlQviAiv0AbLQ==",
-      "dev": true
-    },
     "node_modules/http-status-codes": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/http-status-codes/-/http-status-codes-2.3.0.tgz",
@@ -15456,15 +14676,6 @@
         "jquery": ">=1.7"
       }
     },
-    "node_modules/io-ts": {
-      "version": "2.2.21",
-      "resolved": "https://registry.npmjs.org/io-ts/-/io-ts-2.2.21.tgz",
-      "integrity": "sha512-zz2Z69v9ZIC3mMLYWIeoUcwWD6f+O7yP92FMVVaXEOSZH1jnVBmET/urd/uoarD1WGBY4rCj8TAyMPzsGNzMFQ==",
-      "dev": true,
-      "peerDependencies": {
-        "fp-ts": "^2.5.0"
-      }
-    },
     "node_modules/ip": {
       "version": "1.1.9",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
@@ -15824,16 +15035,6 @@
       "version": "2.0.0",
       "license": "ISC"
     },
-    "node_modules/isomorphic-fetch": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
-      "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
-      "dev": true,
-      "dependencies": {
-        "node-fetch": "^2.6.1",
-        "whatwg-fetch": "^3.4.1"
-      }
-    },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
@@ -18365,69 +17566,12 @@
         "node": ">=4"
       }
     },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "node_modules/json-pointer": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/json-pointer/-/json-pointer-0.6.2.tgz",
-      "integrity": "sha512-vLWcKbOaXlO+jvRy4qNd+TI1QUPZzfJj1tpJ3vAXDych5XJf93ftpUKe5pKCrzyIIwgBJcOcCVRUfqQP25afBw==",
-      "dev": true,
-      "dependencies": {
-        "foreach": "^2.0.4"
-      }
-    },
-    "node_modules/json-promise": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/json-promise/-/json-promise-1.1.8.tgz",
-      "integrity": "sha512-rz31P/7VfYnjQFrF60zpPTT0egMPlc8ZvIQHWs4ZtNZNnAXRmXo6oS+6eyWr5sEMG03OVhklNrTXxiIRYzoUgQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "*"
-      }
-    },
-    "node_modules/json-schema-compare": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/json-schema-compare/-/json-schema-compare-0.2.2.tgz",
-      "integrity": "sha512-c4WYmDKyJXhs7WWvAWm3uIYnfyWFoIp+JEoX34rctVvEkMYCPGhXtvmFFXiffBbxfZsvQ0RNnV5H7GvDF5HCqQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.4"
-      }
-    },
-    "node_modules/json-schema-faker": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/json-schema-faker/-/json-schema-faker-0.5.6.tgz",
-      "integrity": "sha512-u/cFC26/GDxh2vPiAC8B8xVvpXAW+QYtG2mijEbKrimCk8IHtiwQBjCE8TwvowdhALWq9IcdIWZ+/8ocXvdL3Q==",
-      "dev": true,
-      "dependencies": {
-        "json-schema-ref-parser": "^6.1.0",
-        "jsonpath-plus": "^7.2.0"
-      },
-      "bin": {
-        "jsf": "bin/gen.cjs"
-      }
-    },
-    "node_modules/json-schema-ref-parser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz",
-      "integrity": "sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==",
-      "deprecated": "Please switch to @apidevtools/json-schema-ref-parser",
-      "dev": true,
-      "dependencies": {
-        "call-me-maybe": "^1.0.1",
-        "js-yaml": "^3.12.1",
-        "ono": "^4.0.11"
-      }
-    },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "dev": true,
@@ -18454,12 +17598,6 @@
         "json5": "lib/cli.js"
       }
     },
-    "node_modules/jsonc-parser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.2.1.tgz",
-      "integrity": "sha512-o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w==",
-      "dev": true
-    },
     "node_modules/jsonfile": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
@@ -18486,15 +17624,6 @@
       ],
       "license": "MIT"
     },
-    "node_modules/jsonpath-plus": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-7.2.0.tgz",
-      "integrity": "sha512-zBfiUPM5nD0YZSBT/o/fbCUlCcepMIdP0CJZxM1+KgA4f2T206f6VAg9e7mX35+KlMaIc5qXW34f3BnwJ3w+RA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
     "node_modules/JSONStream": {
       "version": "1.3.5",
       "license": "(MIT OR Apache-2.0)",
@@ -18885,18 +18014,9 @@
       "dev": true,
       "bin": {
         "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/liquid-json": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/liquid-json/-/liquid-json-0.3.1.tgz",
-      "integrity": "sha512-wUayTU8MS827Dam6MxgD72Ui+KOSF+u/eIqpatOtjnvgJ0+mnDq33uC2M7J0tPK+upe/DpUAuK4JUU89iBoNKQ==",
-      "dev": true,
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">= 14"
       }
     },
     "node_modules/listr2": {
@@ -18995,30 +18115,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/load-json-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
-        "strip-bom": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/load-json-file/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/loader-utils": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
@@ -19051,12 +18147,6 @@
       "version": "4.2.0",
       "license": "MIT"
     },
-    "node_modules/lodash.camelcase": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-      "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==",
-      "dev": true
-    },
     "node_modules/lodash.clonedeep": {
       "version": "4.5.0",
       "license": "MIT"
@@ -19824,18 +18914,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/micri": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/micri/-/micri-4.5.1.tgz",
-      "integrity": "sha512-AtvnSBGFglNr+iqs5gufpHT9xRXUabgu9vYEnQYPXSBs+nLSBvmUS5Mzg+3LJ9eQBrNA1o5M49WeqiX1f+d2sg==",
-      "dev": true,
-      "dependencies": {
-        "handler-agent": "0.2.0"
-      },
-      "engines": {
-        "node": ">= 12.0.0"
-      }
-    },
     "node_modules/micromatch": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
@@ -19868,15 +18946,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/mime-format": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mime-format/-/mime-format-2.0.1.tgz",
-      "integrity": "sha512-XxU3ngPbEnrYnNbIX+lYSaYg0M01v6p2ntd2YaFksTu0vayaw5OJvbdRyWs07EYRlLED5qadUZ+xo+XhOvFhwg==",
-      "dev": true,
-      "dependencies": {
-        "charset": "^1.0.0"
-      }
-    },
     "node_modules/mime-types": {
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
@@ -20482,12 +19551,6 @@
         }
       }
     },
-    "node_modules/node-abort-controller": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
-      "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==",
-      "dev": true
-    },
     "node_modules/node-addon-api": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
@@ -20904,15 +19967,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ono": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/ono/-/ono-4.0.11.tgz",
-      "integrity": "sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==",
-      "dev": true,
-      "dependencies": {
-        "format-util": "^1.0.3"
-      }
-    },
     "node_modules/openai": {
       "version": "4.70.3",
       "resolved": "https://registry.npmjs.org/openai/-/openai-4.70.3.tgz",
@@ -20946,15 +20000,6 @@
         "undici-types": "~5.26.4"
       }
     },
-    "node_modules/openapi3-ts": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-2.0.2.tgz",
-      "integrity": "sha512-TxhYBMoqx9frXyOgnRHufjQfPXomTIHYKhSKJ6jHfj13kS8OEIhvmE8CTuQyKtjjWttAjX5DPxM1vmalEpo8Qw==",
-      "dev": true,
-      "dependencies": {
-        "yaml": "^1.10.2"
-      }
-    },
     "node_modules/openid-client": {
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-5.4.0.tgz",
@@ -21217,33 +20262,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/parse-json": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/parse-multipart-data": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/parse-multipart-data/-/parse-multipart-data-1.5.0.tgz",
-      "integrity": "sha512-ck5zaMF0ydjGfejNMnlo5YU2oJ+pT+80Jb1y4ybanT27j+zbVP/jkYmCrUGsEln0Ox/hZmuvgy8Ra7AxbXP2Mw==",
-      "dev": true
-    },
-    "node_modules/parse-prefer-header": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-prefer-header/-/parse-prefer-header-1.0.0.tgz",
-      "integrity": "sha512-+WJ3ncCrKOExuxF06XyKWS8bLkLttnlm6YPMZIFIUXNd09Xy0N2JISudxCaY+luDm43yTnHMHVU3zte4G2gN4g==",
-      "dev": true,
-      "dependencies": {
-        "lodash.camelcase": "^4.3.0"
-      }
-    },
     "node_modules/parse5": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
@@ -21274,14 +20292,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/path-exists": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "license": "MIT",
@@ -21380,30 +20390,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/pino": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/pino/-/pino-6.14.0.tgz",
-      "integrity": "sha512-iuhEDel3Z3hF9Jfe44DPXR8l07bhjuFY3GMHIXbjnY9XcafbyDDwl2sN2vw2GjMPf5Nkoe+OFao7ffn9SXaKDg==",
-      "dev": true,
-      "dependencies": {
-        "fast-redact": "^3.0.0",
-        "fast-safe-stringify": "^2.0.8",
-        "flatstr": "^1.0.12",
-        "pino-std-serializers": "^3.1.0",
-        "process-warning": "^1.0.0",
-        "quick-format-unescaped": "^4.0.3",
-        "sonic-boom": "^1.0.2"
-      },
-      "bin": {
-        "pino": "bin.js"
-      }
-    },
-    "node_modules/pino-std-serializers": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-3.2.0.tgz",
-      "integrity": "sha512-EqX4pwDPrt3MuOAAUBMU0Tk5kR/YcCM5fNPEzgCO2zJ5HfX0vbiH9HbJglnyeQsN96Kznae6MWD47pZB5avTrg==",
-      "dev": true
-    },
     "node_modules/pirates": {
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
@@ -21413,77 +20399,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/pkg-conf": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz",
-      "integrity": "sha512-C+VUP+8jis7EsQZIhDYmS5qlNtjv2yP4SNtjXK9AP1ZcTRlnSfuumaTnRfYZnYgUUYVIKqL0fRvmUGDV2fmp6g==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^2.0.0",
-        "load-json-file": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/playwright": {
       "version": "1.49.0",
       "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.0.tgz",
@@ -21549,79 +20464,6 @@
         "node": "^10 || ^12 || >=14"
       }
     },
-    "node_modules/postman-collection": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/postman-collection/-/postman-collection-4.5.0.tgz",
-      "integrity": "sha512-152JSW9pdbaoJihwjc7Q8lc3nPg/PC9lPTHdMk7SHnHhu/GBJB7b2yb9zG7Qua578+3PxkQ/HYBuXpDSvsf7GQ==",
-      "dev": true,
-      "dependencies": {
-        "@faker-js/faker": "5.5.3",
-        "file-type": "3.9.0",
-        "http-reasons": "0.1.0",
-        "iconv-lite": "0.6.3",
-        "liquid-json": "0.3.1",
-        "lodash": "4.17.21",
-        "mime-format": "2.0.1",
-        "mime-types": "2.1.35",
-        "postman-url-encoder": "3.0.5",
-        "semver": "7.6.3",
-        "uuid": "8.3.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/postman-collection/node_modules/@faker-js/faker": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-5.5.3.tgz",
-      "integrity": "sha512-R11tGE6yIFwqpaIqcfkcg7AICXzFg14+5h5v0TfF/9+RMDL6jhzCy/pxHVOfbALGdtVYdt6JdR21tuxEgl34dw==",
-      "dev": true
-    },
-    "node_modules/postman-collection/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postman-collection/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/postman-collection/node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/postman-url-encoder": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/postman-url-encoder/-/postman-url-encoder-3.0.5.tgz",
-      "integrity": "sha512-jOrdVvzUXBC7C+9gkIkpDJ3HIxOHTIqjpQ4C1EMt1ZGeMvSEpbFCKq23DEfgsj46vMnDgyQf+1ZLp2Wm+bKSsA==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/pprof-format": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/pprof-format/-/pprof-format-2.1.0.tgz",
@@ -21662,15 +20504,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/pretty-data": {
-      "version": "0.40.0",
-      "resolved": "https://registry.npmjs.org/pretty-data/-/pretty-data-0.40.0.tgz",
-      "integrity": "sha512-YFLnEdDEDnkt/GEhet5CYZHCvALw6+Elyb/tp8kQG03ZSIuzeaDWpZYndCXwgqu4NAjh1PI534dhDS1mHarRnQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/pretty-format": {
       "version": "29.5.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.5.0.tgz",
@@ -21716,12 +20549,6 @@
       "version": "2.0.1",
       "license": "MIT"
     },
-    "node_modules/process-warning": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-1.0.0.tgz",
-      "integrity": "sha512-du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q==",
-      "dev": true
-    },
     "node_modules/progress": {
       "version": "2.0.3",
       "license": "MIT",
@@ -21956,12 +20783,6 @@
       "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
       "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="
     },
-    "node_modules/quick-format-unescaped": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz",
-      "integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==",
-      "dev": true
-    },
     "node_modules/random-bytes": {
       "version": "1.0.0",
       "license": "MIT",
@@ -22878,20 +21699,6 @@
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
-    "node_modules/signale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/signale/-/signale-1.4.0.tgz",
-      "integrity": "sha512-iuh+gPf28RkltuJC7W5MRi6XAjTDCAPC/prJUpQoG4vIP3MJZ+GTydVnodXA7pwvTKb2cA0m9OFZW/cdWy/I/w==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.3.2",
-        "figures": "^2.0.0",
-        "pkg-conf": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/simple-swizzle": {
       "version": "0.2.2",
       "license": "MIT",
@@ -23079,16 +21886,6 @@
       "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz",
       "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ=="
     },
-    "node_modules/sonic-boom": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.4.1.tgz",
-      "integrity": "sha512-LRHh/A8tpW7ru89lrlkU4AszXt1dbwSjVWguGrmlxE7tawVmDBlI1PILMkXAxJTwqhgsEeTHzj36D5CmHgQmNg==",
-      "dev": true,
-      "dependencies": {
-        "atomic-sleep": "^1.0.0",
-        "flatstr": "^1.0.12"
-      }
-    },
     "node_modules/source-map-js": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
@@ -23132,29 +21929,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/split2": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
-      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^3.0.0"
-      }
-    },
-    "node_modules/split2/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "dev": true,
@@ -24501,18 +23275,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/uri-template-lite": {
-      "version": "22.9.0",
-      "resolved": "https://registry.npmjs.org/uri-template-lite/-/uri-template-lite-22.9.0.tgz",
-      "integrity": "sha512-cmGZaykSWEQ5UXKaGKnUS8zFvfp8j1Jvn7dlq3P7tGd5XeybXcfo0xnVBRWiNEp80nO1GYgCLwoaRJ8WMmmk3Q==",
-      "dev": true
-    },
-    "node_modules/urijs": {
-      "version": "1.19.11",
-      "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.11.tgz",
-      "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==",
-      "dev": true
-    },
     "node_modules/url": {
       "version": "0.10.3",
       "license": "MIT",
@@ -24554,15 +23316,6 @@
       "version": "1.0.2",
       "license": "MIT"
     },
-    "node_modules/utility-types": {
-      "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.11.0.tgz",
-      "integrity": "sha512-6Z7Ma2aVEWisaL6TvBCy7P8rm2LQoPv6dJ7ecIaIixHcwfbJ0x7mWdbcwlIM5IGQxPZSFYeqRCqlOOeKoJYMkw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "license": "MIT",
@@ -24624,43 +23377,6 @@
         "node": ">=10.12.0"
       }
     },
-    "node_modules/validate.io-array": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/validate.io-array/-/validate.io-array-1.0.6.tgz",
-      "integrity": "sha512-DeOy7CnPEziggrOO5CZhVKJw6S3Yi7e9e65R1Nl/RTN1vTQKnzjfvks0/8kQ40FP/dsjRAOd4hxmJ7uLa6vxkg==",
-      "dev": true
-    },
-    "node_modules/validate.io-function": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/validate.io-function/-/validate.io-function-1.0.2.tgz",
-      "integrity": "sha512-LlFybRJEriSuBnUhQyG5bwglhh50EpTL2ul23MPIuR1odjO7XaMLFV8vHGwp7AZciFxtYOeiSCT5st+XSPONiQ==",
-      "dev": true
-    },
-    "node_modules/validate.io-integer": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/validate.io-integer/-/validate.io-integer-1.0.5.tgz",
-      "integrity": "sha512-22izsYSLojN/P6bppBqhgUDjCkr5RY2jd+N2a3DCAUey8ydvrZ/OkGvFPR7qfOpwR2LC5p4Ngzxz36g5Vgr/hQ==",
-      "dev": true,
-      "dependencies": {
-        "validate.io-number": "^1.0.3"
-      }
-    },
-    "node_modules/validate.io-integer-array": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/validate.io-integer-array/-/validate.io-integer-array-1.0.0.tgz",
-      "integrity": "sha512-mTrMk/1ytQHtCY0oNO3dztafHYyGU88KL+jRxWuzfOmQb+4qqnWmI+gykvGp8usKZOM0H7keJHEbRaFiYA0VrA==",
-      "dev": true,
-      "dependencies": {
-        "validate.io-array": "^1.0.3",
-        "validate.io-integer": "^1.0.4"
-      }
-    },
-    "node_modules/validate.io-number": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/validate.io-number/-/validate.io-number-1.0.3.tgz",
-      "integrity": "sha512-kRAyotcbNaSYoDnXvb4MHg/0a1egJdLwS6oJ38TJY7aw9n93Fl/3blIXdyYvPOp55CNxywooG/3BcrwNrBpcSg==",
-      "dev": true
-    },
     "node_modules/validator": {
       "version": "13.12.0",
       "resolved": "https://registry.npmjs.org/validator/-/validator-13.12.0.tgz",
@@ -24750,11 +23466,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/whatwg-fetch": {
-      "version": "3.6.2",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/whatwg-mimetype": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
@@ -25167,15 +23878,6 @@
       "version": "3.1.1",
       "license": "ISC"
     },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/yargs": {
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
diff --git a/shared/constants/field/basic.ts b/shared/constants/field/basic.ts
index ffd1589f92..bdf6063c7e 100644
--- a/shared/constants/field/basic.ts
+++ b/shared/constants/field/basic.ts
@@ -138,6 +138,12 @@ export const types: BasicFieldBlock[] = [
     submitted: true,
     answerArray: true,
   },
+  {
+    name: BasicField.Address,
+    value: 'Address',
+    submitted: true,
+    answerArray: true,
+  },
 ]
 
 /**
diff --git a/shared/types/field/addressField.ts b/shared/types/field/addressField.ts
new file mode 100644
index 0000000000..2c815efd0e
--- /dev/null
+++ b/shared/types/field/addressField.ts
@@ -0,0 +1,15 @@
+import { BasicField, FieldBase } from './base'
+
+export interface AddressCompoundFieldBase extends FieldBase {
+  fieldType: BasicField.Address
+  addressSubFields?: AddressAttributes // 1 address for the field (not allow multiple)
+}
+
+export type AddressAttributes = {
+  postalCode: string
+  blockNumber: string
+  streetName: string
+  buildingName: string
+  levelNumber: string
+  unitNumber: string
+}
diff --git a/shared/types/field/base.ts b/shared/types/field/base.ts
index e6fe02fee9..5785182523 100644
--- a/shared/types/field/base.ts
+++ b/shared/types/field/base.ts
@@ -21,6 +21,7 @@ export enum BasicField {
   Table = 'table',
   Uen = 'uen',
   Children = 'children',
+  Address = 'address',
 }
 
 /**
diff --git a/shared/types/field/index.ts b/shared/types/field/index.ts
index 558a362cad..41a2817142 100644
--- a/shared/types/field/index.ts
+++ b/shared/types/field/index.ts
@@ -1,3 +1,4 @@
+import type { AddressCompoundFieldBase } from './addressField'
 import type { AttachmentFieldBase } from './attachmentField'
 import type { CheckboxFieldBase } from './checkboxField'
 import type { CountryRegionFieldBase } from './countryRegionField'
@@ -22,6 +23,7 @@ import type { UenFieldBase } from './uenField'
 import type { YesNoFieldBase } from './yesNoField'
 import type { SetRequired } from 'type-fest'
 
+export * from './addressField'
 export * from './attachmentField'
 export * from './base'
 export * from './checkboxField'
@@ -49,6 +51,7 @@ export * from './yesNoField'
 export * from './childrenCompoundField'
 
 export type FormField =
+  | AddressCompoundFieldBase
   | AttachmentFieldBase
   | CheckboxFieldBase
   | DateFieldBase
diff --git a/shared/types/response-v3.ts b/shared/types/response-v3.ts
index 7b2a16166f..08bfc1cbd5 100644
--- a/shared/types/response-v3.ts
+++ b/shared/types/response-v3.ts
@@ -1,4 +1,9 @@
-import { BasicField, FormFieldDto, MyInfoChildAttributes } from './field'
+import {
+  AddressAttributes,
+  BasicField,
+  FormFieldDto,
+  MyInfoChildAttributes,
+} from './field'
 
 export type FieldResponsesV3 = Record<FormFieldDto['_id'], FieldResponseV3>
 
@@ -13,6 +18,7 @@ export type FieldResponseV3 =
   | EmailResponseV3
   | MobileResponseV3
   | GenericStringAnswerFieldResponseV3
+  | AddressResponseV3
 
 export type GenericStringAnswerFieldResponseV3 =
   | NumberResponseV3
@@ -49,6 +55,7 @@ export type UenResponseV3 = FieldResponseFactoryV3<BasicField.Uen>
 export type ChildBirthRecordsResponseV3 =
   FieldResponseFactoryV3<BasicField.Children>
 export type AttachmentResponseV3 = FieldResponseFactoryV3<BasicField.Attachment>
+export type AddressResponseV3 = FieldResponseFactoryV3<BasicField.Address>
 
 export type FieldResponseFactoryV3<F extends BasicField = BasicField> =
   FieldResponseV3Base & {
@@ -76,7 +83,9 @@ export type FieldResponseAnswerMapV3<F extends BasicField = BasicField> =
                 ? CheckboxFieldResponsesV3
                 : F extends BasicField.Children
                   ? ChildrenCompoundFieldResponsesV3
-                  : never
+                  : F extends BasicField.Address
+                    ? AddressCompoundFieldResponseV3
+                    : never
 
 export type GenericStringAnswerResponseFieldTypeV3 =
   | NumberResponseV3['fieldType']
@@ -121,3 +130,7 @@ export type AttachmentFieldResponseV3 = {
   answer: string
   md5Hash?: string
 }
+
+export type AddressCompoundFieldResponseV3 = {
+  addressSubFields: AddressAttributes
+}
diff --git a/shared/types/response.ts b/shared/types/response.ts
index de3ab7ad59..3f25235b81 100644
--- a/shared/types/response.ts
+++ b/shared/types/response.ts
@@ -132,6 +132,23 @@ export const UenResponse = SingleAnswerResponse.extend({
 })
 export type UenResponse = z.infer<typeof UenResponse>
 
+// TODO: check fo multivalue response as a string[]
+export type AddressSubField = {
+  key: string
+  value: string
+}
+
+export const AddressResponse = ResponseBase.extend({
+  fieldType: z.literal(BasicField.Address),
+  answerArray: z.array(z.array(z.string())) as unknown as z.Schema<string[][]>,
+})
+export type AddressResponse = z.infer<typeof AddressResponse>
+
+export const AddressSubFieldResponse = SingleAnswerResponse.extend({
+  fieldType: z.literal(BasicField.Address),
+})
+export type AddressSubFieldResponse = z.infer<typeof AddressSubFieldResponse>
+
 export const ChildBirthRecordsResponse = ResponseBase.merge(
   MyInfoResponseBase,
 ).extend({
@@ -176,3 +193,5 @@ export type FieldResponse =
   | UenResponse
   | ChildBirthRecordsResponse
   | SingleChildSubRecordResponse
+  | AddressResponse
+  | AddressSubFieldResponse
diff --git a/shared/utils/address-validation.ts b/shared/utils/address-validation.ts
new file mode 100644
index 0000000000..3182334ddf
--- /dev/null
+++ b/shared/utils/address-validation.ts
@@ -0,0 +1,19 @@
+// local address field errors
+export const INVALID_POSTAL_CODE_ERROR = 'Please enter a valid postal code'
+export const VALID_POSTAL_CODE_NO_ADDRESS_ERROR =
+  'Address cannot be found. Please fill in details manually'
+export const INVALID_BLOCK_UNIT_ERROR = 'Please use numbers and alphabets only'
+
+export const validatePostalCode = (value: string) => {
+  if (!/^[0-9]+$/.test(value) || value.length !== 6) {
+    return INVALID_POSTAL_CODE_ERROR
+  }
+  return true
+}
+
+export const validateBlockUnit = (value: string) => {
+  if (value !== '' && !/^[A-Za-z0-9]+$/.test(value)) {
+    return INVALID_BLOCK_UNIT_ERROR
+  }
+  return true
+}
diff --git a/src/app/models/field/addressField.ts b/src/app/models/field/addressField.ts
new file mode 100644
index 0000000000..94bdaa2d7a
--- /dev/null
+++ b/src/app/models/field/addressField.ts
@@ -0,0 +1,9 @@
+import { Schema } from 'mongoose'
+
+import { IAddressCompoundFieldSchema } from 'src/types'
+
+const createAddressCompoundFieldSchema = () => {
+  return new Schema<IAddressCompoundFieldSchema>({})
+}
+
+export default createAddressCompoundFieldSchema
diff --git a/src/app/models/field/index.ts b/src/app/models/field/index.ts
index 6748a19290..a1761b6275 100644
--- a/src/app/models/field/index.ts
+++ b/src/app/models/field/index.ts
@@ -1,3 +1,4 @@
+import createAddressFieldSchema from './addressField'
 import createAttachmentFieldSchema from './attachmentField'
 import { BaseFieldSchema } from './baseField'
 import createCheckboxFieldSchema from './checkboxField'
@@ -23,6 +24,7 @@ import createUenFieldSchema from './uenField'
 import createYesNoFieldSchema from './yesNoField'
 
 export {
+  createAddressFieldSchema,
   createAttachmentFieldSchema,
   createCheckboxFieldSchema,
   createDateFieldSchema,
diff --git a/src/app/models/form.server.model.ts b/src/app/models/form.server.model.ts
index aceaa61567..a33083239a 100644
--- a/src/app/models/form.server.model.ts
+++ b/src/app/models/form.server.model.ts
@@ -81,6 +81,7 @@ import { validateWebhookUrl } from '../modules/webhook/webhook.validation'
 import { ProductSchema } from './payments/productSchema'
 import {
   BaseFieldSchema,
+  createAddressFieldSchema,
   createAttachmentFieldSchema,
   createCheckboxFieldSchema,
   createchildrenCompoundFieldSchema,
@@ -731,6 +732,7 @@ const compileFormModel = (db: Mongoose): IFormModel => {
     BasicField.Statement,
     createStatementFieldSchema(),
   )
+  FormFieldPath.discriminator(BasicField.Address, createAddressFieldSchema())
   FormFieldPath.discriminator(BasicField.Section, createSectionFieldSchema())
   FormFieldPath.discriminator(BasicField.Table, TableFieldSchema)
   const TableColumnPath = TableFieldSchema.path(
diff --git a/src/app/modules/form/form.service.ts b/src/app/modules/form/form.service.ts
index 67461ca653..c768ffc369 100644
--- a/src/app/modules/form/form.service.ts
+++ b/src/app/modules/form/form.service.ts
@@ -630,6 +630,15 @@ export const createSingleSampleSubmissionAnswer = (field: FormFieldDto) => {
         fieldType: field.fieldType,
       }
     }
+    case BasicField.Address: {
+      const sampleValue: string[] = []
+      return {
+        id: field._id,
+        question: field.title,
+        answerArray: sampleValue,
+        fieldType: field.fieldType,
+      }
+    }
     case BasicField.Section:
     case BasicField.Statement:
     case BasicField.Image:
diff --git a/src/app/modules/submission/email-submission/email-submission.util.ts b/src/app/modules/submission/email-submission/email-submission.util.ts
index 75cb69445a..cdbf0fd89f 100644
--- a/src/app/modules/submission/email-submission/email-submission.util.ts
+++ b/src/app/modules/submission/email-submission/email-submission.util.ts
@@ -28,6 +28,7 @@ import {
   VerifyTurnstileError,
 } from '../../../services/turnstile/turnstile.errors'
 import {
+  isProcessedAddressResponse,
   isProcessedCheckboxResponse,
   isProcessedChildResponse,
   isProcessedTableResponse,
@@ -77,7 +78,11 @@ import {
   ProcessedFieldResponse,
   ProcessedTableResponse,
 } from '../submission.types'
-import { getAnswersForChild, getMyInfoPrefix } from '../submission.utils'
+import {
+  getAnswersForAddress,
+  getAnswersForChild,
+  getMyInfoPrefix,
+} from '../submission.utils'
 
 import {
   ATTACHMENT_PREFIX,
@@ -442,6 +447,10 @@ const createFormattedDataForOneField = <T extends EmailDataFields | undefined>(
     return getAnswersForChild(response).map((childField) =>
       getFormattedFunction(childField, hashedFields),
     )
+  } else if (isProcessedAddressResponse(response)) {
+    return getAnswersForAddress(response).map((subField) =>
+      getFormattedFunction(subField, hashedFields),
+    )
   } else {
     return [getFormattedFunction(response, hashedFields)]
   }
diff --git a/src/app/modules/submission/multirespondent-submission/multirespondent-submission.utils.ts b/src/app/modules/submission/multirespondent-submission/multirespondent-submission.utils.ts
index b405842203..05378c0ddd 100644
--- a/src/app/modules/submission/multirespondent-submission/multirespondent-submission.utils.ts
+++ b/src/app/modules/submission/multirespondent-submission/multirespondent-submission.utils.ts
@@ -219,6 +219,9 @@ export const getQuestionTitleAnswerString = ({
           answer,
         })
         continue
+      case BasicField.Address:
+        answer = response.answer.addressSubFields.postalCode // TODO
+        break
       case BasicField.Email:
       case BasicField.Mobile:
         answer = response.answer.value
diff --git a/src/app/modules/submission/submission.types.ts b/src/app/modules/submission/submission.types.ts
index 3685ba2777..79e75bf4c0 100644
--- a/src/app/modules/submission/submission.types.ts
+++ b/src/app/modules/submission/submission.types.ts
@@ -2,6 +2,7 @@ import { StatusCodes } from 'http-status-codes'
 import type { Opaque } from 'type-fest'
 
 import {
+  AddressResponse,
   BasicField,
   CheckboxResponse,
   ChildBirthRecordsResponse,
@@ -69,6 +70,7 @@ export type ProcessedChildrenResponse = ChildBirthRecordsResponse &
     childSubFieldsArray?: MyInfoChildAttributes[]
     childIdx?: number
   }
+export type ProcessedAddressResponse = AddressResponse & ProcessedResponse
 /**
  * Can be either email or storage mode attachment response.
  * Email mode attachment response in the server will have extra metadata injected
@@ -87,6 +89,7 @@ export type ProcessedFieldResponse =
   | ProcessedTableResponse
   | ProcessedAttachmentResponse
   | ProcessedChildrenResponse
+  | ProcessedAddressResponse
 
 /**
  * Virus scanner types
diff --git a/src/app/modules/submission/submission.utils.ts b/src/app/modules/submission/submission.utils.ts
index 495fc5f91d..bf6a84a027 100644
--- a/src/app/modules/submission/submission.utils.ts
+++ b/src/app/modules/submission/submission.utils.ts
@@ -140,6 +140,7 @@ import {
 } from './submission.errors'
 import {
   FilteredResponse,
+  ProcessedAddressResponse,
   ProcessedChildrenResponse,
   ProcessedFieldResponse,
   ProcessedSingleAnswerResponse,
@@ -781,6 +782,40 @@ export const getAnswersForChild = (
   })
 }
 
+/**
+ * Creates a response for address, with its answer formatted from the answerArray
+ * @param response
+ * @param response.answerArray is of type AddressAttributes
+ * @returns the response with formatted answer
+ */
+export const getAnswersForAddress = (
+  response: ProcessedAddressResponse,
+): ProcessedSingleAnswerResponse[] => {
+  const subFields = response.answerArray
+  if (!subFields) {
+    return []
+  }
+  const subFieldResponses: ProcessedSingleAnswerResponse[] = []
+  // Object.entries(obj).forEach(([key, value]) => {
+  //   console.log(`${key}: ${value}`); // Output each key-value pair
+  // });
+
+  Object.entries(subFields).forEach((subField) => {
+    const key = subField[0].split(':')[0].trim()
+    const value = subField[0].split(':')[1].trim()
+    subFieldResponses.push({
+      _id: response._id + key, // check this
+      fieldType: response.fieldType,
+      question: response.question + key,
+      myInfo: response.myInfo,
+      isVisible: response.isVisible,
+      isUserVerified: response.isUserVerified,
+      answer: value,
+    })
+  })
+  return subFieldResponses
+}
+
 /**
  * Generates a hash to mask the original submitterId.
  * @param id
diff --git a/src/app/services/address/address.service.ts b/src/app/services/address/address.service.ts
new file mode 100644
index 0000000000..155a1b92b7
--- /dev/null
+++ b/src/app/services/address/address.service.ts
@@ -0,0 +1,44 @@
+/**
+ * Address service that calls oneMap API get local address fields based on postal code
+ * // if success: {success: true, data: {} }
+ * // if fail: {success: false} - no data is returned
+ */
+
+export interface VerifyAddressResponse {
+  success: boolean
+  data?: {
+    postalCode: string
+    blockNumber: string
+    streetName: string
+  }
+}
+
+const oneMapApiUrl = (value: string): string => {
+  return `https://www.onemap.gov.sg/api/common/elastic/search?searchVal=${value}&returnGeom=Y&getAddrDetails=Y`
+}
+
+export async function verifyAddress(
+  postalCode: string,
+): Promise<VerifyAddressResponse> {
+  const response = await fetch(oneMapApiUrl(postalCode), {
+    method: 'GET',
+    headers: {
+      'Content-Type': 'application/json',
+      Cookie: '_toffsuid=rB8uPWZEP/wp9bsoBHUZAg==', // check this
+    },
+  })
+
+  if (response.ok) {
+    const resp = await response.json()
+    if (resp.found > 0) {
+      const result = resp.results[0]
+      const resultData = {
+        postalCode: result.POSTAL,
+        blockNumber: result.BLK_NO,
+        streetName: result.ROAD_NAME,
+      }
+      return { success: true, data: resultData }
+    }
+  }
+  return { success: false }
+}
diff --git a/src/app/utils/field-validation/answerValidator.factory.ts b/src/app/utils/field-validation/answerValidator.factory.ts
index 73266a8c8e..c3c0c4e3d1 100644
--- a/src/app/utils/field-validation/answerValidator.factory.ts
+++ b/src/app/utils/field-validation/answerValidator.factory.ts
@@ -5,6 +5,7 @@ import { FieldValidationSchema } from '../../../types'
 import { ParsedClearFormFieldResponseV3 } from '../../../types/api'
 import { ResponseValidator } from '../../../types/field/utils/validation'
 import {
+  ProcessedAddressResponse,
   ProcessedAttachmentResponse,
   ProcessedCheckboxResponse,
   ProcessedChildrenResponse,
@@ -12,6 +13,10 @@ import {
   ProcessedTableResponse,
 } from '../../modules/submission/submission.types'
 
+import {
+  constructAddressValidator,
+  constructAddressValidatorV3,
+} from './validators/addressValidator'
 import {
   constructAttachmentFieldValidatorV3,
   constructAttachmentValidator,
@@ -170,6 +175,15 @@ export const constructTableFieldValidator = (
   return () => left('Unsupported field type')
 }
 
+export const constructAddressFieldValidator = (
+  formField: FieldValidationSchema,
+): ResponseValidator<ProcessedAddressResponse> => {
+  if (formField.fieldType === BasicField.Address) {
+    return constructAddressValidator(formField)
+  }
+  return () => left('Unsupported field type')
+}
+
 export const constructFieldResponseValidatorV3 = ({
   formId,
   formField,
@@ -228,6 +242,8 @@ export const constructFieldResponseValidatorV3 = ({
     case BasicField.Statement:
       return () =>
         left('Unsupported field type: field should not be part of response')
+    case BasicField.Address:
+      return constructAddressValidatorV3(formField)
     default: {
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       const exhaustiveCheck: never = formField
diff --git a/src/app/utils/field-validation/field-validation.guards.ts b/src/app/utils/field-validation/field-validation.guards.ts
index cee6b54646..19b7ae5293 100644
--- a/src/app/utils/field-validation/field-validation.guards.ts
+++ b/src/app/utils/field-validation/field-validation.guards.ts
@@ -11,6 +11,7 @@ import {
 import { IEmailFieldSchema } from '../../../types'
 import {
   ColumnResponse,
+  ProcessedAddressResponse,
   ProcessedAttachmentResponse,
   ProcessedCheckboxResponse,
   ProcessedChildrenResponse,
@@ -55,6 +56,20 @@ export const isProcessedChildResponse = (
   )
 }
 
+export const isProcessedAddressResponse = (
+  response: ProcessedFieldResponse,
+): response is ProcessedAddressResponse => {
+  return (
+    response.fieldType === BasicField.Address &&
+    'answerArray' in response &&
+    Array.isArray(response.answerArray)
+    // &&
+    // response.answerArray.every(
+    //   (item) => typeof item === 'object' && item !== null,
+    // )
+  )
+}
+
 const isStringArray = (arr: unknown): arr is string[] =>
   Array.isArray(arr) && arr.every((item) => typeof item === 'string')
 
diff --git a/src/app/utils/field-validation/index.ts b/src/app/utils/field-validation/index.ts
index 3bbd28b676..572646287a 100644
--- a/src/app/utils/field-validation/index.ts
+++ b/src/app/utils/field-validation/index.ts
@@ -4,6 +4,7 @@ import { err, ok, Result } from 'neverthrow'
 import { FIELDS_TO_REJECT } from '../../../../shared/constants/field/basic'
 import { BasicField, FormField, FormFieldDto } from '../../../../shared/types'
 import {
+  ProcessedAddressResponse,
   ProcessedAttachmentResponse,
   ProcessedCheckboxResponse,
   ProcessedChildrenResponse,
@@ -25,6 +26,7 @@ import {
 } from '../../modules/submission/submission.errors'
 
 import {
+  constructAddressFieldValidator,
   constructAttachmentFieldValidator,
   constructCheckboxFieldValidator,
   constructChildFieldValidator,
@@ -34,6 +36,7 @@ import {
 } from './answerValidator.factory'
 import {
   isGenericStringAnswerResponseV3,
+  isProcessedAddressResponse,
   isProcessedAttachmentResponse,
   isProcessedCheckboxResponse,
   isProcessedChildResponse,
@@ -146,6 +149,12 @@ const tableRequiresValidation = (
   return requiredVisible || answerPresent
 }
 
+const addressRequiresValidation = (
+  formField: FieldValidationSchema,
+  response: ProcessedAddressResponse,
+) =>
+  (formField.required && response.isVisible) || response.answerArray.length > 0
+
 /**
  * Generic logging function for invalid fields.
  * Incomplete for table fields as the columnType is not logged.
@@ -275,6 +284,16 @@ export const validateField = (
         response,
       )
     }
+  } else if (isProcessedAddressResponse(response)) {
+    if (addressRequiresValidation(formField, response)) {
+      const validator = constructAddressFieldValidator(formField)
+      return validateResponseWithValidator(
+        validator,
+        formId,
+        formField,
+        response,
+      )
+    }
   } else {
     logInvalidAnswer(formId, formField, 'Invalid response shape')
     return err(new ValidateFieldError('Response has invalid shape'))
diff --git a/src/app/utils/field-validation/validators/addressValidator.ts b/src/app/utils/field-validation/validators/addressValidator.ts
new file mode 100644
index 0000000000..be4fddafe6
--- /dev/null
+++ b/src/app/utils/field-validation/validators/addressValidator.ts
@@ -0,0 +1,85 @@
+import { left, right } from 'fp-ts/lib/Either'
+import { flow } from 'fp-ts/lib/function'
+
+import { ProcessedAddressResponse } from 'src/app/modules/submission/submission.types'
+import {
+  IAddressCompoundFieldSchema,
+  OmitUnusedValidatorProps,
+} from 'src/types'
+
+import {
+  // AddressCompoundFieldBase,
+  // AddressResponse,
+  AddressResponseV3,
+  BasicField,
+} from '../../../../../shared/types'
+import { validatePostalCode } from '../../../../../shared/utils/address-validation'
+import { ParsedClearFormFieldResponseV3 } from '../../../../types/api'
+import {
+  ResponseValidator,
+  ResponseValidatorConstructor,
+} from '../../../../types/field/utils/validation'
+
+type AddressValidator = ResponseValidator<ProcessedAddressResponse>
+type AddressValidatorConstructor = (
+  addressField: OmitUnusedValidatorProps<IAddressCompoundFieldSchema>,
+) => AddressValidator
+
+/**
+ * Returns a validator to check if postal code format is correct
+ */
+const addressValidator: AddressValidator = (response) => {
+  // const { answerArray } = response
+  // const entry = answerArray.find(({ key }) => key === 'postalCode')
+  // const postalCode = entry ? entry.value : ''
+  // return validatePostalCode(postalCode) // TODO
+  return true
+    ? right(response)
+    : left(`AddressValidator:\t answer is not a valid postal code`)
+}
+
+export const constructAddressValidator: AddressValidatorConstructor = () =>
+  flow(addressValidator) // TODO fix this
+
+// v3
+// interface AddressValidatorData {
+//   addressField: AddressCompoundFieldBase
+//   formId: string
+//   isVisible: boolean
+//   isDisabled: boolean
+// }
+
+const isAddressResponseV3: ResponseValidator<
+  ParsedClearFormFieldResponseV3,
+  AddressResponseV3
+> = (response) => {
+  if (response.fieldType !== BasicField.Address) {
+    return left(
+      `AddressValidatorV3.fieldTypeMismatch:\tfieldType is not address`,
+    )
+  }
+  return right(response)
+}
+
+// const addressValidatorV3: ResponseValidator<
+//   AddressValidatorData,
+//   AddressResponseV3
+// > =
+//   ({ addressField }) =>
+//   (response) => {
+//     const answerArray = response.answerArray
+//     return validatePostalCode(response.answer.postalCode)
+//       ? right(response)
+//       : left(`AddressValidatorV3:\t answer is not a valid postal code`)
+//   }
+
+export const constructAddressValidatorV3: ResponseValidatorConstructor<
+  OmitUnusedValidatorProps<IAddressCompoundFieldSchema>,
+  ParsedClearFormFieldResponseV3,
+  AddressResponseV3
+> = () =>
+  flow(
+    isAddressResponseV3,
+    // chain(notEmptySingleAnswerResponseV3),
+    // chain(addressValidatorV3), // TODO fix this
+  )
diff --git a/src/app/utils/response-v3.ts b/src/app/utils/response-v3.ts
index 6ae8a75c39..e596fbe91a 100644
--- a/src/app/utils/response-v3.ts
+++ b/src/app/utils/response-v3.ts
@@ -28,6 +28,7 @@ export const isFieldResponseV3Equal = (
     case BasicField.Radio:
     case BasicField.Checkbox:
     case BasicField.Children:
+    case BasicField.Address:
       return _.isEqual(l.answer, r.answer)
     case BasicField.Attachment: {
       const lAnswer = l.answer as ParsedClearAttachmentResponseV3['answer']
diff --git a/src/types/field/addressField.ts b/src/types/field/addressField.ts
new file mode 100644
index 0000000000..f45bb161ef
--- /dev/null
+++ b/src/types/field/addressField.ts
@@ -0,0 +1,9 @@
+import { AddressCompoundFieldBase, BasicField } from '../../../shared/types'
+
+import { IFieldSchema } from './baseField'
+
+export interface IAddressCompoundFieldSchema
+  extends AddressCompoundFieldBase,
+    IFieldSchema {
+  fieldType: BasicField.Address
+}
diff --git a/src/types/field/index.ts b/src/types/field/index.ts
index 980aa16fa3..ad1c17acc8 100644
--- a/src/types/field/index.ts
+++ b/src/types/field/index.ts
@@ -1,6 +1,7 @@
 import type { Document } from 'mongoose'
 import type { ConditionalExcept, Merge } from 'type-fest'
 
+import type { IAddressCompoundFieldSchema } from './addressField'
 import type { IAttachmentFieldSchema } from './attachmentField'
 import type { ICheckboxFieldSchema } from './checkboxField'
 import type { IChildrenCompoundFieldSchema } from './childrenCompoundField'
@@ -24,6 +25,7 @@ import type { ITableFieldSchema } from './tableField'
 import type { IUenFieldSchema } from './uenField'
 import type { IYesNoFieldSchema } from './yesNoField'
 
+export * from './addressField'
 export * from './attachmentField'
 export * from './baseField'
 export * from './checkboxField'
@@ -60,6 +62,7 @@ export enum SgidFieldTitle {
 }
 
 export type FormFieldSchema =
+  | IAddressCompoundFieldSchema
   | IAttachmentFieldSchema
   | ICheckboxFieldSchema
   | IDateFieldSchema
@@ -102,6 +105,7 @@ export type OmitUnusedValidatorProps<F extends FormFieldSchema> = Merge<
 >
 
 export type FieldValidationSchema =
+  | OmitUnusedValidatorProps<IAddressCompoundFieldSchema>
   | OmitUnusedValidatorProps<IAttachmentFieldSchema>
   | OmitUnusedValidatorProps<ICheckboxFieldSchema>
   | OmitUnusedValidatorProps<IDateFieldSchema>
diff --git a/src/types/response/index.ts b/src/types/response/index.ts
index 4d6f110d0f..2f91156dfd 100644
--- a/src/types/response/index.ts
+++ b/src/types/response/index.ts
@@ -1,4 +1,5 @@
 import {
+  AddressResponse,
   CheckboxResponse,
   ChildBirthRecordsResponse,
   TableResponse,
@@ -21,6 +22,7 @@ export type SingleAnswerFieldResponse =
       | CheckboxResponse
       | IAttachmentResponse
       | ChildBirthRecordsResponse
+      | AddressResponse
     >
   | Exclude<
       ParsedClearFormFieldResponse,
@@ -28,6 +30,7 @@ export type SingleAnswerFieldResponse =
       | CheckboxResponse
       | IAttachmentResponse
       | ChildBirthRecordsResponse
+      | AddressResponse
     >
 
 export type FieldResponse =