diff --git a/docs/snippets/examples/document-js.mdx b/docs/snippets/examples/document-js.mdx
index b83f67135..bea258376 100644
--- a/docs/snippets/examples/document-js.mdx
+++ b/docs/snippets/examples/document-js.mdx
@@ -3,12 +3,32 @@ import { actor } from "actor-core";
 
 export type Cursor = { x: number, y: number, userId: string };
 
+export type CursorUpdateEvent = { userId: string, x: number, y: number };
+
+export type TextUpdatedEvent = { text: string, userId: string };
+
+export type UserDisconnectedEvent = { userId: string };
+
 const document = actor({
   state: {
     text: "",
     cursors: {} as Record<string, Cursor>,
   },
 
+  onDisconnect: (c, conn) => {
+    console.log("onDisconnect(): " + conn.id);
+    delete c.state.cursors[conn.id];
+    
+    // Broadcast removal
+    c.broadcastWithOptions(
+      { exclude: [conn.id] },
+      "userDisconnected",
+      {
+        userId: conn.id
+      } as UserDisconnectedEvent
+    );
+  },
+
   actions: {
     getText: (c) => c.state.text,
 
@@ -18,25 +38,34 @@ const document = actor({
       c.state.text = text;
       
       // Broadcast update
-      c.broadcast("textUpdated", {
-        text,
-        userId: c.conn.id
-      });
+      c.broadcastWithOptions(
+        { excludeSelf: true },
+        "textUpdated", 
+        {
+          text,
+          userId: c.conn.id
+        } as TextUpdatedEvent
+      );
     },
 
     getCursors: (c) => c.state.cursors,
     
     updateCursor: (c, x: number, y: number) => {
+      console.log("updateCursor(): " + c.conn.id);
       // Update user location
       const userId = c.conn.id;
       c.state.cursors[userId] = { x, y, userId };
       
       // Broadcast location
-      c.broadcast("cursorUpdated", {
-        userId,
-        x, 
-        y
-      });
+      c.broadcastWithOptions(
+        { excludeSelf: true },
+        "cursorUpdated",
+        {
+          userId,
+          x, 
+          y
+        } as CursorUpdateEvent
+      );
     },
   }
 });
diff --git a/docs/snippets/examples/document-react.mdx b/docs/snippets/examples/document-react.mdx
index 97aa2373d..3c4318233 100644
--- a/docs/snippets/examples/document-react.mdx
+++ b/docs/snippets/examples/document-react.mdx
@@ -2,7 +2,10 @@
 import { createClient } from "actor-core/client";
 import { createReactActorCore } from "@actor-core/react";
 import { useState, useEffect } from "react";
-import type { App } from "../actors/app";
+import type {
+  App, Cursor, TextUpdatedEvent,
+  CursorUpdateEvent, UserDisconnectedEvent
+} from "../actors/app";
 
 const client = createClient<App>("http://localhost:6420");
 const { useActor, useActorEvent } = createReactActorCore(client);
@@ -10,65 +13,86 @@ const { useActor, useActorEvent } = createReactActorCore(client);
 export function DocumentEditor() {
   // Connect to actor for this document ID from URL
   const documentId = new URLSearchParams(window.location.search).get('id') || 'default-doc';
-  const [{ actor, connectionId }] = useActor("document", { tags: { id: documentId } });
-  
+  const [{ actor, state }] = useActor("document", { tags: { id: documentId } });
+
   // Local state
   const [text, setText] = useState("");
   const [cursorPos, setCursorPos] = useState({ x: 0, y: 0 });
-  const [otherCursors, setOtherCursors] = useState({});
+  const [otherCursors, setOtherCursors] = useState<Record<string, Cursor>>({});
   
   // Load initial document state
   useEffect(() => {
-    if (actor) {
+    if (actor && state === "created") {
       actor.getText().then(setText);
       actor.getCursors().then(setOtherCursors);
     }
-  }, [actor]);
+  }, [actor, state]);
   
   // Listen for updates from other users
-  useActorEvent({ actor, event: "textUpdated" }, ({ text: newText, userId: senderId }) => {
-    if (senderId !== connectionId) setText(newText);
+  useActorEvent({ actor, event: "textUpdated" }, (event) => {
+    const { text: newText, userId: _senderId } = event as TextUpdatedEvent;
+
+    setText(newText);
   });
   
-  useActorEvent({ actor, event: "cursorUpdated" }, ({ userId: cursorUserId, x, y }) => {
-    if (cursorUserId !== connectionId) {
-      setOtherCursors(prev => ({
-        ...prev,
-        [cursorUserId]: { x, y, userId: cursorUserId }
-      }));
-    }
+  useActorEvent({ actor, event: "cursorUpdated" }, (event) => {
+    const { userId: cursorUserId, x, y } = event as CursorUpdateEvent;
+    
+    setOtherCursors(prev => ({
+      ...prev,
+      [cursorUserId]: { x, y, userId: cursorUserId }
+    }));
   });
-  
-  // Update cursor position
-  const updateCursor = (e) => {
-    if (!actor) return;
-    const rect = e.currentTarget.getBoundingClientRect();
-    const x = e.clientX - rect.left;
-    const y = e.clientY - rect.top;
+
+  useActorEvent({ actor, event: "userDisconnected" }, (event) => {
+    const { userId } = event as UserDisconnectedEvent;
     
-    if (x !== cursorPos.x || y !== cursorPos.y) {
-      setCursorPos({ x, y });
-      actor.updateCursor(x, y);
-    }
-  };
+    setOtherCursors(prev => {
+      const newCursors = { ...prev };
+      delete newCursors[userId];
+      return newCursors;
+    });
+  });  
+
+
+  useEffect(() => {
+    if (!actor || state !== "created") return;
+
+    const updateCursor = ({ x, y }: { x: number, y: number }) => {
+      
+      if (x !== cursorPos.x || y !== cursorPos.y) {
+        setCursorPos({ x, y });
+        actor.updateCursor(x, y);
+      }
+    };
+
+    window.addEventListener("mousemove", (e) => {
+      const x = e.clientX;
+      const y = e.clientY;
+      
+      updateCursor({ x, y });
+    });
+  }, [actor, state]);
   
   return (
     <div className="document-editor">
       <h2>Document: {documentId}</h2>
       
-      <div onMouseMove={updateCursor}>
+      <div>
         <textarea
           value={text}
           onChange={(e) => {
             const newText = e.target.value;
             setText(newText);
-            actor?.setText(newText);
+            if (actor && state === "created") {
+              actor.setText(newText);
+            }
           }}
           placeholder="Start typing..."
         />
         
         {/* Other users' cursors */}
-        {Object.values(otherCursors).map((cursor: any) => (
+        {Object.values(otherCursors).map((cursor) => (
           <div 
             key={cursor.userId}
             style={{
diff --git a/docs/snippets/examples/document-sqlite.mdx b/docs/snippets/examples/document-sqlite.mdx
index d07eb6233..11b85e180 100644
--- a/docs/snippets/examples/document-sqlite.mdx
+++ b/docs/snippets/examples/document-sqlite.mdx
@@ -5,9 +5,32 @@ import { documents, cursors } from "./schema";
 
 export type Cursor = { x: number, y: number, userId: string };
 
+export type CursorUpdateEvent = { userId: string, x: number, y: number };
+
+export type TextUpdatedEvent = { text: string, userId: string };
+
+export type UserDisconnectedEvent = { userId: string };
+
 const document = actor({
   sql: drizzle(),
 
+  onDisconnect: async (c, conn) => {
+    console.log("onDisconnect(): " + conn.id);
+    await c.db
+      .delete(documents)
+      .where({ userId: conn.id })
+      .execute();
+    
+    // Broadcast removal
+    c.broadcastWithOptions(
+      { exclude: [conn.id] },
+      "userDisconnected",
+      {
+        userId: conn.id
+      } as UserDisconnectedEvent
+    );
+  },
+
   actions: {
     getText: async (c) => {
       const doc = await c.db
@@ -34,10 +57,14 @@ const document = actor({
         });
       
       // Broadcast update
-      c.broadcast("textUpdated", {
-        text,
-        userId: c.conn.id
-      });
+      c.broadcastWithOptions(
+        { excludeSelf: true },
+        "textUpdated", 
+        {
+          text,
+          userId: c.conn.id
+        } as TextUpdatedEvent
+      );
     },
 
     getCursors: async (c) => {
@@ -76,11 +103,15 @@ const document = actor({
         });
       
       // Broadcast location
-      c.broadcast("cursorUpdated", {
-        userId,
-        x, 
-        y
-      });
+      c.broadcastWithOptions(
+        { excludeSelf: true },
+        "cursorUpdated", 
+        {
+          userId,
+          x, 
+          y
+        } as CursorUpdateEvent
+      );
     },
   }
 });
diff --git a/examples/collab-document/.gitignore b/examples/collab-document/.gitignore
new file mode 100644
index 000000000..6cbdaa262
--- /dev/null
+++ b/examples/collab-document/.gitignore
@@ -0,0 +1,4 @@
+.actorcore
+node_modules
+# React
+build/
\ No newline at end of file
diff --git a/examples/collab-document/actors/app.ts b/examples/collab-document/actors/app.ts
new file mode 100644
index 000000000..07266dc0d
--- /dev/null
+++ b/examples/collab-document/actors/app.ts
@@ -0,0 +1,78 @@
+import { actor, setup } from "actor-core";
+
+export type Cursor = { x: number, y: number, userId: string };
+
+export type CursorUpdateEvent = { userId: string, x: number, y: number };
+
+export type TextUpdatedEvent = { text: string, userId: string };
+
+export type UserDisconnectedEvent = { userId: string };
+
+const document = actor({
+  state: {
+    text: "",
+    cursors: {} as Record<string, Cursor>,
+  },
+
+  onDisconnect: (c, conn) => {
+    console.log("onDisconnect(): " + conn.id);
+    delete c.state.cursors[conn.id];
+    
+    // Broadcast removal
+    c.broadcastWithOptions(
+      { exclude: [conn.id] },
+      "userDisconnected",
+      {
+        userId: conn.id
+      } as UserDisconnectedEvent
+    );
+  },
+
+  actions: {
+    getText: (c) => c.state.text,
+
+    // Update the document (real use case has better conflict resolution)
+    setText: (c, text: string) => {
+      // Save document state
+      c.state.text = text;
+      
+      // Broadcast update
+      c.broadcastWithOptions(
+        { excludeSelf: true },
+        "textUpdated", 
+        {
+          text,
+          userId: c.conn.id
+        } as TextUpdatedEvent
+      );
+    },
+
+    getCursors: (c) => c.state.cursors,
+    
+    updateCursor: (c, x: number, y: number) => {
+      console.log("updateCursor(): " + c.conn.id);
+      // Update user location
+      const userId = c.conn.id;
+      c.state.cursors[userId] = { x, y, userId };
+      
+      // Broadcast location
+      c.broadcastWithOptions(
+        { excludeSelf: true },
+        "cursorUpdated",
+        {
+          userId,
+          x, 
+          y
+        } as CursorUpdateEvent
+      );
+    },
+  }
+});
+
+// Create and export the app
+export const app = setup({
+  actors: { document }
+});
+
+// Export type for client type checking
+export type App = typeof app; 
diff --git a/examples/collab-document/package.json b/examples/collab-document/package.json
new file mode 100644
index 000000000..63cc4a4b2
--- /dev/null
+++ b/examples/collab-document/package.json
@@ -0,0 +1,49 @@
+{
+  "name": "collab-document",
+  "version": "0.8.0",
+  "private": true,
+  "type": "module",
+  "main": "src/index.ts",
+  "scripts": {
+    "dev:actors": "npx @actor-core/cli@latest dev actors/app.ts",
+    "dev:frontend": "react-scripts start",
+    "check-types": "tsc --noEmit",
+    "test": "vitest run"
+  },
+  "dependencies": {
+    "@actor-core/react": "workspace:*",
+    "@types/react": "^19",
+    "@types/react-dom": "^19",
+    "actor-core": "workspace:*",
+    "react": "^19",
+    "react-dom": "^19",
+    "react-scripts": "^5.0.1"
+  },
+  "devDependencies": {
+    "@actor-core/cli": "workspace:*",
+    "actor-core": "workspace:*",
+    "typescript": "^5.5.2"
+  },
+  "example": {
+    "platforms": [
+      "*"
+    ]
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  },
+  "resolutions": {
+    "react@^19": "^19.0.0",
+    "react-dom@^19": "^19.0.0",
+    "react@^18": "^18.3"
+  }
+}
diff --git a/examples/collab-document/public/github.css b/examples/collab-document/public/github.css
new file mode 100644
index 000000000..7e1e085cf
--- /dev/null
+++ b/examples/collab-document/public/github.css
@@ -0,0 +1,37 @@
+body, html {
+    margin: 0;
+    padding: 0;
+    padding-top: 24px;
+    width: 100%;
+    height: 100%;
+}
+#example--repo-ref {
+    position: fixed;
+    top: 0px;
+    left: 0px;
+    cursor: pointer;
+    background-color: rgb(243, 243, 243);
+    height: 24px;
+    width: 100%;
+    padding: 8px 8px;
+}
+#example--github-icon {
+    height: 24px;
+    float: left;
+}
+#example--repo-link {
+    height: 24px;
+    margin-left: 8px;
+    color: rgb(45, 50, 55);
+    font-weight: bold;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
+    font-size: 15px;
+    vertical-align: middle;
+}
+
+#example--repo-ref:hover #example--repo-link {
+    color: black;
+}
+#example--repo-ref:hover svg {
+    fill: black !important;
+}
\ No newline at end of file
diff --git a/examples/collab-document/public/index.html b/examples/collab-document/public/index.html
new file mode 100644
index 000000000..2d59adeee
--- /dev/null
+++ b/examples/collab-document/public/index.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="theme-color" content="#000000">
+    <title>Chat Room</title>
+    <link rel="stylesheet" href="./github.css">
+    <link rel="stylesheet" href="./main.css">
+  </head>
+  <body>
+    <!-- Github Notch -->
+    <div id="example--repo-ref">
+      <a id="example--github-icon" href="https://github.com/rivet-gg/actor-core/tree/main/examples/collab-document" target="_blank">
+        <svg height="24" width="24" viewBox="0 0 16 16" style="fill: #24292e;">
+          <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"></path>
+        </svg>
+      </a>
+      <a id="example--repo-link" href="https://github.com/rivet-gg/actor-core/tree/main/examples/collab-document">@rivet-gg/actor-core</a>
+    </div>
+    <noscript>
+      You need to enable JavaScript to run this app.
+    </noscript>
+    <div id="root"></div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/examples/collab-document/public/main.css b/examples/collab-document/public/main.css
new file mode 100644
index 000000000..7f28fc4df
--- /dev/null
+++ b/examples/collab-document/public/main.css
@@ -0,0 +1,26 @@
+body {
+  font-family: sans-serif;
+  background-color: #f4f4f4;
+}
+
+h1 {
+  color: #333;
+}
+
+#root {
+  background-color: white;
+  padding: 20px;
+  margin: 10px 20px;
+  border-radius: 8px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+}
+
+textarea {
+  width: 100%;
+  min-height: 300px;
+  padding: 10px;
+  box-sizing: border-box;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  font-size: 1rem;
+}
diff --git a/examples/collab-document/src/App.tsx b/examples/collab-document/src/App.tsx
new file mode 100644
index 000000000..0f4c82d7e
--- /dev/null
+++ b/examples/collab-document/src/App.tsx
@@ -0,0 +1,121 @@
+import { createClient } from "actor-core/client";
+import { createReactActorCore } from "@actor-core/react";
+import { useState, useEffect } from "react";
+import type { App, Cursor, CursorUpdateEvent, TextUpdatedEvent, UserDisconnectedEvent } from "../actors/app";
+
+const client = createClient<App>("http://localhost:6420");
+const { useActor, useActorEvent } = createReactActorCore(client);
+
+function DocumentEditor() {
+  // Connect to actor for this document ID from URL
+  const documentId = new URLSearchParams(window.location.search).get('id') || 'default-doc';
+  const [{ actor, state }] = useActor("document", { tags: { id: documentId } });
+
+  // Local state
+  const [text, setText] = useState("");
+  const [cursorPos, setCursorPos] = useState({ x: 0, y: 0 });
+  const [otherCursors, setOtherCursors] = useState<Record<string, Cursor>>({});
+  
+  // Load initial document state
+  useEffect(() => {
+    if (actor && state === "created") {
+      actor.getText().then(setText);
+      actor.getCursors().then(setOtherCursors);
+    }
+  }, [actor, state]);
+  
+  // Listen for updates from other users
+  useActorEvent({ actor, event: "textUpdated" }, (event) => {
+    const { text: newText, userId: _senderId } = event as TextUpdatedEvent;
+
+    setText(newText);
+  });
+  
+  useActorEvent({ actor, event: "cursorUpdated" }, (event) => {
+    const { userId: cursorUserId, x, y } = event as CursorUpdateEvent;
+    
+    setOtherCursors(prev => ({
+      ...prev,
+      [cursorUserId]: { x, y, userId: cursorUserId }
+    }));
+  });
+
+  useActorEvent({ actor, event: "userDisconnected" }, (event) => {
+    const { userId } = event as UserDisconnectedEvent;
+    
+    setOtherCursors(prev => {
+      const newCursors = { ...prev };
+      delete newCursors[userId];
+      return newCursors;
+    });
+  });  
+
+
+  useEffect(() => {
+    if (!actor || state !== "created") return;
+
+    const updateCursor = ({ x, y }: { x: number, y: number }) => {
+      
+      if (x !== cursorPos.x || y !== cursorPos.y) {
+        setCursorPos({ x, y });
+        actor.updateCursor(x, y);
+      }
+    };
+
+    window.addEventListener("mousemove", (e) => {
+      const x = e.clientX;
+      const y = e.clientY;
+      
+      updateCursor({ x, y });
+    });
+  }, [actor, state]);
+  
+  return (
+    <div className="document-editor">
+      <h2>Document: {documentId}</h2>
+      
+      <div>
+        <textarea
+          value={text}
+          onChange={(e) => {
+            const newText = e.target.value;
+            setText(newText);
+            if (actor && state === "created") {
+              actor.setText(newText);
+            }
+          }}
+          placeholder="Start typing..."
+        />
+        
+        {/* Other users' cursors */}
+        {Object.values(otherCursors).map((cursor) => (
+          <div 
+            key={cursor.userId}
+            style={{
+              position: 'absolute',
+              left: `${cursor.x}px`,
+              top: `${cursor.y}px`,
+              width: '10px',
+              height: '10px',
+              backgroundColor: 'red',
+              borderRadius: '50%'
+            }}
+          />
+        ))}
+      </div>
+      
+      <div>
+        <p>Connected users: You and {Object.keys(otherCursors).length} others</p>
+      </div>
+    </div>
+  );
+}
+
+export default function ReactApp() {
+  return (
+    <div className="app">
+      <h1>Collaborative Document Editor</h1>
+      <DocumentEditor />
+    </div>
+  );
+} 
\ No newline at end of file
diff --git a/examples/collab-document/src/index.tsx b/examples/collab-document/src/index.tsx
new file mode 100644
index 000000000..4fb96dfe6
--- /dev/null
+++ b/examples/collab-document/src/index.tsx
@@ -0,0 +1,7 @@
+import ReactDOM from "react-dom/client";
+import ReactApp from "./App";
+
+const container = document.getElementById('root')!;
+const root = ReactDOM.createRoot(container);
+
+root.render(<ReactApp />);
\ No newline at end of file
diff --git a/examples/collab-document/tsconfig.json b/examples/collab-document/tsconfig.json
new file mode 100644
index 000000000..5b39c06f3
--- /dev/null
+++ b/examples/collab-document/tsconfig.json
@@ -0,0 +1,43 @@
+{
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig.json to read more about this file */
+
+    /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "esnext",
+    /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+    "lib": ["ESNext", "DOM"],
+    /* Specify what JSX code is generated. */
+    "jsx": "react-jsx",
+
+    /* Specify what module code is generated. */
+    "module": "esnext",
+    /* Specify how TypeScript looks up a file from a given module specifier. */
+    "moduleResolution": "bundler",
+    /* Specify type package names to be included without being referenced in a source file. */
+    "types": ["node"],
+    /* Enable importing .json files */
+    "resolveJsonModule": true,
+
+    /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */
+    "allowJs": true,
+    /* Enable error reporting in type-checked JavaScript files. */
+    "checkJs": false,
+
+    /* Disable emitting files from a compilation. */
+    "noEmit": true,
+
+    /* Ensure that each file can be safely transpiled without relying on other imports. */
+    "isolatedModules": true,
+    /* Allow 'import x from y' when a module doesn't have a default export. */
+    "allowSyntheticDefaultImports": true,
+    /* Ensure that casing is correct in imports. */
+    "forceConsistentCasingInFileNames": true,
+
+    /* Enable all strict type-checking options. */
+    "strict": true,
+
+    /* Skip type checking all .d.ts files. */
+    "skipLibCheck": true
+  },
+  "include": ["src/**/*", "actors/**/*", "tests/**/*"]
+}
diff --git a/examples/snippets/document/App.tsx b/examples/snippets/document/App.tsx
index ef66ffbde..3bda283b5 100644
--- a/examples/snippets/document/App.tsx
+++ b/examples/snippets/document/App.tsx
@@ -1,7 +1,10 @@
 import { createClient } from "actor-core/client";
 import { createReactActorCore } from "@actor-core/react";
 import { useState, useEffect } from "react";
-import type { App } from "../actors/app";
+import type {
+  App, Cursor, TextUpdatedEvent,
+  CursorUpdateEvent, UserDisconnectedEvent
+} from "../actors/app";
 
 const client = createClient<App>("http://localhost:6420");
 const { useActor, useActorEvent } = createReactActorCore(client);
@@ -9,65 +12,86 @@ const { useActor, useActorEvent } = createReactActorCore(client);
 export function DocumentEditor() {
   // Connect to actor for this document ID from URL
   const documentId = new URLSearchParams(window.location.search).get('id') || 'default-doc';
-  const [{ actor, connectionId }] = useActor("document", { tags: { id: documentId } });
-  
+  const [{ actor, state }] = useActor("document", { tags: { id: documentId } });
+
   // Local state
   const [text, setText] = useState("");
   const [cursorPos, setCursorPos] = useState({ x: 0, y: 0 });
-  const [otherCursors, setOtherCursors] = useState({});
+  const [otherCursors, setOtherCursors] = useState<Record<string, Cursor>>({});
   
   // Load initial document state
   useEffect(() => {
-    if (actor) {
+    if (actor && state === "created") {
       actor.getText().then(setText);
       actor.getCursors().then(setOtherCursors);
     }
-  }, [actor]);
+  }, [actor, state]);
   
   // Listen for updates from other users
-  useActorEvent({ actor, event: "textUpdated" }, ({ text: newText, userId: senderId }) => {
-    if (senderId !== connectionId) setText(newText);
+  useActorEvent({ actor, event: "textUpdated" }, (event) => {
+    const { text: newText, userId: _senderId } = event as TextUpdatedEvent;
+
+    setText(newText);
   });
   
-  useActorEvent({ actor, event: "cursorUpdated" }, ({ userId: cursorUserId, x, y }) => {
-    if (cursorUserId !== connectionId) {
-      setOtherCursors(prev => ({
-        ...prev,
-        [cursorUserId]: { x, y, userId: cursorUserId }
-      }));
-    }
+  useActorEvent({ actor, event: "cursorUpdated" }, (event) => {
+    const { userId: cursorUserId, x, y } = event as CursorUpdateEvent;
+    
+    setOtherCursors(prev => ({
+      ...prev,
+      [cursorUserId]: { x, y, userId: cursorUserId }
+    }));
   });
-  
-  // Update cursor position
-  const updateCursor = (e) => {
-    if (!actor) return;
-    const rect = e.currentTarget.getBoundingClientRect();
-    const x = e.clientX - rect.left;
-    const y = e.clientY - rect.top;
+
+  useActorEvent({ actor, event: "userDisconnected" }, (event) => {
+    const { userId } = event as UserDisconnectedEvent;
     
-    if (x !== cursorPos.x || y !== cursorPos.y) {
-      setCursorPos({ x, y });
-      actor.updateCursor(x, y);
-    }
-  };
+    setOtherCursors(prev => {
+      const newCursors = { ...prev };
+      delete newCursors[userId];
+      return newCursors;
+    });
+  });  
+
+
+  useEffect(() => {
+    if (!actor || state !== "created") return;
+
+    const updateCursor = ({ x, y }: { x: number, y: number }) => {
+      
+      if (x !== cursorPos.x || y !== cursorPos.y) {
+        setCursorPos({ x, y });
+        actor.updateCursor(x, y);
+      }
+    };
+
+    window.addEventListener("mousemove", (e) => {
+      const x = e.clientX;
+      const y = e.clientY;
+      
+      updateCursor({ x, y });
+    });
+  }, [actor, state]);
   
   return (
     <div className="document-editor">
       <h2>Document: {documentId}</h2>
       
-      <div onMouseMove={updateCursor}>
+      <div>
         <textarea
           value={text}
           onChange={(e) => {
             const newText = e.target.value;
             setText(newText);
-            actor?.setText(newText);
+            if (actor && state === "created") {
+              actor.setText(newText);
+            }
           }}
           placeholder="Start typing..."
         />
         
         {/* Other users' cursors */}
-        {Object.values(otherCursors).map((cursor: any) => (
+        {Object.values(otherCursors).map((cursor) => (
           <div 
             key={cursor.userId}
             style={{
diff --git a/examples/snippets/document/actor-json.ts b/examples/snippets/document/actor-json.ts
index 039d73a78..b48afb264 100644
--- a/examples/snippets/document/actor-json.ts
+++ b/examples/snippets/document/actor-json.ts
@@ -2,12 +2,32 @@ import { actor } from "actor-core";
 
 export type Cursor = { x: number, y: number, userId: string };
 
+export type CursorUpdateEvent = { userId: string, x: number, y: number };
+
+export type TextUpdatedEvent = { text: string, userId: string };
+
+export type UserDisconnectedEvent = { userId: string };
+
 const document = actor({
   state: {
     text: "",
     cursors: {} as Record<string, Cursor>,
   },
 
+  onDisconnect: (c, conn) => {
+    console.log("onDisconnect(): " + conn.id);
+    delete c.state.cursors[conn.id];
+    
+    // Broadcast removal
+    c.broadcastWithOptions(
+      { exclude: [conn.id] },
+      "userDisconnected",
+      {
+        userId: conn.id
+      } as UserDisconnectedEvent
+    );
+  },
+
   actions: {
     getText: (c) => c.state.text,
 
@@ -17,25 +37,34 @@ const document = actor({
       c.state.text = text;
       
       // Broadcast update
-      c.broadcast("textUpdated", {
-        text,
-        userId: c.conn.id
-      });
+      c.broadcastWithOptions(
+        { excludeSelf: true },
+        "textUpdated", 
+        {
+          text,
+          userId: c.conn.id
+        } as TextUpdatedEvent
+      );
     },
 
     getCursors: (c) => c.state.cursors,
     
     updateCursor: (c, x: number, y: number) => {
+      console.log("updateCursor(): " + c.conn.id);
       // Update user location
       const userId = c.conn.id;
       c.state.cursors[userId] = { x, y, userId };
       
       // Broadcast location
-      c.broadcast("cursorUpdated", {
-        userId,
-        x, 
-        y
-      });
+      c.broadcastWithOptions(
+        { excludeSelf: true },
+        "cursorUpdated",
+        {
+          userId,
+          x, 
+          y
+        } as CursorUpdateEvent
+      );
     },
   }
 });
diff --git a/examples/snippets/document/actor-sqlite.ts b/examples/snippets/document/actor-sqlite.ts
index dc7c73a0e..6264173c3 100644
--- a/examples/snippets/document/actor-sqlite.ts
+++ b/examples/snippets/document/actor-sqlite.ts
@@ -4,9 +4,32 @@ import { documents, cursors } from "./schema";
 
 export type Cursor = { x: number, y: number, userId: string };
 
+export type CursorUpdateEvent = { userId: string, x: number, y: number };
+
+export type TextUpdatedEvent = { text: string, userId: string };
+
+export type UserDisconnectedEvent = { userId: string };
+
 const document = actor({
   sql: drizzle(),
 
+  onDisconnect: async (c, conn) => {
+    console.log("onDisconnect(): " + conn.id);
+    await c.db
+      .delete(documents)
+      .where({ userId: conn.id })
+      .execute();
+    
+    // Broadcast removal
+    c.broadcastWithOptions(
+      { exclude: [conn.id] },
+      "userDisconnected",
+      {
+        userId: conn.id
+      } as UserDisconnectedEvent
+    );
+  },
+
   actions: {
     getText: async (c) => {
       const doc = await c.db
@@ -33,10 +56,14 @@ const document = actor({
         });
       
       // Broadcast update
-      c.broadcast("textUpdated", {
-        text,
-        userId: c.conn.id
-      });
+      c.broadcastWithOptions(
+        { excludeSelf: true },
+        "textUpdated", 
+        {
+          text,
+          userId: c.conn.id
+        } as TextUpdatedEvent
+      );
     },
 
     getCursors: async (c) => {
@@ -75,11 +102,15 @@ const document = actor({
         });
       
       // Broadcast location
-      c.broadcast("cursorUpdated", {
-        userId,
-        x, 
-        y
-      });
+      c.broadcastWithOptions(
+        { excludeSelf: true },
+        "cursorUpdated", 
+        {
+          userId,
+          x, 
+          y
+        } as CursorUpdateEvent
+      );
     },
   }
 });
diff --git a/yarn.lock b/yarn.lock
index e094aabb4..88465fd38 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7747,6 +7747,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"collab-document@workspace:examples/collab-document":
+  version: 0.0.0-use.local
+  resolution: "collab-document@workspace:examples/collab-document"
+  dependencies:
+    "@actor-core/cli": "workspace:*"
+    "@actor-core/react": "workspace:*"
+    "@types/react": "npm:^19"
+    "@types/react-dom": "npm:^19"
+    actor-core: "workspace:*"
+    react: "npm:^19"
+    react-dom: "npm:^19"
+    react-scripts: "npm:^5.0.1"
+    typescript: "npm:^5.5.2"
+  languageName: unknown
+  linkType: soft
+
 "collect-v8-coverage@npm:^1.0.0":
   version: 1.0.2
   resolution: "collect-v8-coverage@npm:1.0.2"