diff --git a/src/lib/components/refactor/ComposerAlice.svelte b/src/lib/components/refactor/ComposerAlice.svelte
index fe1fcd7..1c7eb52 100644
--- a/src/lib/components/refactor/ComposerAlice.svelte
+++ b/src/lib/components/refactor/ComposerAlice.svelte
@@ -15,10 +15,10 @@
 	}
 </script>
 
-<div class="p-2 border-2 border-blue-500">
+<div class="p-8 border-2 border-blue-500">
 	<p>My ID is: {me.id}</p>
 
-	I am the parent, this is my state: {$data.state}
+	My state is: {$data.state}
 	<div
 		class="p-2 border-2"
 		style="background-color: {$data.state}; border-radius: 50%; width: 50px; height: 50px;"
diff --git a/src/lib/components/refactor/ComposerBob.svelte b/src/lib/components/refactor/ComposerBob.svelte
index 615876c..9393b90 100644
--- a/src/lib/components/refactor/ComposerBob.svelte
+++ b/src/lib/components/refactor/ComposerBob.svelte
@@ -9,10 +9,10 @@
 	};
 </script>
 
-<div class="border-2 border-yellow-500">
+<div class="p-8 border-2 border-yellow-500">
 	<p>My ID is: {me.id}</p>
 
-	i am the child and this is my state: {$data.state}
+	My state is: {$data.state}
 	<button
 		class="px-4 py-2 font-bold text-white bg-blue-500 rounded hover:bg-blue-700"
 		on:click={handleButton}>Switch</button
diff --git a/src/lib/components/refactor/ComposerCharly.svelte b/src/lib/components/refactor/ComposerCharly.svelte
index ee01fa1..e1db913 100644
--- a/src/lib/components/refactor/ComposerCharly.svelte
+++ b/src/lib/components/refactor/ComposerCharly.svelte
@@ -14,15 +14,18 @@
 	}
 </script>
 
-<div class="flex flex-col h-screen">
-	<section class=" h-96">
+<div class="flex flex-col h-screen border-2 border-green-500">
+	<section class="p-8 h-96">
+		<p>My ID is: {me.id}</p>
+
+		My state is: {$data.state}
 		{#if $data.store.todos}
 			{#each $data.store.todos as todo}
 				<p>{todo.text}</p>
 			{/each}
 		{/if}
 	</section>
-	<section class="flex-grow overflow-y-auto">
+	<section class="flex-grow p-8 overflow-y-auto">
 		{#if $data.store.messages}
 			{#each $data.store.messages as message}
 				<p>{message.text}</p>
diff --git a/src/lib/components/refactor/ComposerWrap.svelte b/src/lib/components/refactor/ComposerWrap.svelte
index 5b1f807..0189c82 100644
--- a/src/lib/components/refactor/ComposerWrap.svelte
+++ b/src/lib/components/refactor/ComposerWrap.svelte
@@ -31,7 +31,7 @@
 				component: 'ComposerCharly',
 				slot: 'aside',
 				data: {
-					queries: {
+					map: {
 						todos: queryTodos,
 						messages: queryMessages
 					}
diff --git a/src/lib/core/refactor/Composer.svelte b/src/lib/core/refactor/Composer.svelte
index 5352a9e..18b4b3e 100644
--- a/src/lib/core/refactor/Composer.svelte
+++ b/src/lib/core/refactor/Composer.svelte
@@ -115,8 +115,8 @@
 
 		if (child.id) {
 			child.store = createComposerStore(child.id, child.store || {});
-			if (child.data?.queries) {
-				subscribeAndMapQueries(child.id, child.data.queries);
+			if (child.data?.map) {
+				subscribeAndMapQueries(child.id, child.data.map);
 			}
 		}