diff --git a/src/additional-components/MiniMap/MiniMap.vue b/src/additional-components/MiniMap/MiniMap.vue
index 3275e68a..8764c351 100644
--- a/src/additional-components/MiniMap/MiniMap.vue
+++ b/src/additional-components/MiniMap/MiniMap.vue
@@ -1,12 +1,10 @@
 <script lang="ts" setup>
-import { GraphNode, ShapeRendering } from '../../types'
+import { ShapeRendering, StringFunc } from '../../types'
 import { useVueFlow, useWindow } from '../../composables'
 import { getBoundsofRects, getRectOfNodes } from '../../utils'
 import type { MiniMapProps } from '../../types/components'
 import MiniMapNode from './MiniMapNode.vue'
 
-type StringFunc = (node: GraphNode) => string
-
 const props = withDefaults(defineProps<MiniMapProps>(), {
   nodeStrokeColor: '#555',
   nodeColor: '#fff',
diff --git a/src/components/Handle/Handle.vue b/src/components/Handle/Handle.vue
index 942904c4..79d54de0 100644
--- a/src/components/Handle/Handle.vue
+++ b/src/components/Handle/Handle.vue
@@ -1,21 +1,14 @@
 <script lang="ts" setup>
 import { useHandle, useVueFlow } from '../../composables'
-import { Position, ValidConnectionFunc } from '../../types'
+import { Position } from '../../types'
 import { NodeId } from '../../context'
-
-interface HandleProps {
-  id?: string
-  type?: string
-  position?: Position
-  isValidConnection?: ValidConnectionFunc
-  connectable?: boolean
-}
+import type { HandleProps } from '../../types/components'
 
 const { id } = useVueFlow()
 const props = withDefaults(defineProps<HandleProps>(), {
   id: '',
   type: 'source',
-  position: Position.Top,
+  position: 'top' as Position,
   connectable: true,
 })
 
diff --git a/src/types/components.ts b/src/types/components.ts
index e80ef2ba..63c08169 100644
--- a/src/types/components.ts
+++ b/src/types/components.ts
@@ -6,10 +6,17 @@ import { EdgeProps } from './edge'
 import { FitViewParams } from './zoom'
 
 type GlobalComponentName = string
-export type DefaultEdgeTypes = { [key in 'default' | 'straight' | 'smoothstep' | 'step']: Component<EdgeProps> }
-export type NodeComponent = Component<NodeProps> | DefineComponent<NodeProps, any, any, any, any> | GlobalComponentName
-export type DefaultNodeTypes = { [key in 'input' | 'output' | 'default']: Component<NodeProps> }
-export type EdgeComponent = Component<EdgeProps> | DefineComponent<EdgeProps, any, any, any, any, any> | GlobalComponentName
+export type NodeComponent<N = any> =
+  | Component<NodeProps<N>>
+  | DefineComponent<NodeProps<N>, any, any, any, any>
+  | GlobalComponentName
+export type EdgeComponent<E = any> =
+  | Component<EdgeProps<E>>
+  | DefineComponent<EdgeProps<E>, any, any, any, any, any>
+  | GlobalComponentName
+
+export type DefaultEdgeTypes = { [key in 'default' | 'straight' | 'smoothstep' | 'step']: EdgeComponent }
+export type DefaultNodeTypes = { [key in 'input' | 'output' | 'default']: NodeComponent }
 
 export type HandleType = 'source' | 'target'
 
@@ -53,9 +60,9 @@ export type StringFunc<N = any> = (node: Node<N> | GraphNode<N>) => string
 export type ShapeRendering = 'inherit' | 'auto' | 'geometricPrecision' | 'optimizeSpeed' | 'crispEdges' | undefined
 
 export interface MiniMapProps<N = any> {
-  nodeColor?: string | ((node: Node<N> | GraphNode<N>) => string)
-  nodeStrokeColor?: string | ((node: Node<N> | GraphNode<N>) => string)
-  nodeClassName?: string | ((node: Node<N> | GraphNode<N>) => string)
+  nodeColor?: string | (<NC = N>(node: Node<NC> | GraphNode<NC>) => string)
+  nodeStrokeColor?: string | (<NSC = N>(node: Node<NSC> | GraphNode<NSC>) => string)
+  nodeClassName?: string | (<NCM = N>(node: Node<NCM> | GraphNode<NCM>) => string)
   nodeBorderRadius?: number
   nodeStrokeWidth?: number
   maskColor?: string