diff --git a/src/lib/SchemaForm.svelte b/src/lib/SchemaForm.svelte
index e4f3cb8..1b65d9f 100644
--- a/src/lib/SchemaForm.svelte
+++ b/src/lib/SchemaForm.svelte
@@ -9,7 +9,7 @@
 	import set from "lodash-es/set";
 	import get from "lodash-es/get";
 	import { validator } from "@exodus/schemasafe";
-	import { FileNone, type CommonComponentParameters, type ValidationErrors } from './types/CommonComponentParameters';
+	import { FileNone, type CommonComponentParameters, type ValidationErrors, type SchemaFormEvent } from './types/CommonComponentParameters';
 	import Enum from './editors/Enum.svelte';
 	import Array from './editors/Array.svelte';
 	import { incr, nullOptionalsAllowed } from './utilities.js';
@@ -34,7 +34,9 @@
 	export let components: Record<string, new (...args: any[]) => any> = {};
 	export let componentContext: Record<string, unknown> = {};
 
-	const dispatch = createEventDispatcher();
+	const dispatch = createEventDispatcher<{
+		value: SchemaFormEvent
+	}>();
 
 	let validationErrors = {} as ValidationErrors;
 
diff --git a/src/lib/SubmitForm.svelte b/src/lib/SubmitForm.svelte
index b0511a6..cfa19fb 100644
--- a/src/lib/SubmitForm.svelte
+++ b/src/lib/SubmitForm.svelte
@@ -3,7 +3,7 @@
 <script lang="ts">
 	import SchemaForm from "./SchemaForm.svelte";
 	import { createEventDispatcher, setContext } from "svelte";
-	import { ProgressContext, type ValidationErrors } from "./types/CommonComponentParameters";
+	import { ProgressContext, type SchemaFormEvent, type ValidationErrors } from "./types/CommonComponentParameters";
 	import { substituteProperties } from "./utilities.js";
 	import { writable } from "svelte/store";
 	import set from "lodash-es/set";
@@ -21,14 +21,14 @@
 	export let submitRequiresDirty = true;
 	export let componentContext = {} as Record<string, unknown>;
 
-	const dispatch = createEventDispatcher();
+	const dispatch = createEventDispatcher<{value: SchemaFormEvent, submit: {value: any}}>();
 	let pathProgress = writable({} as Record<string, Record<string, number>>);
 	setContext(ProgressContext, pathProgress);
 
 	let currentErrors = {} as ValidationErrors;
 	let showErrors = false;
 
-	const change = (e: CustomEvent) => {
+	const change = (e: CustomEvent<SchemaFormEvent>) => {
 		currentErrors = e.detail.errors;
 		dispatch('value', e.detail);
 		value = e.detail.value;
diff --git a/src/lib/types/CommonComponentParameters.ts b/src/lib/types/CommonComponentParameters.ts
index 32f96a9..d2de18b 100644
--- a/src/lib/types/CommonComponentParameters.ts
+++ b/src/lib/types/CommonComponentParameters.ts
@@ -18,6 +18,14 @@ export interface CommonComponentParameters {
 	idx: number
 }
 
+export interface SchemaFormEvent {
+	path: string[],
+	value: any,
+	errors: ValidationErrors,
+	pathValue?: any,
+	op?: string
+}
+
 export const childComponentParameters = (params: CommonComponentParameters, propName: string) => {
 	return {
 		...params,