diff --git a/examples/Basic/Basic.vue b/examples/Basic/Basic.vue
index 95134077..39db4068 100644
--- a/examples/Basic/Basic.vue
+++ b/examples/Basic/Basic.vue
@@ -58,8 +58,8 @@ const toggleclasss = () => {
 </script>
 <template>
   <VueFlow
+    v-model="elements"
     class="vue-flow-basic-example"
-    :elements="elements"
     :default-zoom="1.5"
     :min-zoom="0.2"
     :max-zoom="4"
diff --git a/examples/CustomConnectionLine/CustomConnectionLine.vue b/examples/CustomConnectionLine/CustomConnectionLine.vue
index bddacbdf..3c88145d 100644
--- a/examples/CustomConnectionLine/CustomConnectionLine.vue
+++ b/examples/CustomConnectionLine/CustomConnectionLine.vue
@@ -14,7 +14,7 @@ const onElementsRemove = (elementsToRemove: Elements) => (elements.value = remov
 const onConnect = (params: Connection | Edge) => (elements.value = addEdge(params, elements.value))
 </script>
 <template>
-  <VueFlow :elements="elements" @elements-remove="onElementsRemove" @connect="onConnect">
+  <VueFlow v-model="elements" @elements-remove="onElementsRemove" @connect="onConnect">
     <template #custom-connection-line="props">
       <ConnectionLine v-bind="props" />
     </template>
diff --git a/examples/CustomNode/CustomNode.vue b/examples/CustomNode/CustomNode.vue
index 067e0bbc..5400a417 100644
--- a/examples/CustomNode/CustomNode.vue
+++ b/examples/CustomNode/CustomNode.vue
@@ -22,9 +22,6 @@ const elements = ref<Elements>([])
 const bgColor = ref('#1A192B')
 const connectionLineStyle = { stroke: '#fff' }
 const snapGrid: SnapGrid = [16, 16]
-const nodeTypes = {
-  selectorNode: markRaw(ColorSelectorNode),
-}
 
 const onLoad = (flowInstance: FlowInstance) => {
   flowInstance.fitView()
@@ -114,7 +111,7 @@ const onConnect = (params: Connection | Edge) =>
   <VueFlow
     v-model="elements"
     :style="`background: ${bgColor}`"
-    :node-types="nodeTypes"
+    :node-types="['selectorNode']"
     :connection-mode="ConnectionMode.Loose"
     :connection-line-style="connectionLineStyle"
     :snap-to-grid="true"
@@ -126,6 +123,9 @@ const onConnect = (params: Connection | Edge) =>
     @node-drag-stop="onNodeDragStop"
     @load="onLoad"
   >
+    <template #node-selectorNode="props">
+      <ColorSelectorNode v-bind="props" />
+    </template>
     <MiniMap :node-stroke-color="nodeStroke" :node-color="nodeColor" />
     <Controls />
   </VueFlow>
diff --git a/examples/EdgeTypes/EdgeTypesExample.vue b/examples/EdgeTypes/EdgeTypesExample.vue
index d44ff309..a1c38948 100644
--- a/examples/EdgeTypes/EdgeTypesExample.vue
+++ b/examples/EdgeTypes/EdgeTypesExample.vue
@@ -23,7 +23,7 @@ const onElementsRemove = (elementsToRemove: Elements) => (elements.value = remov
 const onConnect = (params: Connection | Edge) => (elements.value = addEdge(params, elements.value))
 </script>
 <template>
-  <VueFlow :elements="elements" :min-zoom="0.2" @load="onLoad" @elements-remove="onElementsRemove" @connect="onConnect">
+  <VueFlow v-model="elements" :min-zoom="0.2" @load="onLoad" @elements-remove="onElementsRemove" @connect="onConnect">
     <MiniMap />
     <Controls />
   </VueFlow>
diff --git a/examples/EdgeWithButton/EdgeWithButton.vue b/examples/EdgeWithButton/EdgeWithButton.vue
index 8a5f861b..56a6b833 100644
--- a/examples/EdgeWithButton/EdgeWithButton.vue
+++ b/examples/EdgeWithButton/EdgeWithButton.vue
@@ -7,15 +7,11 @@ import {
   Connection,
   Controls,
   Edge,
-  EdgeType,
   Elements,
   MiniMap,
   FlowInstance,
   removeElements,
 } from '~/index'
-const edgeTypes = {
-  buttonedge: ButtonEdge as EdgeType,
-}
 
 const elements = ref<Elements>([
   {
@@ -29,7 +25,7 @@ const elements = ref<Elements>([
     id: 'edge-1-2',
     source: 'ewb-1',
     target: 'ewb-2',
-    type: 'buttonedge',
+    type: 'button',
   },
 ])
 
@@ -41,13 +37,16 @@ const onConnect = (params: Connection | Edge) =>
 <template>
   <VueFlow
     key="edge-with-button"
-    :elements="elements"
+    v-model="elements"
     :snap-to-grid="true"
-    :edge-types="edgeTypes"
+    :edge-types="['button']"
     @load="onLoad"
     @elementsRemove="onElementsRemove"
     @connect="onConnect"
   >
+    <template #edge-button="props">
+      <ButtonEdge v-bind="props" />
+    </template>
     <MiniMap />
     <Controls />
     <Background />
diff --git a/examples/Edges/EdgesExample.vue b/examples/Edges/EdgesExample.vue
index dfd03d23..ce232768 100644
--- a/examples/Edges/EdgesExample.vue
+++ b/examples/Edges/EdgesExample.vue
@@ -75,11 +75,6 @@ const initialElements: Elements = [
   },
 ]
 
-const edgeTypes: Record<string, any> = {
-  custom: CustomEdge,
-  custom2: CustomEdge2,
-}
-
 const elements = ref<Elements>(initialElements)
 
 const onLoad = (flowInstance: FlowInstance) => flowInstance.fitView()
@@ -90,15 +85,21 @@ const onConnect = (params: Connection | Edge) => (elements.value = addEdge(param
 </script>
 <template>
   <VueFlow
-    :elements="elements"
+    v-model="elements"
     :snap-to-grid="true"
-    :edge-types="edgeTypes"
+    :edge-types="['custom', 'custom2']"
     @element-click="onElementClick"
     @elements-remove="onElementsRemove"
     @connect="onConnect"
     @node-drag-stop="onNodeDragStop"
     @load="onLoad"
   >
+    <template #edge-custom="props">
+      <CustomEdge v-bind="props" />
+    </template>
+    <template #edge-custom2="props">
+      <CustomEdge2 v-bind="props" />
+    </template>
     <MiniMap />
     <Controls />
     <Background />
diff --git a/examples/Hidden/HiddenExample.vue b/examples/Hidden/HiddenExample.vue
index a56caea7..cb84d297 100644
--- a/examples/Hidden/HiddenExample.vue
+++ b/examples/Hidden/HiddenExample.vue
@@ -23,7 +23,7 @@ watchEffect(() => {
 })
 </script>
 <template>
-  <VueFlow :elements="elements" @connect="onConnect">
+  <VueFlow v-model="elements" @connect="onConnect">
     <MiniMap />
     <Controls />
 
diff --git a/examples/Interaction/InteractionExample.vue b/examples/Interaction/InteractionExample.vue
index 51b8a771..0ec655a9 100644
--- a/examples/Interaction/InteractionExample.vue
+++ b/examples/Interaction/InteractionExample.vue
@@ -48,7 +48,7 @@ const captureElementClick = ref(false)
 </script>
 <template>
   <VueFlow
-    :elements="elements"
+    v-model="elements"
     :elements-selectable="isSelectable"
     :nodes-connectable="isConnectable"
     :nodes-draggable="isDraggable"
diff --git a/examples/Layouting/LayoutingExample.vue b/examples/Layouting/LayoutingExample.vue
index 8c48cc4d..492cddcd 100644
--- a/examples/Layouting/LayoutingExample.vue
+++ b/examples/Layouting/LayoutingExample.vue
@@ -59,7 +59,7 @@ const onLayout = (direction: string) => {
 <template>
   <div class="layoutflow">
     <VueFlow
-      :elements="elements"
+      v-model="elements"
       :node-extent="nodeExtent"
       :connection-mode="ConnectionMode.Loose"
       @connect="onConnect"
diff --git a/examples/MultiFlows/Flow.vue b/examples/MultiFlows/Flow.vue
index cfa42632..84918958 100644
--- a/examples/MultiFlows/Flow.vue
+++ b/examples/MultiFlows/Flow.vue
@@ -14,7 +14,7 @@ const onConnect = (params: Connection | Edge) => (elements.value = addEdge(param
 const onElementsRemove = (elementsToRemove: Elements) => (elements.value = removeElements(elementsToRemove, elements.value))
 </script>
 <template>
-  <VueFlow :elements="elements" @elements-remove="onElementsRemove" @connect="onConnect">
+  <VueFlow v-model="elements" @elements-remove="onElementsRemove" @connect="onConnect">
     <Background />
   </VueFlow>
 </template>
diff --git a/examples/NodeTypeChange/NodeTypeChangeExample.vue b/examples/NodeTypeChange/NodeTypeChangeExample.vue
index add9afe5..fc188e30 100644
--- a/examples/NodeTypeChange/NodeTypeChangeExample.vue
+++ b/examples/NodeTypeChange/NodeTypeChangeExample.vue
@@ -41,7 +41,7 @@ const changeType = () => {
 }
 </script>
 <template>
-  <VueFlow :elements="elements" @connect="onConnect" @load="onLoad">
+  <VueFlow v-model="elements" @connect="onConnect" @load="onLoad">
     <button :style="buttonStyle" @click="changeType">change type</button>
   </VueFlow>
 </template>
diff --git a/examples/NodeTypesIdChange/NodeTypesIdChangeExample.vue b/examples/NodeTypesIdChange/NodeTypesIdChangeExample.vue
index 317e0319..892c6aff 100644
--- a/examples/NodeTypesIdChange/NodeTypesIdChangeExample.vue
+++ b/examples/NodeTypesIdChange/NodeTypesIdChangeExample.vue
@@ -27,12 +27,8 @@ const buttonStyle: CSSProperties = { position: 'absolute', right: 10, top: 30, z
 const nodeStyles: CSSProperties = { padding: '10px 15px', border: '1px solid #ddd' }
 
 const nodeTypesObjects: Record<string, NodeTypes> = {
-  a: {
-    a: NodeA,
-  },
-  b: {
-    b: NodeB,
-  },
+  a: ['a'],
+  b: ['b'],
 }
 
 const elements = ref(initialElements)
diff --git a/examples/Overview/Overview.vue b/examples/Overview/Overview.vue
index 84d0591a..ae51a4c3 100644
--- a/examples/Overview/Overview.vue
+++ b/examples/Overview/Overview.vue
@@ -137,7 +137,7 @@ const onElementsRemove = (elementsToRemove: Elements) => (elements.value = remov
 </script>
 <template>
   <VueFlow
-    :elements="elements"
+    v-model="elements"
     :connection-line-style="connectionLineStyle"
     :snap-to-grid="true"
     :snap-grid="snapGrid"
diff --git a/examples/Provider/ProviderExample.vue b/examples/Provider/ProviderExample.vue
index 05837fa2..1ce45b2b 100644
--- a/examples/Provider/ProviderExample.vue
+++ b/examples/Provider/ProviderExample.vue
@@ -38,7 +38,7 @@ const onElementsRemove = (elementsToRemove: Elements) => (elements.value = remov
     <Sidebar />
     <div class="vue-flow-wrapper">
       <VueFlow
-        :elements="elements"
+        v-model="elements"
         :connection-mode="ConnectionMode.Loose"
         @element-click="onElementClick"
         @connect="onConnect"
diff --git a/examples/RGBFlow/RGBFlow.vue b/examples/RGBFlow/RGBFlow.vue
index c7ec36a8..08024ad6 100644
--- a/examples/RGBFlow/RGBFlow.vue
+++ b/examples/RGBFlow/RGBFlow.vue
@@ -31,13 +31,8 @@ const color = ref<Colors>({
 })
 const onChange = ({ color: c, val }: { color: keyof Colors; val: number }) => (color.value[c] = Number(val))
 const store = useVueFlow({
-  nodeTypes: {
-    'rgb': true,
-    'rgb-output': true,
-  },
-  edgeTypes: {
-    pathfinding: true,
-  },
+  nodeTypes: ['rgb', 'rgb-output'],
+  edgeTypes: ['pathfinding'],
   zoomOnScroll: false,
 })
 </script>
diff --git a/examples/Stress/StressExample.vue b/examples/Stress/StressExample.vue
index 66675ebf..d527d67b 100644
--- a/examples/Stress/StressExample.vue
+++ b/examples/Stress/StressExample.vue
@@ -51,6 +51,7 @@ const updateElements = () => {
 <template>
   <VueFlow
     v-model="elements"
+    :worker="true"
     :loading="{ label: 'Loading...', transition: { name: 'fade', mode: 'out-in' } }"
     @load="onLoad"
     @elementsRemove="onElementsRemove"
diff --git a/examples/Switch/SwitchExample.vue b/examples/Switch/SwitchExample.vue
index c253d06a..bf4a29ae 100644
--- a/examples/Switch/SwitchExample.vue
+++ b/examples/Switch/SwitchExample.vue
@@ -33,7 +33,7 @@ const onElementsRemove = (elementsToRemove: Elements) => (elements.value = remov
 </script>
 <template>
   <VueFlow
-    :elements="elements"
+    v-model="elements"
     @element-click="onElementClick"
     @elements-remove="onElementsRemove"
     @connect="onConnect"
diff --git a/examples/Unidirectional/UnidirectionalExample.vue b/examples/Unidirectional/UnidirectionalExample.vue
index 7cad2bc5..4c54de2c 100644
--- a/examples/Unidirectional/UnidirectionalExample.vue
+++ b/examples/Unidirectional/UnidirectionalExample.vue
@@ -2,7 +2,6 @@
 import CustomNode from './CustomNode.vue'
 import {
   VueFlow,
-  NodeType,
   addEdge,
   useZoomPanHelper,
   Elements,
@@ -14,7 +13,6 @@ import {
   ConnectionMode,
   updateEdge,
   ArrowHeadType,
-  NodeTypes,
 } from '~/index'
 
 const initialElements: Elements = [
@@ -173,10 +171,6 @@ const initialElements: Elements = [
   },
 ]
 
-const nodeTypes: NodeTypes = {
-  custom: CustomNode,
-}
-
 let id = 4
 const getId = (): ElementId => `${id++}`
 
@@ -195,12 +189,16 @@ const onPaneClick = (evt: MouseEvent) =>
 </script>
 <template>
   <VueFlow
-    :elements="elements"
-    :node-types="nodeTypes"
+    v-model="elements"
+    :node-types="['custom']"
     :connection-line-type="ConnectionLineType.SmoothStep"
     :connection-mode="ConnectionMode.Loose"
     @connect="onConnect"
     @pane-click="onPaneClick"
     @edge-pdate="onEdgeUpdate"
-  />
+  >
+    <template #node-custom="props">
+      <CustomNode v-bind="props" />
+    </template>
+  </VueFlow>
 </template>
diff --git a/examples/UpdatableEdge/UpdatableEdgeExample.vue b/examples/UpdatableEdge/UpdatableEdgeExample.vue
index 21bc155f..ef1cbeff 100644
--- a/examples/UpdatableEdge/UpdatableEdgeExample.vue
+++ b/examples/UpdatableEdge/UpdatableEdgeExample.vue
@@ -51,7 +51,7 @@ const onElementsRemove = (elementsToRemove: Elements) => (elements.value = remov
 </script>
 <template>
   <VueFlow
-    :elements="elements"
+    v-model="elements"
     :snap-to-grid="true"
     :connection-mode="ConnectionMode.Loose"
     @load="onLoad"
diff --git a/examples/UpdateNode/UpdateNodeExample.vue b/examples/UpdateNode/UpdateNodeExample.vue
index 7a70827e..fa703e4a 100644
--- a/examples/UpdateNode/UpdateNodeExample.vue
+++ b/examples/UpdateNode/UpdateNodeExample.vue
@@ -35,7 +35,7 @@ watchEffect(() => {
 })
 </script>
 <template>
-  <VueFlow :elements="elements" :default-zoom="1.5" :min-zoom="0.2" :max-zoom="4">
+  <VueFlow v-model="elements" :default-zoom="1.5" :min-zoom="0.2" :max-zoom="4">
     <div class="updatenode__controls">
       <label>label:</label>
       <input v-model="nodeName" />
diff --git a/examples/UpdateNodeInternals/CustomNode.vue b/examples/UpdateNodeInternals/CustomNode.vue
index 1f4be0a9..cb98c96f 100644
--- a/examples/UpdateNodeInternals/CustomNode.vue
+++ b/examples/UpdateNodeInternals/CustomNode.vue
@@ -3,7 +3,10 @@ import { CSSProperties } from 'vue'
 import { Handle, Position, NodeProps } from '~/index'
 
 interface CustomNodeProps extends NodeProps {
-  data: any
+  data: {
+    handleCount: number
+    handlePosition: number
+  }
 }
 const nodeStyles: CSSProperties = { padding: 10, border: '1px solid #ddd' }
 
diff --git a/examples/UpdateNodeInternals/UpdateNodeInternalsExample.vue b/examples/UpdateNodeInternals/UpdateNodeInternalsExample.vue
index 49cc0feb..1fe64870 100644
--- a/examples/UpdateNodeInternals/UpdateNodeInternalsExample.vue
+++ b/examples/UpdateNodeInternals/UpdateNodeInternalsExample.vue
@@ -3,7 +3,6 @@ import { CSSProperties } from 'vue'
 import CustomNode from './CustomNode.vue'
 import {
   VueFlow,
-  NodeType,
   addEdge,
   useZoomPanHelper,
   Node,
@@ -14,7 +13,6 @@ import {
   Position,
   isEdge,
   FlowInstance,
-  NodeTypes,
 } from '~/index'
 
 const initialHandleCount = 1
@@ -30,10 +28,6 @@ const initialElements: Elements = [
 
 const buttonWrapperStyles: CSSProperties = { position: 'absolute', right: 10, top: 10, zIndex: 10 }
 
-const nodeTypes: NodeTypes = {
-  custom: CustomNode,
-}
-
 let id = 5
 const getId = (): ElementId => `${id++}`
 
@@ -72,7 +66,10 @@ const onLoad = (instance: FlowInstance) => {
 }
 </script>
 <template>
-  <VueFlow :elements="elements" :node-types="nodeTypes" @connect="onConnect" @pane-click="onPaneClick" @load="onLoad">
+  <VueFlow v-model="elements" :node-types="['custom']" @connect="onConnect" @pane-click="onPaneClick" @load="onLoad">
+    <template #node-custom="props">
+      <CustomNode v-bind="props" />
+    </template>
     <div :style="buttonWrapperStyles">
       <button @click="toggleHandleCount">toggle handle count</button>
       <button @click="toggleHandlePosition">toggle handle position</button>
diff --git a/examples/Validation/ValidationExample.vue b/examples/Validation/ValidationExample.vue
index 408dc66e..87f8972f 100644
--- a/examples/Validation/ValidationExample.vue
+++ b/examples/Validation/ValidationExample.vue
@@ -1,20 +1,7 @@
 <script lang="ts" setup>
 import CustomInput from './CustomInput.vue'
 import CustomNode from './CustomNode.vue'
-import {
-  VueFlow,
-  addEdge,
-  Handle,
-  Connection,
-  Position,
-  Elements,
-  Edge,
-  OnConnectStartParams,
-  NodeProps,
-  FlowInstance,
-  NodeType,
-  NodeTypes,
-} from '~/index'
+import { VueFlow, addEdge, Connection, Elements, Edge, OnConnectStartParams, FlowInstance } from '~/index'
 
 import './validation.css'
 
@@ -35,21 +22,24 @@ const onConnect = (params: Connection | Edge) => {
   console.log('on connect', params)
   elements.value = addEdge(params, elements.value)
 }
-const nodeTypes: NodeTypes = {
-  custominput: CustomInput,
-  customnode: CustomNode,
-}
 </script>
 <template>
   <VueFlow
-    :elements="elements"
+    v-model="elements"
     :select-nodes-on-drag="false"
+    :node-types="['custominput', 'customnode']"
     class="validationflow"
-    :node-types="nodeTypes"
     @connect="onConnect"
     @oad="onLoad"
     @connect-start="onConnectStart"
     @connect-stop="onConnectStop"
     @connect-end="onConnectEnd"
-  />
+  >
+    <template #node-custominput="props">
+      <CustomInput v-bind="props" />
+    </template>
+    <template #node-customnode="props">
+      <CustomNode v-bind="props" />
+    </template>
+  </VueFlow>
 </template>
diff --git a/examples/ZoomPanHelper/ZoomPanHelperExample.vue b/examples/ZoomPanHelper/ZoomPanHelperExample.vue
index 8088a493..3ec54463 100644
--- a/examples/ZoomPanHelper/ZoomPanHelperExample.vue
+++ b/examples/ZoomPanHelper/ZoomPanHelperExample.vue
@@ -44,7 +44,7 @@ const onConnect = (params: Connection | Edge) => (elements.value = addEdge(param
 const onElementsRemove = (elementsToRemove: Elements) => (elements.value = removeElements(elementsToRemove, elements.value))
 </script>
 <template>
-  <VueFlow :elements="elements" @elements-remove="onElementsRemove" @connect="onConnect" @pane-click="onPaneClick">
+  <VueFlow v-model="elements" @elements-remove="onElementsRemove" @connect="onConnect" @pane-click="onPaneClick">
     <Background />
     <MiniMap />
   </VueFlow>
diff --git a/src/components/Edges/Edge.vue b/src/components/Edges/Edge.vue
index 92663d19..1a754633 100644
--- a/src/components/Edges/Edge.vue
+++ b/src/components/Edges/Edge.vue
@@ -16,13 +16,15 @@ const props = withDefaults(defineProps<EdgeProps>(), {})
 const store = useStore()
 
 const type = computed(() => {
-  const edgeType = props.edge.type || 'default'
-  const t = store.getEdgeTypes[edgeType] || store.getEdgeTypes.default
-  if (!store.getEdgeTypes[edgeType]) {
-    console.warn(`Edge type "${edgeType}" not found. Using fallback type "default".`)
+  const t = props.edge.type ?? 'default'
+  let edge = store.getEdgeTypes[t]
+  if (!edge) {
+    edge = store.getEdgeTypes.default
+    console.warn(`Edge type "${t}" not found. Using fallback type "default".`)
   }
-  return t
+  return edge
 })
+
 const updating = ref<boolean>(false)
 
 const onEdgeClick = (event: MouseEvent) => {
diff --git a/src/components/Nodes/Node.vue b/src/components/Nodes/Node.vue
index 0a7dcb71..8887c340 100644
--- a/src/components/Nodes/Node.vue
+++ b/src/components/Nodes/Node.vue
@@ -21,12 +21,13 @@ provide(NodeId, props.node.id)
 const nodeElement = templateRef<HTMLDivElement>('node-element', null)
 
 const type = computed(() => {
-  const nodeType = props.node.type ?? 'default'
-  const t = store.getNodeTypes[nodeType] || store.getNodeTypes.default
-  if (!store.getNodeTypes[nodeType]) {
-    console.warn(`Node type "${nodeType}" not found. Using fallback type "default".`)
+  const t = props.node.type ?? 'default'
+  let node = store.getNodeTypes[t]
+  if (!node) {
+    node = store.getNodeTypes.default
+    console.warn(`Node type "${t}" not found. Using fallback type "default".`)
   }
-  return t
+  return node
 })
 
 const selectable = computed(() =>
@@ -192,7 +193,6 @@ onMounted(() => {
       >
         <component
           :is="type"
-          v-if="typeof type !== 'boolean'"
           v-bind="{
             id: props.node.id,
             data: props.node.data,
diff --git a/src/composables/useStore.ts b/src/composables/useStore.ts
index 255c8305..58801302 100644
--- a/src/composables/useStore.ts
+++ b/src/composables/useStore.ts
@@ -24,7 +24,6 @@ export default (options?: Partial<FlowOptions>, key?: string) => {
         if (storedState.value.position && storedState.value.zoom)
           preloadedState.transform = [storedState.value.position[0], storedState.value.position[1], storedState.value.zoom]
       }
-      console.log(storedState.value)
     }
     store = useStateStore(storageKey, preloadedState)()
     if (withStorage && storageKey === store.$id) {
diff --git a/src/container/EdgeRenderer/EdgeRenderer.vue b/src/container/EdgeRenderer/EdgeRenderer.vue
index 4df93654..f17614e0 100644
--- a/src/container/EdgeRenderer/EdgeRenderer.vue
+++ b/src/container/EdgeRenderer/EdgeRenderer.vue
@@ -34,8 +34,8 @@ const transform = computed(() => `translate(${store.transform[0]},${store.transf
     <MarkerDefinitions :color="props.arrowHeadColor" />
     <g :transform="transform">
       <Edge
-        v-for="edge of store.getEdges"
-        :key="edge.id"
+        v-for="(edge, i) of store.getEdges"
+        :key="`${edge.id}-${i}`"
         :edge="edge"
         :marker-end-id="props.markerEndId"
         :edge-updater-radius="props.edgeUpdaterRadius"
diff --git a/src/container/VueFlow/VueFlow.vue b/src/container/VueFlow/VueFlow.vue
index 83597507..c32a84d7 100644
--- a/src/container/VueFlow/VueFlow.vue
+++ b/src/container/VueFlow/VueFlow.vue
@@ -30,7 +30,6 @@ export interface FlowProps extends Partial<FlowOptions> {
   id?: string
   store?: FlowStore
   modelValue?: Elements
-  elements?: Elements
   nodeTypes?: NodeTypes
   edgeTypes?: EdgeTypes
   connectionMode?: ConnectionMode
@@ -72,7 +71,6 @@ const emit = defineEmits([...Object.keys(createHooks()), 'update:elements', 'upd
 
 const props = withDefaults(defineProps<FlowProps>(), {
   modelValue: () => [],
-  elements: () => [],
   connectionMode: ConnectionMode.Loose,
   connectionLineType: ConnectionLineType.Bezier,
   selectionKeyCode: 'Shift',
@@ -111,18 +109,18 @@ const props = withDefaults(defineProps<FlowProps>(), {
   worker: false,
 })
 const store = initFlow(emit, typeof props.storageKey === 'string' ? props.storageKey : props.id, props.store)
-const elements = useVModel(props, props.elements.length ? 'elements' : 'modelValue', emit)
-
-const options = Object.assign({}, props, store.$state)
+const elements = useVModel(props, 'modelValue', emit)
 
 // if there are preloaded elements we overwrite the current elements with the stored ones
 if (store.elements.length) elements.value = store.elements
 
+const options = Object.assign({}, store.$state, props)
+
 const init = (state: FlowState) => {
   // set state variables
   for (const opt of Object.keys(state)) {
     const val = state[opt as keyof FlowState]
-    if (typeof val !== 'undefined') {
+    if (typeof val !== 'undefined' && opt !== 'modelValue' && opt !== 'elements') {
       if (typeof val === 'object' && !Array.isArray(val)) {
         ;(store as any)[opt] = { ...(store as any)[opt], ...val }
       } else (store as any)[opt] = val
@@ -157,32 +155,13 @@ invoke(async () => {
   store.instance = instance
 })
 
+throttledWatch(elements, (val) => store.setElements(val), { flush: 'post', deep: true, throttle: 10 })
+throttledWatch(store.elements, (val) => (elements.value = val), { flush: 'post', deep: true, throttle: 10 })
+
 onMounted(() => {
-  watch(
-    elements,
-    (val) => {
-      // if new elements are added or elements have been removed, we want to re-parse the elements
-      if (val.length !== store.elements.length) store.setElements(val)
-    },
-    { flush: 'post', deep: true },
-  )
-  watch(
-    store.elements,
-    (val) => {
-      // if stored elements change we want to update the v-model to notify parent about changes, i.e. there was a state manipulation
-      const hasDiff = diff(val, elements.value)
-      if (hasDiff.length > 0) elements.value = val
-    },
-    { flush: 'post', deep: true },
-  )
-
   watch(
     () => props,
-    (val, oldVal) => {
-      const hasDiff = diff(val, oldVal)
-      // when props changed we want to update state variables
-      if (hasDiff.length > 0) init({ ...store.$state, ...props } as FlowState)
-    },
+    () => init({ ...store.$state, ...props } as FlowState),
     { flush: 'post', deep: true },
   )
 })
@@ -252,8 +231,8 @@ const transitionName = computed(() => {
             <slot name="zoom-pane" v-bind="zoomPaneProps"></slot>
           </template>
         </ZoomPane>
-        <template #fallback>
-          <slot v-if="store.loading" key="loading-indicator" name="loading-indicator">
+        <template v-if="store.loading" #fallback>
+          <slot key="loading-indicator" name="loading-indicator">
             <LoadingIndicator key="default-loading-indicator" v-bind="store.loading">
               <slot name="loading-label" />
             </LoadingIndicator>
diff --git a/src/store/stateStore.ts b/src/store/stateStore.ts
index 7a0a32e7..f1c9e778 100644
--- a/src/store/stateStore.ts
+++ b/src/store/stateStore.ts
@@ -1,7 +1,7 @@
 import { setActivePinia, createPinia, defineStore, StoreDefinition } from 'pinia'
 import diff from 'microdiff'
-import { parseElements, defaultNodeTypes, defaultEdgeTypes, deepUnref } from './utils'
-import { FlowState, Node, FlowActions, Elements, FlowGetters, Edge, EdgeTypes, NodeTypes } from '~/types'
+import { parseElements, defaultNodeTypes, defaultEdgeTypes, deepUnref, NextElements } from './utils'
+import { FlowState, Node, FlowActions, Elements, FlowGetters, Edge } from '~/types'
 import { clampPosition, getDimensions, getConnectedEdges, getNodesInside, getRectOfNodes, isNode } from '~/utils'
 import { getHandleBounds } from '~/components/Nodes/utils'
 import parseElementsWorker from '~/workers/parseElements'
@@ -20,11 +20,19 @@ export default function flowStore(
       ...preloadedState,
     }),
     getters: {
-      getEdgeTypes(): EdgeTypes {
-        return { ...defaultEdgeTypes, ...this.edgeTypes }
+      getEdgeTypes() {
+        const edgeTypes: Record<string, any> = {
+          ...defaultEdgeTypes,
+        }
+        this.edgeTypes?.forEach((n) => (edgeTypes[n] = n))
+        return edgeTypes
       },
-      getNodeTypes(): NodeTypes {
-        return { ...defaultNodeTypes, ...this.nodeTypes }
+      getNodeTypes() {
+        const nodeTypes: Record<string, any> = {
+          ...defaultNodeTypes,
+        }
+        this.nodeTypes?.forEach((n) => (nodeTypes[n] = n))
+        return nodeTypes
       },
       getNodes(): Node[] {
         const n = this.onlyRenderVisibleElements
@@ -50,12 +58,12 @@ export default function flowStore(
     },
     actions: {
       async setElements(elements) {
-        let next: any = {
+        let next: NextElements = {
           nextEdges: [],
           nextNodes: [],
         }
         if (!this.worker || import.meta.env.SSR || typeof window === 'undefined') {
-          next = parseElements(elements, this.nodes, this.edges, this.nodeExtent)
+          next = await parseElements(elements, this.nodes, this.edges, this.nodeExtent)
         } else if (this.worker) {
           const { workerFn, workerTerminate } = parseElementsWorker()
           const res = await workerFn(
@@ -70,7 +78,7 @@ export default function flowStore(
           if (res) {
             workerTerminate('SUCCESS')
             next = res
-          } else next = parseElements(elements, this.nodes, this.edges, this.nodeExtent)
+          } else next = await parseElements(elements, this.nodes, this.edges, this.nodeExtent)
         }
         if (next) {
           this.elements = elements ?? []
@@ -255,8 +263,8 @@ export default function flowStore(
         this.nodesConnectable = isInteractive
         this.elementsSelectable = isInteractive
       },
-      addElements(elements: Elements) {
-        const { nextNodes, nextEdges } = parseElements(elements, this.nodes, this.edges, this.nodeExtent)
+      async addElements(elements: Elements) {
+        const { nextNodes, nextEdges } = await parseElements(elements, this.nodes, this.edges, this.nodeExtent)
         this.elements = [...this.elements, ...elements]
         this.nodes = [...this.nodes, ...nextNodes]
         this.edges = [...this.edges, ...nextEdges]
diff --git a/src/store/utils.ts b/src/store/utils.ts
index f77fcf2d..bf918bf5 100644
--- a/src/store/utils.ts
+++ b/src/store/utils.ts
@@ -1,25 +1,26 @@
-import { ConnectionMode, Edge, EdgeTypes, Elements, FlowState, Node, NodeExtent, NodeTypes, PanOnScrollMode } from '~/types'
+import { Component } from 'vue'
+import { ConnectionMode, Edge, EdgeProps, Elements, FlowState, Node, NodeExtent, NodeProps, PanOnScrollMode } from '~/types'
 import { isEdge, isNode, parseEdge, parseNode } from '~/utils'
 import { DefaultNode, InputNode, OutputNode } from '~/components/Nodes'
 import { BezierEdge, SmoothStepEdge, StepEdge, StraightEdge } from '~/components/Edges'
 import { createHooks } from '~/composables'
 
-type NextElements = {
+export type NextElements = {
   nextNodes: Node[]
   nextEdges: Edge[]
 }
 
-export const defaultNodeTypes: NodeTypes = {
-  input: markRaw(InputNode),
-  default: markRaw(DefaultNode),
-  output: markRaw(OutputNode),
+export const defaultNodeTypes: Record<string, Component<NodeProps>> = {
+  input: InputNode,
+  default: DefaultNode,
+  output: OutputNode,
 }
 
-export const defaultEdgeTypes: EdgeTypes = {
-  default: markRaw(BezierEdge),
-  straight: markRaw(StraightEdge),
-  step: markRaw(StepEdge),
-  smoothstep: markRaw(SmoothStepEdge),
+export const defaultEdgeTypes: Record<string, Component<EdgeProps>> = {
+  default: BezierEdge,
+  straight: StraightEdge,
+  step: StepEdge,
+  smoothstep: SmoothStepEdge,
 }
 
 export const initialState = (): FlowState => ({
@@ -93,52 +94,52 @@ export const initialState = (): FlowState => ({
   vueFlowVersion: typeof __VUE_FLOW_VERSION__ !== 'undefined' ? __VUE_FLOW_VERSION__ : '-',
 })
 
-export const parseElements = (elements: Elements, nodes: Node[], edges: Edge[], nodeExtent: NodeExtent) => {
-  const nextElements: NextElements = {
-    nextNodes: [],
-    nextEdges: [],
-  }
-  for (const element of elements) {
-    if (isNode(element)) {
-      const storeNode = nodes[nodes.map((x) => x.id).indexOf(element.id)]
+export const parseElements = async (elements: Elements, nodes: Node[], edges: Edge[], nodeExtent: NodeExtent) =>
+  new Promise<NextElements>((resolve) => {
+    const nextElements: NextElements = {
+      nextNodes: [],
+      nextEdges: [],
+    }
+    for (const element of elements) {
+      if (isNode(element)) {
+        const storeNode = nodes[nodes.map((x) => x.id).indexOf(element.id)]
 
-      if (storeNode) {
-        const updatedNode: Node = {
-          ...storeNode,
-          ...element,
+        if (storeNode) {
+          const updatedNode: Node = {
+            ...storeNode,
+            ...element,
+          }
+          if (!updatedNode.__rf) updatedNode.__rf = {}
+
+          if (storeNode.position.x !== element.position.x || storeNode.position.y !== element.position.y) {
+            updatedNode.__rf.position = element.position
+          }
+
+          if (typeof element.type !== 'undefined' && element.type !== storeNode.type) {
+            // we reset the elements dimensions here in order to force a re-calculation of the bounds.
+            // When the type of a node changes it is possible that the number or positions of handles changes too.
+            updatedNode.__rf.width = undefined
+          }
+
+          nextElements.nextNodes.push(updatedNode)
+        } else {
+          nextElements.nextNodes.push(parseNode(element, nodeExtent))
         }
-        if (!updatedNode.__rf) updatedNode.__rf = {}
+      } else if (isEdge(element)) {
+        const storeEdge = edges[edges.map((x) => x.id).indexOf(element.id)]
 
-        if (storeNode.position.x !== element.position.x || storeNode.position.y !== element.position.y) {
-          updatedNode.__rf.position = element.position
+        if (storeEdge) {
+          nextElements.nextEdges.push({
+            ...storeEdge,
+            ...element,
+          })
+        } else {
+          nextElements.nextEdges.push(parseEdge(element))
         }
-
-        if (typeof element.type !== 'undefined' && element.type !== storeNode.type) {
-          // we reset the elements dimensions here in order to force a re-calculation of the bounds.
-          // When the type of a node changes it is possible that the number or positions of handles changes too.
-          updatedNode.__rf.width = undefined
-        }
-
-        nextElements.nextNodes.push(updatedNode)
-      } else {
-        nextElements.nextNodes.push(parseNode(element, nodeExtent))
-      }
-    } else if (isEdge(element)) {
-      const storeEdge = edges[edges.map((x) => x.id).indexOf(element.id)]
-
-      if (storeEdge) {
-        nextElements.nextEdges.push({
-          ...storeEdge,
-          ...element,
-        })
-      } else {
-        nextElements.nextEdges.push(parseEdge(element))
       }
     }
-  }
-
-  return nextElements
-}
+    resolve(nextElements)
+  })
 
 const isObject = (val: any) => val !== null && typeof val === 'object'
 const isArray = Array.isArray
diff --git a/src/types/edge.ts b/src/types/edge.ts
index 1315ad96..911f59af 100644
--- a/src/types/edge.ts
+++ b/src/types/edge.ts
@@ -14,8 +14,8 @@ export interface Edge<T = any> {
   label?:
     | string
     | {
-        component: any
-        props?: any
+        component: Component | DefineComponent
+        props?: Record<string, any>
       }
   labelStyle?: any
   labelShowBg?: boolean
@@ -48,8 +48,8 @@ export interface EdgeSmoothStepProps<T = any> extends EdgeProps<T> {
   borderRadius?: number
 }
 
-export type EdgeType = Component<EdgeProps> | DefineComponent<EdgeSmoothStepProps, any, any, any, any, any> | boolean
-export type EdgeTypes = Record<string, EdgeType>
+export type EdgeComponent = Component<EdgeProps> | DefineComponent<EdgeSmoothStepProps, any, any, any, any, any> | string
+export type EdgeTypes = string[]
 
 export interface EdgePositions {
   sourceX: number
diff --git a/src/types/node.ts b/src/types/node.ts
index 9f85d078..2b524c20 100644
--- a/src/types/node.ts
+++ b/src/types/node.ts
@@ -58,5 +58,5 @@ export interface NodeProps<T = any> {
   dragging?: boolean
 }
 
-export type NodeType = Component<NodeProps> | DefineComponent<NodeProps, any, any, any, any> | boolean
-export type NodeTypes = Record<string, NodeType>
+export type NodeComponent = Component<NodeProps> | DefineComponent<NodeProps, any, any, any, any> | string
+export type NodeTypes = string[]
diff --git a/src/types/store.ts b/src/types/store.ts
index e764899f..b23fc2ef 100644
--- a/src/types/store.ts
+++ b/src/types/store.ts
@@ -13,8 +13,8 @@ import {
 } from './types'
 import { HandleType } from './handle'
 import { ConnectionMode, OnConnectEndFunc, OnConnectFunc, OnConnectStartFunc, OnConnectStopFunc } from './connection'
-import { Edge, EdgeTypes } from './edge'
-import { Node, NodeExtent, NodeTypes, TranslateExtent } from './node'
+import { Edge, EdgeComponent } from './edge'
+import { Node, NodeComponent, NodeExtent, TranslateExtent } from './node'
 import { FlowActions } from './actions'
 import { D3Selection, D3Zoom, D3ZoomHandler } from './panel'
 import { FlowHooks } from './hooks'
@@ -67,8 +67,8 @@ export interface FlowState extends FlowOptions {
 }
 
 export interface FlowGetters {
-  getEdgeTypes: () => EdgeTypes
-  getNodeTypes: () => NodeTypes
+  getEdgeTypes: () => Record<string, EdgeComponent>
+  getNodeTypes: () => Record<string, NodeComponent>
   getNodes: () => Node[]
   getEdges: () => Edge[]
 }