diff --git a/remix/app/components/ImageEditModal.tsx b/remix/app/components/ImageEditModal.tsx
index 654addd..9c404f1 100644
--- a/remix/app/components/ImageEditModal.tsx
+++ b/remix/app/components/ImageEditModal.tsx
@@ -11,11 +11,11 @@ import {
 import { ChangeEvent, useEffect, useState } from "react"
 
 import FocalPointPicker from "~/shared-components/FocalPointPicker"
-import type { FocalPoint, InsertResponse } from "~/types/imagevault"
+import type { FocalPoint, ImageVaultAsset } from "~/types/imagevault"
 
 type ImageEditModalProps = {
-  fieldData: InsertResponse
-  setData: (data: InsertResponse) => void
+  fieldData: ImageVaultAsset
+  setData: (data: ImageVaultAsset) => void
   closeModal: () => void
 }
 
@@ -28,47 +28,33 @@ export default function ImageEditModal({
   const [caption, setCaption] = useState("")
   const [focalPoint, setFocalPoint] = useState<FocalPoint>({ x: 50, y: 50 })
 
-  const assetUrl = fieldData.MediaConversions[0].Url
+  const assetUrl = fieldData.url
 
   useEffect(() => {
-    if (fieldData.Metadata && fieldData.Metadata.length) {
-      const altText = fieldData.Metadata.find((meta) =>
-        meta.Name.includes("AltText_")
-      )?.Value
-
-      const caption = fieldData.Metadata.find((meta) =>
-        meta.Name.includes("Title_")
-      )?.Value
-
-      setAltText(altText ?? "")
-      setCaption(caption ?? "")
+    if (fieldData.meta.alt) {
+      setAltText(fieldData.meta.alt)
     }
-  }, [fieldData.Metadata])
+    if (fieldData.meta.caption) {
+      setCaption(fieldData.meta.caption)
+    }
+  }, [fieldData.meta])
 
   useEffect(() => {
-    if (fieldData.FocalPoint) {
-      setFocalPoint(fieldData.FocalPoint)
+    if (fieldData.focalPoint) {
+      setFocalPoint(fieldData.focalPoint)
     }
-  }, [fieldData.FocalPoint])
+  }, [fieldData.focalPoint])
 
   function handleSave() {
-    const metaData = fieldData.Metadata ?? []
-
-    const newMetadata = metaData.map((meta) => {
-      if (meta.Name.includes("AltText_")) {
-        return { ...meta, Value: altText }
-      }
-      if (meta.Name.includes("Title_")) {
-        return { ...meta, Value: caption }
-      }
-      return meta
-    })
-
-    setData({
+    const newData = {
       ...fieldData,
-      Metadata: newMetadata,
-      FocalPoint: focalPoint,
-    })
+      meta: {
+        alt: altText,
+        caption,
+      },
+      focalPoint,
+    }
+    setData(newData)
     closeModal()
   }
 
@@ -132,7 +118,11 @@ export default function ImageEditModal({
 
           <FieldComponent>
             <FieldLabel htmlFor="imageVaultId">Imagevault Id</FieldLabel>
-            <TextInput value={fieldData.Id} name="imageVaultId" disabled />
+            <TextInput
+              value={fieldData.imageVaultId}
+              name="imageVaultId"
+              disabled
+            />
           </FieldComponent>
         </div>
       </ModalBody>
diff --git a/remix/app/components/ImageVaultDAM.tsx b/remix/app/components/ImageVaultDAM.tsx
index 9cf72d0..196264c 100644
--- a/remix/app/components/ImageVaultDAM.tsx
+++ b/remix/app/components/ImageVaultDAM.tsx
@@ -7,12 +7,16 @@ import {
   FieldLabel,
   cbModal,
 } from "@contentstack/venus-components"
-import { isInsertResponse, openImageVault } from "~/utils/imagevault"
+import {
+  getImageVaultAssetFromData,
+  isInsertResponse,
+  openImageVault,
+} from "~/utils/imagevault"
 import ImageEditModal from "./ImageEditModal"
 
 import type UiLocation from "@contentstack/app-sdk/dist/src/uiLocation"
 import type { CbModalProps } from "@contentstack/venus-components/build/components/Modal/Modal"
-import type { InsertResponse } from "~/types/imagevault"
+import type { ImageVaultAsset, InsertResponse } from "~/types/imagevault"
 import type { Lang } from "~/types/lang"
 import type {
   EntryDataPublishDetails,
@@ -23,7 +27,7 @@ import FullSizeImage from "./FullSizeImage"
 export type ImageVaultDAMProps = {
   sdk: UiLocation
   config: ImageVaultDAMConfig
-  initialData: InsertResponse | null
+  initialData: ImageVaultAsset | InsertResponse | null
 }
 
 type DAMButtonProps = { onClick: () => void }
@@ -47,30 +51,26 @@ function DAMButton({ onClick }: DAMButtonProps) {
 }
 
 type MediaProps = {
-  media: InsertResponse
+  media: ImageVaultAsset
   onDelete: () => void
   onEdit: () => void
 }
 
 function Media({ media, onDelete, onEdit }: MediaProps) {
-  // MediaConversions is an array but will only contain one object
-  const { Url, Height, FormatHeight, Width, FormatWidth, Name, AspectRatio } =
-    media.MediaConversions[0]
+  const { url, meta, dimensions } = media
+  const { width, height, aspectRatio } = dimensions
+  const assetUrl = media.url
+  const assetTitle = `Id: ${media.imageVaultId} - ${media.fileName}`
 
-  const assetUrl = Url
-  const title = `Id: ${media.Id} - ${media.Name}`
-  const width = FormatWidth || Width
-  const height = FormatHeight || Height
-  const alt =
-    media.Metadata?.find((meta) => meta.Name.includes("AltText_"))?.Value ||
-    Name
+  const alt = meta.alt || meta.caption || ""
+  const title = meta.caption || meta.alt || ""
 
   return (
-    <div key={Url} style={{ fontFamily: "Inter" }}>
+    <div key={url} style={{ fontFamily: "Inter" }}>
       <AssetCardVertical
         assetType="image"
         assetUrl={assetUrl}
-        title={title}
+        title={assetTitle}
         version="v2"
         width={width}
         height={height}
@@ -84,10 +84,10 @@ function Media({ media, onDelete, onEdit }: MediaProps) {
                 <FullSizeImage
                   // eslint-disable-next-line react/prop-types
                   onClose={props.closeModal}
-                  imageUrl={Url}
+                  imageUrl={url}
                   alt={alt}
-                  title={Name}
-                  aspectRatio={AspectRatio}
+                  title={title}
+                  aspectRatio={aspectRatio}
                 />
               )
             },
@@ -117,7 +117,8 @@ export default function ImageVaultDAM({
   config,
   initialData,
 }: ImageVaultDAMProps) {
-  const [media, setMedia] = useState<InsertResponse | null>(initialData)
+  const imageVaultAsset = getImageVaultAssetFromData(initialData)
+  const [media, setMedia] = useState(imageVaultAsset)
 
   const field = sdk.location.CustomField?.field
   const frame = sdk.location.CustomField?.frame
@@ -133,12 +134,10 @@ export default function ImageVaultDAM({
   }, [frame])
 
   const handleMedia = useCallback(
-    (result?: InsertResponse) => {
+    (asset?: ImageVaultAsset) => {
       if (field) {
         flushSync(() => {
-          const data = result
-            ? { ...result, FocalPoint: result.FocalPoint || { x: 50, y: 50 } }
-            : null
+          const data = asset || null
           setMedia(data)
           field.setData(data)
           document.body.style.overflow = "hidden"
@@ -150,13 +149,9 @@ export default function ImageVaultDAM({
     [field, updateFrameHeight]
   )
 
-  useEffect(() => {
-    updateFrameHeight()
-  }, [updateFrameHeight])
-
   const handleEdit = useCallback(() => {
-    const fieldData = field?.getData() as InsertResponse
-    if (isInsertResponse(fieldData)) {
+    const fieldData = field?.getData()
+    if (fieldData) {
       cbModal({
         // @ts-expect-error: Component is badly typed
         component: (compProps) => (
@@ -177,6 +172,18 @@ export default function ImageVaultDAM({
     }
   }, [field, handleMedia])
 
+  useEffect(() => {
+    updateFrameHeight()
+  }, [updateFrameHeight])
+
+  // The existing data might still be in InsertResponse format if the user has not edited it yet.
+  // We'll convert it to ImageVaultAsset when the user edits the the emtry.
+  useEffect(() => {
+    if (isInsertResponse(initialData) && imageVaultAsset) {
+      handleMedia(imageVaultAsset)
+    }
+  }, [initialData, imageVaultAsset, handleMedia])
+
   if (!field || !frame || !entry || !stack) {
     return <p>Initializing custom field...</p>
   }
diff --git a/rte/components/ImageEditModal.tsx b/rte/components/ImageEditModal.tsx
index 38b62a7..05ede35 100644
--- a/rte/components/ImageEditModal.tsx
+++ b/rte/components/ImageEditModal.tsx
@@ -1,154 +1,65 @@
 import {
   Button,
   ButtonGroup,
-  Field,
+  Field as FieldComponent,
   FieldLabel,
   ModalBody,
   ModalFooter,
   ModalHeader,
-  Select,
   TextInput,
 } from "@contentstack/venus-components"
 import React, { ChangeEvent, useEffect, useState } from "react"
-import { Path } from "slate"
 
-import type {
-  IRteElementType,
-  IRteParam,
-} from "@contentstack/app-sdk/dist/src/RTE/types"
+import type { IRteElementType } from "@contentstack/app-sdk/dist/src/RTE/types"
 import FocalPointPicker from "~/shared-components/FocalPointPicker"
 
-import type { FocalPoint, InsertResponse } from "~/types/imagevault"
-
-enum DropdownValues {
-  center = "center",
-  left = "left",
-  right = "right",
-  none = "none",
-}
-
-type DropDownItem = {
-  label: string
-  value: DropdownValues
-  type: string
-}
-
-const dropdownList: DropDownItem[] = [
-  {
-    label: "None",
-    value: DropdownValues.none,
-    type: "select",
-  },
-  {
-    label: "Center",
-    value: DropdownValues.center,
-    type: "select",
-  },
-  {
-    label: "Left",
-    value: DropdownValues.left,
-    type: "select",
-  },
-  {
-    label: "Right",
-    value: DropdownValues.right,
-    type: "select",
-  },
-]
+import type { FocalPoint, ImageVaultAsset } from "~/types/imagevault"
 
 type ImageEditModalProps = {
   element: IRteElementType & {
-    attrs: InsertResponse
+    attrs: ImageVaultAsset
   }
-  rte: IRteParam
+  setData: (data: ImageVaultAsset) => void
   closeModal: () => void
-  path: Path
 }
 
 export default function ImageEditModal({
   element,
+  setData,
   closeModal,
-  path,
-  rte,
 }: ImageEditModalProps) {
-  const [alignment, setAlignment] = useState<DropDownItem>({
-    label: "None",
-    value: DropdownValues.none,
-    type: "select",
-  })
+  const imageVaultAsset: ImageVaultAsset = element.attrs
   const [altText, setAltText] = useState("")
   const [caption, setCaption] = useState("")
   const [focalPoint, setFocalPoint] = useState<FocalPoint>({ x: 50, y: 50 })
 
-  const assetUrl = element.attrs.MediaConversions[0].Url
+  const assetUrl = imageVaultAsset.url
 
   useEffect(() => {
-    if (element.attrs.Metadata && element.attrs.Metadata.length) {
-      const altText = element.attrs.Metadata.find((meta) =>
-        meta.Name.includes("AltText_")
-      )?.Value
-
-      const caption = element.attrs.Metadata.find((meta) =>
-        meta.Name.includes("Title_")
-      )?.Value
-
-      setAltText(altText ?? "")
-      setCaption(caption ?? "")
+    if (imageVaultAsset.meta.alt) {
+      setAltText(imageVaultAsset.meta.alt)
     }
-  }, [element.attrs.Metadata])
+    if (imageVaultAsset.meta.caption) {
+      setCaption(imageVaultAsset.meta.caption)
+    }
+  }, [imageVaultAsset.meta])
 
   useEffect(() => {
-    if (element.attrs.FocalPoint) {
-      setFocalPoint(element.attrs.FocalPoint)
+    if (imageVaultAsset.focalPoint) {
+      setFocalPoint(imageVaultAsset.focalPoint)
     }
-  }, [element.attrs.FocalPoint])
+  }, [imageVaultAsset.focalPoint])
 
   function handleSave() {
-    let newStyle
-
-    switch (alignment.value) {
-      case DropdownValues.center:
-      case DropdownValues.left:
-      case DropdownValues.right:
-        newStyle = {
-          textAlign: alignment.value,
-          maxWidth: element.attrs.width
-            ? `${element.attrs.width}px`
-            : undefined,
-        }
-        break
-      case DropdownValues.none:
-      default:
-        newStyle = {}
-        break
-    }
-
-    const metaData = element.attrs.Metadata ?? []
-
-    const newMetadata = metaData.map((meta) => {
-      if (meta.Name.includes("AltText_")) {
-        return { ...meta, Value: altText }
-      }
-      if (meta.Name.includes("Title_")) {
-        return { ...meta, Value: caption }
-      }
-      return meta
-    })
-
-    rte._adv.Transforms?.setNodes<IRteElementType>(
-      rte._adv.editor,
-      {
-        attrs: {
-          ...element.attrs,
-          Metadata: newMetadata,
-          position: alignment.value,
-          style: { ...element.attrs.style, ...newStyle },
-          FocalPoint: focalPoint,
-        },
+    const newData = {
+      ...imageVaultAsset,
+      meta: {
+        alt: altText,
+        caption,
       },
-      { at: path }
-    )
-
+      focalPoint,
+    }
+    setData(newData)
     closeModal()
   }
 
@@ -177,18 +88,7 @@ export default function ImageEditModal({
           onChange={changeFocalPoint}
         />
         <div>
-          <Field>
-            {/* @ts-expect-error: Type incompatibility with Venus components */}
-            <Select
-              selectLabel="Alignment"
-              value={alignment}
-              onChange={(e: DropDownItem) => {
-                setAlignment(e)
-              }}
-              options={dropdownList}
-            />
-          </Field>
-          <Field>
+          <FieldComponent>
             <FieldLabel htmlFor="alt">Alt text</FieldLabel>
             <TextInput
               value={altText}
@@ -198,9 +98,9 @@ export default function ImageEditModal({
                 setAltText(e.target.value)
               }
             />
-          </Field>
+          </FieldComponent>
 
-          <Field>
+          <FieldComponent>
             <FieldLabel htmlFor="caption">Caption</FieldLabel>
             <TextInput
               value={caption}
@@ -210,16 +110,25 @@ export default function ImageEditModal({
                 setCaption(e.target.value)
               }
             />
-          </Field>
+          </FieldComponent>
 
-          <Field>
+          <FieldComponent>
             <FieldLabel htmlFor="focalPoint">Focal Point</FieldLabel>
             <TextInput
               value={`X: ${focalPoint.x}, Y: ${focalPoint.y}`}
               name="focalPoint"
               disabled
             />
-          </Field>
+          </FieldComponent>
+
+          <FieldComponent>
+            <FieldLabel htmlFor="imageVaultId">Imagevault Id</FieldLabel>
+            <TextInput
+              value={imageVaultAsset.imageVaultId}
+              name="imageVaultId"
+              disabled
+            />
+          </FieldComponent>
         </div>
       </ModalBody>
       <ModalFooter>
diff --git a/rte/components/ImageElement.tsx b/rte/components/ImageElement.tsx
index de78793..9c2065c 100644
--- a/rte/components/ImageElement.tsx
+++ b/rte/components/ImageElement.tsx
@@ -1,5 +1,5 @@
 import { Icon, Tooltip, cbModal } from "@contentstack/venus-components"
-import React, { PropsWithChildren, useCallback } from "react"
+import React, { PropsWithChildren, useCallback, useEffect } from "react"
 
 import EmbedBtn from "./EmbedBtn"
 import ImageEditModal from "./ImageEditModal"
@@ -8,28 +8,46 @@ import type {
   IRteElementType,
   IRteParam,
 } from "@contentstack/app-sdk/dist/src/RTE/types"
-import type { InsertResponse } from "~/types/imagevault"
+import type { ImageVaultAsset, InsertResponse } from "~/types/imagevault"
+import {
+  getImageVaultAssetFromData,
+  isInsertResponse,
+} from "~/utils/imagevault"
 
 type ImageElementProps = PropsWithChildren & {
-  element: IRteElementType & { attrs: InsertResponse }
+  element: IRteElementType & { attrs: ImageVaultAsset | InsertResponse }
   rte: IRteParam
 }
 export function ImageElement({ children, element, rte }: ImageElementProps) {
-  const assetUrl = element.attrs.MediaConversions[0].Url
-  const isSelected = rte?.selection?.isSelected()
-  const isFocused = rte?.selection?.isFocused()
+  const imageVaultAsset = getImageVaultAssetFromData(element.attrs)
+  const isSelected = rte.selection.isSelected()
+  const isFocused = rte.selection.isFocused()
+  const path = rte.getPath(element)
   const isHighlight = isFocused && isSelected
 
+  const handleMedia = useCallback(
+    (asset: ImageVaultAsset) => {
+      rte._adv.Transforms.setNodes<IRteElementType>(
+        rte._adv.editor,
+        {
+          attrs: { ...asset },
+        },
+        { at: path }
+      )
+    },
+    [rte, path]
+  )
+
   const handleEdit = useCallback(() => {
     cbModal({
       // @ts-expect-error: Component is badly typed
-      component: (compProps) =>
-        ImageEditModal({
-          element,
-          rte,
-          path: rte.getPath(element),
-          ...compProps,
-        }),
+      component: (compProps) => (
+        <ImageEditModal
+          element={element}
+          setData={handleMedia}
+          {...compProps}
+        />
+      ),
       modalProps: {
         size: "max",
         style: {
@@ -42,7 +60,15 @@ export function ImageElement({ children, element, rte }: ImageElementProps) {
         },
       },
     })
-  }, [element, rte])
+  }, [element, handleMedia])
+
+  // The existing data might still be in InsertResponse format if the user has not edited it yet.
+  // We'll convert it to ImageVaultAsset when the user edits the RTE.
+  useEffect(() => {
+    if (isInsertResponse(element.attrs) && imageVaultAsset) {
+      handleMedia(imageVaultAsset)
+    }
+  }, [element.attrs, imageVaultAsset, handleMedia])
 
   const ToolTipButtons = () => {
     return (
@@ -54,7 +80,7 @@ export function ImageElement({ children, element, rte }: ImageElementProps) {
         <EmbedBtn
           title="remove"
           content={"Remove"}
-          onClick={() => rte?.removeNode(element)}
+          onClick={() => rte.removeNode(element)}
         >
           <Icon icon="Trash" />
         </EmbedBtn>
@@ -62,78 +88,46 @@ export function ImageElement({ children, element, rte }: ImageElementProps) {
     )
   }
 
-  let alignmentStyles = {}
-  const marginAlignment: Record<string, { [key: string]: string }> = {
-    center: { margin: "auto" },
-    left: { marginRight: "auto" },
-    right: { marginLeft: "auto" },
-  }
-
-  if (typeof element.attrs.position === "string") {
-    alignmentStyles = marginAlignment[element.attrs.position]
+  if (!imageVaultAsset) {
+    return <>{children}</>
   }
 
   return (
-    <div
-      style={{
-        ...alignmentStyles,
-        ...element.attrs.style,
-      }}
+    <Tooltip
+      zIndex={909}
+      className="p-0"
+      style={{ marginBottom: "10px" }}
+      position="top"
+      variantType="light"
+      offset={[0, -15]}
+      content={<ToolTipButtons />}
     >
-      <Tooltip
-        zIndex={909}
-        className="p-0"
-        style={{ marginBottom: "10px" }}
-        position="top"
-        variantType="light"
-        offset={[0, -15]}
-        content={<ToolTipButtons />}
-      >
-        <span
-          data-type="asset"
+      <span data-type="asset" contentEditable={false}>
+        <div
           contentEditable={false}
-          style={element.attrs?.style}
+          style={{
+            width: "280px",
+            height: "auto",
+            ...(isHighlight ? { border: "1px solid #6c5ce7" } : {}),
+          }}
         >
-          <div
-            contentEditable={false}
-            style={{
-              width: "280px",
-              height: "auto",
-              ...(isHighlight ? { border: "1px solid #6c5ce7" } : {}),
+          <img
+            src={imageVaultAsset.url}
+            onError={(event) => {
+              event.currentTarget.src = "https://placehold.co/600x400"
             }}
-          >
-            <img
-              src={assetUrl}
-              onError={(event) => {
-                event.currentTarget.src = "https://placehold.co/600x400"
-              }}
-              style={{
-                width: "100%",
-                height: "auto",
-                aspectRatio: element.attrs.MediaConversions[0].AspectRatio,
-                borderRadius: "8px",
-              }}
-              alt={element.attrs.altText}
-              title={element.attrs?.Name}
-            />
-            <div
-              style={{
-                position: "absolute",
-                bottom: 0,
-                right: 0,
-                background: "#fff",
-                color: "#000",
-                height: "25px",
-                padding: "3px",
-                borderRadius: "4px",
-              }}
-            >
-              <Icon icon="Embed" />
-            </div>
-          </div>
-          {children}
-        </span>
-      </Tooltip>
-    </div>
+            style={{
+              width: "100%",
+              height: "auto",
+              aspectRatio: imageVaultAsset.dimensions.aspectRatio,
+              borderRadius: "8px",
+            }}
+            alt={imageVaultAsset.meta.alt}
+            title={`Id: ${imageVaultAsset.imageVaultId} - ${imageVaultAsset.fileName}`}
+          />
+        </div>
+        {children}
+      </span>
+    </Tooltip>
   )
 }
diff --git a/rte/main.tsx b/rte/main.tsx
index a4f1547..474a078 100644
--- a/rte/main.tsx
+++ b/rte/main.tsx
@@ -1,11 +1,10 @@
 import ContentstackSDK from "@contentstack/app-sdk"
 import React from "react"
 
-import { ImageElement } from "~/components/ImageElement"
-
 import { Icon } from "@contentstack/venus-components"
 import { openImageVault } from "~/utils/imagevault"
 
+import { ImageElement } from "~/components/ImageElement"
 import type {
   ContentstackEmbeddedData,
   ContentstackPluginDefinition,
@@ -121,10 +120,10 @@ function loadIV(plugin: ContentstackPluginDefinition) {
   }
 }
 
-export default ContentstackSDK.init().then(async (sdk) => {
+export default ContentstackSDK.init().then((sdk) => {
   try {
-    const extensionObj = await sdk["location"]
-    const RTE = await extensionObj["RTEPlugin"]
+    const extensionObj = sdk["location"]
+    const RTE = extensionObj["RTEPlugin"]
 
     if (!RTE) {
       return
@@ -178,7 +177,7 @@ export default ContentstackSDK.init().then(async (sdk) => {
 
     ImageVault.on("exec", async (rte) => {
       if (rte) {
-        const savedSelection = rte?.selection?.get() ?? undefined
+        const savedSelection = rte.selection.get() ?? undefined
 
         const appConfig = await rte.getConfig()
 
@@ -214,7 +213,6 @@ export default ContentstackSDK.init().then(async (sdk) => {
                 type: "ImageVault",
                 attrs: {
                   ...result,
-                  FocalPoint: result.FocalPoint || { x: 50, y: 50 },
                 },
                 uid: crypto.randomUUID(),
                 children: [{ text: "" }],
diff --git a/types/imagevault.ts b/types/imagevault.ts
index d895741..e91a397 100644
--- a/types/imagevault.ts
+++ b/types/imagevault.ts
@@ -55,8 +55,8 @@ export type MetaData = {
 }
 
 export type ImageVaultAsset = {
-  id: number
-  title: string
+  imageVaultId: number
+  fileName: string
   url: string
   dimensions: {
     width: number
@@ -64,7 +64,7 @@ export type ImageVaultAsset = {
     aspectRatio: number
   }
   focalPoint: FocalPoint
-  meta: { alt: string | undefined; caption: string | undefined }
+  meta: { alt: string; caption: string }
 }
 
 /**
diff --git a/utils/imagevault.ts b/utils/imagevault.ts
index ff787b3..34367ec 100644
--- a/utils/imagevault.ts
+++ b/utils/imagevault.ts
@@ -1,7 +1,6 @@
 import { langEnum } from "../types/lang"
 
 import type { GenericObjectType } from "@contentstack/app-sdk/dist/src/types/common.types"
-import type { Lang } from "../types/lang"
 import type {
   Config,
   FocalPoint,
@@ -9,6 +8,7 @@ import type {
   InsertResponse,
   PublishDetails,
 } from "../types/imagevault"
+import type { Lang } from "../types/lang"
 
 const metaIds = {
   [langEnum.de]: { altText: 68, title: 77 },
@@ -50,9 +50,15 @@ export function getPublishDetails(
 }
 
 export function isInsertResponse(
-  res: InsertResponse | GenericObjectType
+  res: InsertResponse | GenericObjectType | null | undefined
 ): res is InsertResponse {
-  return (res as InsertResponse).MediaConversions !== undefined
+  return (res as InsertResponse)?.MediaConversions !== undefined
+}
+
+export function isImageVaultAsset(
+  res: ImageVaultAsset | InsertResponse | GenericObjectType | null | undefined
+): res is ImageVaultAsset {
+  return (res as ImageVaultAsset)?.url !== undefined
 }
 
 export type ImageVaultDAMConfig = {
@@ -67,42 +73,67 @@ export function isImageVaultDAMConfig(
   return !!(config.baseUrl && config.formatId && config.imageVaultUrl)
 }
 
-// Utility function to convert InsertResponse to ImageVaultAsset, used mainly for custom field images
-// For RTE this function is not enough since rte:s also need attrs, like position and the size thats
-// chosen in the editor
-export function insertResponseToImageVaultAsset(
+// Utility function to get ImageVaultAsset from either InsertResponse or ImageVaultAsset
+// Because we currently have both types saved in Contentstack, we need to account for both when retrieving the data of the asset.
+export function getImageVaultAssetFromData(
+  data: InsertResponse | ImageVaultAsset | GenericObjectType | null | undefined
+): ImageVaultAsset | null {
+  if (isImageVaultAsset(data)) {
+    return data
+  }
+  if (isInsertResponse(data)) {
+    return mapInsertResponseToImageVaultAsset(data, { x: 50, y: 50 })
+  }
+  return null
+}
+
+// Utility function to convert InsertResponse to ImageVaultAsset
+function mapInsertResponseToImageVaultAsset(
   response: InsertResponse,
   focalPoint: FocalPoint
 ): ImageVaultAsset {
-  const alt = response.Metadata?.find((meta) =>
-    meta.Name.includes("AltText_")
-  )?.Value
+  let image = response.MediaConversions.find(
+    (conversion) =>
+      conversion.MediaFormatName === "Original" &&
+      conversion.ContentType === "image/jpeg"
+  )
 
-  const caption = response.Metadata?.find((meta) =>
-    meta.Name.includes("Title_")
-  )?.Value
+  // We only receive one alt and title is in the response, depending on the language of the entry
+  // This is why we're getting the first one found
+  const alt =
+    response.Metadata?.find((meta) => meta.Name.includes("AltText_"))?.Value ||
+    ""
+  const caption =
+    response.Metadata?.find((meta) => meta.Name.includes("Title_"))?.Value || ""
+
+  if (!image) {
+    const imageAsJpeg = response.MediaConversions.find(
+      (conversion) => conversion.ContentType === "image/jpeg"
+    )
+    image = imageAsJpeg || response.MediaConversions[0]
+  }
 
   return {
-    url: response.MediaConversions[0].Url,
-    id: response.Id,
+    imageVaultId: response.Id,
+    url: image.Url,
     meta: {
       alt,
       caption,
     },
-    title: response.Name,
+    fileName: response.Name,
     dimensions: {
-      width: response.MediaConversions[0].Width,
-      height: response.MediaConversions[0].Height,
-      aspectRatio: response.MediaConversions[0].FormatAspectRatio,
+      width: image.Width,
+      height: image.Height,
+      aspectRatio: image.AspectRatio,
     },
-    focalPoint,
+    focalPoint: response.FocalPoint || focalPoint,
   }
 }
 
 export type openImageVaultParams = {
   config: ImageVaultDAMConfig
   entryData: EntryDataPublishDetails
-  onSuccess: (result: InsertResponse) => void
+  onSuccess: (result: ImageVaultAsset) => void
   onClose?: () => void
 }
 
@@ -126,7 +157,11 @@ export function openImageVault({
       publishDetails,
       insertMultiple: false,
       success: (result) => {
-        onSuccess(result.response)
+        const imageVaultAsset = mapInsertResponseToImageVaultAsset(
+          result.response,
+          { x: 50, y: 50 }
+        )
+        onSuccess(imageVaultAsset)
       },
       close: () => {
         if (typeof onClose === "function") {