diff --git a/src/lib/components/refactor/ComposerAlice.svelte b/src/lib/components/refactor/ComposerAlice.svelte
index 4574c83..6cc28fb 100644
--- a/src/lib/components/refactor/ComposerAlice.svelte
+++ b/src/lib/components/refactor/ComposerAlice.svelte
@@ -11,7 +11,7 @@
 
 	$: {
 		if ($composerBob.state) {
-			$me.do.machine.send($composerBob.state);
+			$me.do.state.send($composerBob.state);
 		}
 	}
 	// Call testAlert
diff --git a/src/lib/components/refactor/ComposerBob.svelte b/src/lib/components/refactor/ComposerBob.svelte
index cd9e3a6..e2d6174 100644
--- a/src/lib/components/refactor/ComposerBob.svelte
+++ b/src/lib/components/refactor/ComposerBob.svelte
@@ -2,8 +2,8 @@
 	export let me;
 
 	const handleButton = () => {
-		if ($me.do.machine) {
-			$me.do.machine.send('TOGGLE');
+		if ($me.do.state) {
+			$me.do.state.send('TOGGLE');
 		}
 	};
 </script>
diff --git a/src/lib/components/refactor/ComposerForm.svelte b/src/lib/components/refactor/ComposerForm.svelte
index 868e8f5..dda5c9f 100644
--- a/src/lib/components/refactor/ComposerForm.svelte
+++ b/src/lib/components/refactor/ComposerForm.svelte
@@ -32,9 +32,9 @@
 	$: {
 		// Send events to the state machine based on the validation status
 		if (!($errors.name || $errors.email || $errors.about || $errors.age || $errors.favoriteFood)) {
-			$me.do.machine.send('VALIDATE');
+			$me.do.state.send('VALIDATE');
 		} else {
-			$me.do.machine.send('INVALIDATE');
+			$me.do.state.send('INVALIDATE');
 		}
 	}
 
diff --git a/src/lib/core/refactor/Composer.svelte b/src/lib/core/refactor/Composer.svelte
index 37e3c3a..9c8330e 100644
--- a/src/lib/core/refactor/Composer.svelte
+++ b/src/lib/core/refactor/Composer.svelte
@@ -65,8 +65,9 @@
 			id: component.id,
 			do: {
 				core: coreServices,
-				machine: component.machineService || null
-			}
+				state: component.machineService || null
+			},
+			data: component.data || {} // Add this line
 		}));
 
 		if (component.children) {