diff --git a/composer.json b/composer.json
index 55d8c20..a90d48a 100644
--- a/composer.json
+++ b/composer.json
@@ -24,6 +24,9 @@
             "email": "alex@standiford.us"
         }
     ],
+    "require": {
+        "phpnomad/event": "^1.0"
+    },
     "require-dev": {
         "doctrine/instantiator": "^1.5",
         "myclabs/deep-copy": ">=1.13.4 <1.14",
diff --git a/composer.lock b/composer.lock
index a6153fe..5075bdb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,49 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0fa283ca307757d17b39502f6c4e6736",
-    "packages": [],
+    "content-hash": "6638e777210e2a06a5c0d87ec74fd210",
+    "packages": [
+        {
+            "name": "phpnomad/event",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpnomad/event.git",
+                "reference": "b418d8fc90af18b7cb37e118795f9dd92ffeb538"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpnomad/event/zipball/b418d8fc90af18b7cb37e118795f9dd92ffeb538",
+                "reference": "b418d8fc90af18b7cb37e118795f9dd92ffeb538",
+                "shasum": ""
+            },
+            "require-dev": {
+                "phpnomad/tests": "^0.1.0 || ^0.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PHPNomad\\Events\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Alex Standiford",
+                    "email": "alex@standiford.us"
+                }
+            ],
+            "homepage": "https://github.com/phpnomad/core",
+            "support": {
+                "issues": "https://github.com/phpnomad/event/issues",
+                "source": "https://github.com/phpnomad/event/tree/1.0.1"
+            },
+            "time": "2026-06-12T10:56:48+00:00"
+        }
+    ],
     "packages-dev": [
         {
             "name": "clue/ndjson-react",
diff --git a/lib/Events/ModelsMerged.php b/lib/Events/ModelsMerged.php
index 252108c..27b67d3 100644
--- a/lib/Events/ModelsMerged.php
+++ b/lib/Events/ModelsMerged.php
@@ -10,14 +10,19 @@
  */
 class ModelsMerged implements Event
 {
+    /** @var T */
     protected DataModel $mergedModel;
+
+    /** @var array<array-key, T> */
     protected array $removedModels;
+
+    /** @var T */
     protected DataModel $originalModel;
 
     /**
      * @param T $mergedModel
      * @param T $originalModel
-     * @param T[] $removedModels
+     * @param array<array-key, T> $removedModels
      */
     public function __construct(DataModel $mergedModel, DataModel $originalModel, array $removedModels)
     {
@@ -35,7 +40,7 @@ public function getOriginalModel(): DataModel
     }
 
     /**
-     * @return T[]
+     * @return array<array-key, T>
      */
     public function getRemovedModels(): array
     {
@@ -54,4 +59,4 @@ public static function getId(): string
     {
         return 'datastore_models_merged';
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Events/RecordDeleted.php b/lib/Events/RecordDeleted.php
index 8c3ba49..8e52e12 100644
--- a/lib/Events/RecordDeleted.php
+++ b/lib/Events/RecordDeleted.php
@@ -8,11 +8,13 @@
 class RecordDeleted implements Event
 {
     protected string $type;
+
+    /** @var array<string, mixed> */
     protected array $identity;
 
     /**
      * @param class-string<DataModel>|string $type
-     * @param array $identity
+     * @param array<string, mixed> $identity
      */
     public function __construct(string $type, array $identity)
     {
@@ -23,7 +25,7 @@ public function __construct(string $type, array $identity)
     /**
      * Gets the identity for the record that was deleted.
      *
-     * @return array
+     * @return array<string, mixed>
      */
     public function getIdentity(): array
     {
@@ -44,4 +46,4 @@ public static function getId(): string
     {
         return 'record_deleted';
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Events/RecordUpdated.php b/lib/Events/RecordUpdated.php
index bc3df74..e1ca226 100644
--- a/lib/Events/RecordUpdated.php
+++ b/lib/Events/RecordUpdated.php
@@ -6,10 +6,17 @@
 
 class RecordUpdated implements Event
 {
+	/** @var array<string, mixed> */
 	protected array  $data;
+
+	/** @var array<string, mixed> */
 	protected array  $identity;
 	protected string $type;
 
+	/**
+	 * @param array<string, mixed> $identity
+	 * @param array<string, mixed> $data
+	 */
 	public function __construct(string $type, array $identity, array $data)
 	{
 		$this->identity = $identity;
@@ -20,7 +27,7 @@ public function __construct(string $type, array $identity, array $data)
 	/**
 	 * Gets the data used to store the record in the database.
 	 *
-	 * @return array
+	 * @return array<string, mixed>
 	 */
 	public function getData() : array
 	{
@@ -30,7 +37,7 @@ public function getData() : array
 	/**
 	 * Gets the identity for the record that was updated.
 	 *
-	 * @return array
+	 * @return array<string, mixed>
 	 */
 	public function getIdentity() : array
 	{
@@ -51,4 +58,4 @@ public static function getId() : string
 	{
 		return 'record_updated';
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/Factories/IdentityToWhere.php b/lib/Factories/IdentityToWhere.php
index f45d993..ba75fde 100644
--- a/lib/Factories/IdentityToWhere.php
+++ b/lib/Factories/IdentityToWhere.php
@@ -4,8 +4,10 @@
 
 class IdentityToWhere
 {
+    /** @var array<string, mixed> */
     protected array $identity;
 
+    /** @param array<string, mixed> $identity */
     public function __construct(array $identity)
     {
         $this->identity = $identity;
@@ -14,7 +16,7 @@ public function __construct(array $identity)
     /**
      * Returns the where statement for a given identity.
      *
-     * @return array
+     * @return array<array-key, array{column: string, operator: '=', value: mixed}>
      */
     public function toWhere(): array
     {
@@ -25,4 +27,4 @@ public function toWhere(): array
 
         return $where;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Interfaces/CanConvertModelToArray.php b/lib/Interfaces/CanConvertModelToArray.php
index c567689..744baa3 100644
--- a/lib/Interfaces/CanConvertModelToArray.php
+++ b/lib/Interfaces/CanConvertModelToArray.php
@@ -9,7 +9,7 @@ interface CanConvertModelToArray
 {
     /**
      * @param TModel $model
-     * @return array
+     * @return array<string, mixed>
      */
     public function toArray(DataModel $model): array;
-}
\ No newline at end of file
+}
diff --git a/lib/Interfaces/Datastore.php b/lib/Interfaces/Datastore.php
index fb13ecf..d225c91 100644
--- a/lib/Interfaces/Datastore.php
+++ b/lib/Interfaces/Datastore.php
@@ -7,7 +7,7 @@
 use PHPNomad\Datastore\Exceptions\RecordNotFoundException;
 
 /**
- * @template T of <DataModel>
+ * @template T of DataModel
  */
 interface Datastore
 {
diff --git a/lib/Interfaces/DatastoreHasCounts.php b/lib/Interfaces/DatastoreHasCounts.php
index ec426d4..fc1bee3 100644
--- a/lib/Interfaces/DatastoreHasCounts.php
+++ b/lib/Interfaces/DatastoreHasCounts.php
@@ -19,7 +19,11 @@ public function getEstimatedCount(): int;
     /**
      * Count the results with conditions, using AND/OR.
      *
-     * @param array{type: string, clauses: array{column: string, operator: string, value: mixed}[]} $conditions
+     * @param list<array{
+     *     type?: string,
+     *     groupType?: string,
+     *     clauses: list<array{column: string|list<string>, operator: string, value: mixed}>
+     * }> $conditions
      * @return int
      * @throws DatastoreErrorException
      */
@@ -42,4 +46,4 @@ public function countAndWhere(array $conditions): int;
      * @throws DatastoreErrorException
      */
     public function countOrWhere(array $conditions): int;
-}
\ No newline at end of file
+}
diff --git a/lib/Interfaces/DatastoreHasPrimaryKey.php b/lib/Interfaces/DatastoreHasPrimaryKey.php
index dc77057..03b199d 100644
--- a/lib/Interfaces/DatastoreHasPrimaryKey.php
+++ b/lib/Interfaces/DatastoreHasPrimaryKey.php
@@ -21,8 +21,8 @@ public function find($id): DataModel;
     /**
      * Retrieve a set of records by their primary keys.
      *
-     * @param array $ids
-     * @return array
+     * @param array<array-key, mixed> $ids
+     * @return array<array-key, DataModel>
      * @throws DatastoreErrorException
      */
     public function findMultiple(array $ids): array;
@@ -48,4 +48,4 @@ public function update($id, array $attributes): void;
      * @throws RecordNotFoundException
      */
     public function delete($id): void;
-}
\ No newline at end of file
+}
diff --git a/lib/Interfaces/DatastoreHasWhere.php b/lib/Interfaces/DatastoreHasWhere.php
index ee03622..642e495 100644
--- a/lib/Interfaces/DatastoreHasWhere.php
+++ b/lib/Interfaces/DatastoreHasWhere.php
@@ -7,14 +7,14 @@
 use PHPNomad\Datastore\Exceptions\RecordNotFoundException;
 
 /**
- * @template T of <DataModel>
+ * @template T of DataModel
  */
 interface DatastoreHasWhere {
     /**
      * Query with conditions, using a combination of AND/OR.
      * Classes implementing this should assume type and groupType are AND if they are not set.
      *
-     * @param array{type?: string, groupType?: string, clauses: array{column: string, operator: string, value: mixed}[]}[] $conditions
+     * @param array<array-key, array{type?: string, groupType?: string, clauses: array<array-key, array{column: string|list<string>, operator: string, value: mixed}>}> $conditions
      * @param positive-int|null $limit
      * @param positive-int|null $offset
      * @return T[]
@@ -25,7 +25,7 @@ public function where(array $conditions, ?int $limit = null, ?int $offset = null
     /**
      * Query with conditions, using AND.
      *
-     * @param array{column: string, operator: string, value: mixed}[] $conditions
+     * @param array<array-key, array{column: string|list<string>, operator: string, value: mixed}> $conditions
      * @param positive-int|null $limit
      * @param positive-int|null $offset
      * @return T[]
@@ -36,7 +36,7 @@ public function andWhere(array $conditions, ?int $limit = null, ?int $offset = n
     /**
      * Query with conditions, using OR.
      *
-     * @param array{column: string, operator: string, value: mixed}[] $conditions
+     * @param array<array-key, array{column: string|list<string>, operator: string, value: mixed}> $conditions
      * @param positive-int|null $limit
      * @param positive-int|null $offset
      * @return T[]
@@ -57,10 +57,10 @@ public function deleteWhere(array $conditions): void;
      * Finds the first available record that has the specified value in the specified column.
      *
      * @param string $field
-     * @param $value
+     * @param mixed $value
      * @return T
      * @throws DatastoreErrorException
      * @throws RecordNotFoundException
      */
     public function findBy(string $field, $value): DataModel;
-}
\ No newline at end of file
+}
diff --git a/lib/Interfaces/JunctionContextProvider.php b/lib/Interfaces/JunctionContextProvider.php
index 511e116..4a740b9 100644
--- a/lib/Interfaces/JunctionContextProvider.php
+++ b/lib/Interfaces/JunctionContextProvider.php
@@ -14,7 +14,7 @@ public function getResource(): string;
     /**
      * Gets the datastore that binds to the opposite table.
      *
-     * @return Datastore&DatastoreHasPrimaryKey
+     * @return Datastore<DataModel>&DatastoreHasPrimaryKey
      */
     public function getDatastore(): Datastore;
 
@@ -24,4 +24,4 @@ public function getDatastore(): Datastore;
      * @return string
      */
     public function getJunctionFieldName(): string;
-}
\ No newline at end of file
+}
diff --git a/lib/Interfaces/JunctionHandler.php b/lib/Interfaces/JunctionHandler.php
index b6ebe1f..73878dc 100644
--- a/lib/Interfaces/JunctionHandler.php
+++ b/lib/Interfaces/JunctionHandler.php
@@ -26,7 +26,7 @@ public function getIdsFromResource(string $resource, int $id, int $limit, int $o
      * @param int $id
      * @param int $limit
      * @param int $offset
-     * @return array
+     * @return array<array-key, DataModel>
      * @throws DatastoreErrorException
      */
     public function getModelsFromResource(string $resource, int $id, int $limit, int $offset): array;
@@ -63,4 +63,4 @@ public function bind(string $resource, int $id, int $bindingId): void;
      * @throws DatastoreErrorException
      */
     public function unbind(string $resource, int $id, int $bindingId): void;
-}
\ No newline at end of file
+}
diff --git a/lib/Interfaces/ModelAdapter.php b/lib/Interfaces/ModelAdapter.php
index b1aad7c..e7e496e 100644
--- a/lib/Interfaces/ModelAdapter.php
+++ b/lib/Interfaces/ModelAdapter.php
@@ -4,12 +4,13 @@
 
 /**
  * @template TModel of DataModel
+ * @extends CanConvertModelToArray<TModel>
  */
 interface ModelAdapter extends CanConvertModelToArray
 {
     /**
-     * @param array $array
+     * @param array<string, mixed> $array
      * @return TModel
      */
     public function toModel(array $array): DataModel;
-}
\ No newline at end of file
+}