diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8c8fb3..df9436b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,27 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+## [1.0.0-rc.2] - 2024-03-06
+
+### Added
+
+- New `FailedResultException` for throw result objects that have not succeeded.
+
+### Changed
+
+- **BREAKING**: The `UnitOfWorkAwareDispatcher` now queues deferred events to be dispatched before the unit of work
+  commits. Previously it queued them for after the commit. This changes allows communication between different domain
+  entities to occur _within_ the unit of work, which is the correct pattern. For example, if an entity or aggregate root
+  needs to be updated as a result of another entity or aggregate dispatching a domain event. It also allows an _outbox_
+  pattern to be used for the publishing of integration events. This is a breaking change because it changes the order in
+  which events and listeners are executed. Listeners that need to be dispatched after the commit should now implement
+  the `DispatchAfterCommit` interface.
+
+### Fixed
+
+- The `ExecuteInUnitOfWork` middleware now correctly prevents the unit of work committing if the inner handler returns a
+  failed result. Previously the unit of work would have committed, which was incorrect for a failed result.
+
 ## [1.0.0-rc.1] - 2024-02-23
 
 ### Added
@@ -31,7 +52,7 @@ All notable changes to this project will be documented in this file. This projec
 ### Removed
 
 - **BREAKING** removed the `deptrac-layers.yaml` file, in favour of applications including the classes in their own
-   Deptrac configuration.
+  Deptrac configuration.
 
 ### Deprecated
 
diff --git a/LICENSE b/LICENSE
index 7218413..c587f9b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,202 +1,21 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2020 Cloud Creativity Limited.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+The MIT License (MIT)
+
+Copyright (c) 2024 Cloud Creativity Ltd
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/README.md b/README.md
index c27d99c..e7bc693 100644
--- a/README.md
+++ b/README.md
@@ -20,4 +20,4 @@ composer require cloudcreativity/ddd-modules
 
 ## License
 
-DDD Modules is open-sourced software licensed under the [Apache 2.0 License](./LICENSE).
+DDD Modules is open-source software licensed under the [MIT License](./LICENSE).
diff --git a/composer.json b/composer.json
index b6119f7..9bb58cd 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     "support": {
         "issues": "https://github.com/cloudcreativity/ddd-modules/issues"
     },
-    "license": "Apache-2.0",
+    "license": "MIT",
     "authors": [
         {
             "name": "Cloud Creativity Ltd",
diff --git a/src/Bus/CommandDispatcher.php b/src/Bus/CommandDispatcher.php
index c4c506b..f699bce 100644
--- a/src/Bus/CommandDispatcher.php
+++ b/src/Bus/CommandDispatcher.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/CommandDispatcherInterface.php b/src/Bus/CommandDispatcherInterface.php
index 6a3600e..17ff682 100644
--- a/src/Bus/CommandDispatcherInterface.php
+++ b/src/Bus/CommandDispatcherInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/CommandHandler.php b/src/Bus/CommandHandler.php
index a65c353..e0bd324 100644
--- a/src/Bus/CommandHandler.php
+++ b/src/Bus/CommandHandler.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/CommandHandlerContainer.php b/src/Bus/CommandHandlerContainer.php
index 68ba0b1..02bf44c 100644
--- a/src/Bus/CommandHandlerContainer.php
+++ b/src/Bus/CommandHandlerContainer.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/CommandHandlerContainerInterface.php b/src/Bus/CommandHandlerContainerInterface.php
index 9e73cea..e46724c 100644
--- a/src/Bus/CommandHandlerContainerInterface.php
+++ b/src/Bus/CommandHandlerContainerInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/CommandHandlerInterface.php b/src/Bus/CommandHandlerInterface.php
index 6a00ec3..e0d1931 100644
--- a/src/Bus/CommandHandlerInterface.php
+++ b/src/Bus/CommandHandlerInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/CommandInterface.php b/src/Bus/CommandInterface.php
index 5471aa1..d4c1d0e 100644
--- a/src/Bus/CommandInterface.php
+++ b/src/Bus/CommandInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/DispatchThroughMiddleware.php b/src/Bus/DispatchThroughMiddleware.php
index 94c69e2..dac8cc6 100644
--- a/src/Bus/DispatchThroughMiddleware.php
+++ b/src/Bus/DispatchThroughMiddleware.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/Middleware/CommandMiddlewareInterface.php b/src/Bus/Middleware/CommandMiddlewareInterface.php
index c078d54..c082bd6 100644
--- a/src/Bus/Middleware/CommandMiddlewareInterface.php
+++ b/src/Bus/Middleware/CommandMiddlewareInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/Middleware/ExecuteInUnitOfWork.php b/src/Bus/Middleware/ExecuteInUnitOfWork.php
index c34190f..04b3ea1 100644
--- a/src/Bus/Middleware/ExecuteInUnitOfWork.php
+++ b/src/Bus/Middleware/ExecuteInUnitOfWork.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
@@ -20,6 +12,7 @@
 namespace CloudCreativity\Modules\Bus\Middleware;
 
 use Closure;
+use CloudCreativity\Modules\Infrastructure\Persistence\AbortOnFailureException;
 use CloudCreativity\Modules\Infrastructure\Persistence\UnitOfWorkManagerInterface;
 use CloudCreativity\Modules\Toolkit\Messages\CommandInterface;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
@@ -43,13 +36,16 @@ public function __construct(
      */
     public function __invoke(CommandInterface $command, Closure $next): ResultInterface
     {
-        $result = $this->unitOfWorkManager->execute(
-            static fn () => $next($command),
-            $this->attempts,
-        );
-
-        assert($result instanceof ResultInterface, 'Expecting a result object.');
-
-        return $result;
+        try {
+            return $this->unitOfWorkManager->execute(
+                static function () use ($command, $next): ResultInterface {
+                    $res = $next($command);
+                    return $res->didSucceed() ? $res : throw new AbortOnFailureException($res);
+                },
+                $this->attempts,
+            );
+        } catch (AbortOnFailureException $ex) {
+            return $ex->getResult();
+        }
     }
 }
diff --git a/src/Bus/Middleware/FlushDeferredEvents.php b/src/Bus/Middleware/FlushDeferredEvents.php
index 2c83757..1ed9f9c 100644
--- a/src/Bus/Middleware/FlushDeferredEvents.php
+++ b/src/Bus/Middleware/FlushDeferredEvents.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/Middleware/LogMessageDispatch.php b/src/Bus/Middleware/LogMessageDispatch.php
index 885d4f7..bfdb81f 100644
--- a/src/Bus/Middleware/LogMessageDispatch.php
+++ b/src/Bus/Middleware/LogMessageDispatch.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/Middleware/MessageMiddlewareInterface.php b/src/Bus/Middleware/MessageMiddlewareInterface.php
index 1144474..ef7306a 100644
--- a/src/Bus/Middleware/MessageMiddlewareInterface.php
+++ b/src/Bus/Middleware/MessageMiddlewareInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/Middleware/QueryMiddlewareInterface.php b/src/Bus/Middleware/QueryMiddlewareInterface.php
index 320eeb0..107aa84 100644
--- a/src/Bus/Middleware/QueryMiddlewareInterface.php
+++ b/src/Bus/Middleware/QueryMiddlewareInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/Middleware/SetupBeforeDispatch.php b/src/Bus/Middleware/SetupBeforeDispatch.php
index a0b537d..2e5c996 100644
--- a/src/Bus/Middleware/SetupBeforeDispatch.php
+++ b/src/Bus/Middleware/SetupBeforeDispatch.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/Middleware/TearDownAfterDispatch.php b/src/Bus/Middleware/TearDownAfterDispatch.php
index b91cbb0..8559e5f 100644
--- a/src/Bus/Middleware/TearDownAfterDispatch.php
+++ b/src/Bus/Middleware/TearDownAfterDispatch.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/Middleware/ValidateCommand.php b/src/Bus/Middleware/ValidateCommand.php
index bce6b6e..f3f3762 100644
--- a/src/Bus/Middleware/ValidateCommand.php
+++ b/src/Bus/Middleware/ValidateCommand.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/Middleware/ValidateQuery.php b/src/Bus/Middleware/ValidateQuery.php
index ac33f28..f09debc 100644
--- a/src/Bus/Middleware/ValidateQuery.php
+++ b/src/Bus/Middleware/ValidateQuery.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/QueryDispatcher.php b/src/Bus/QueryDispatcher.php
index d350768..c4b6353 100644
--- a/src/Bus/QueryDispatcher.php
+++ b/src/Bus/QueryDispatcher.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/QueryDispatcherInterface.php b/src/Bus/QueryDispatcherInterface.php
index ab61c99..15e0f92 100644
--- a/src/Bus/QueryDispatcherInterface.php
+++ b/src/Bus/QueryDispatcherInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/QueryHandler.php b/src/Bus/QueryHandler.php
index 1ba9d87..342fcb9 100644
--- a/src/Bus/QueryHandler.php
+++ b/src/Bus/QueryHandler.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/QueryHandlerContainer.php b/src/Bus/QueryHandlerContainer.php
index 6df3a8c..17a04bb 100644
--- a/src/Bus/QueryHandlerContainer.php
+++ b/src/Bus/QueryHandlerContainer.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/QueryHandlerContainerInterface.php b/src/Bus/QueryHandlerContainerInterface.php
index 66e11f2..8ff3efb 100644
--- a/src/Bus/QueryHandlerContainerInterface.php
+++ b/src/Bus/QueryHandlerContainerInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/QueryHandlerInterface.php b/src/Bus/QueryHandlerInterface.php
index e0a7ed1..227d488 100644
--- a/src/Bus/QueryHandlerInterface.php
+++ b/src/Bus/QueryHandlerInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/QueryInterface.php b/src/Bus/QueryInterface.php
index 9d39d5c..4d81096 100644
--- a/src/Bus/QueryInterface.php
+++ b/src/Bus/QueryInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/Validation/AbstractValidator.php b/src/Bus/Validation/AbstractValidator.php
index 9cf04fa..e2d86bb 100644
--- a/src/Bus/Validation/AbstractValidator.php
+++ b/src/Bus/Validation/AbstractValidator.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/Validation/CommandValidator.php b/src/Bus/Validation/CommandValidator.php
index 8c43fcd..32f94e1 100644
--- a/src/Bus/Validation/CommandValidator.php
+++ b/src/Bus/Validation/CommandValidator.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/Validation/CommandValidatorInterface.php b/src/Bus/Validation/CommandValidatorInterface.php
index f7ce56b..bec9216 100644
--- a/src/Bus/Validation/CommandValidatorInterface.php
+++ b/src/Bus/Validation/CommandValidatorInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/Validation/QueryValidator.php b/src/Bus/Validation/QueryValidator.php
index 9f8d127..ebcdbd2 100644
--- a/src/Bus/Validation/QueryValidator.php
+++ b/src/Bus/Validation/QueryValidator.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/Validation/QueryValidatorInterface.php b/src/Bus/Validation/QueryValidatorInterface.php
index 8f56b90..33959b1 100644
--- a/src/Bus/Validation/QueryValidatorInterface.php
+++ b/src/Bus/Validation/QueryValidatorInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Bus/Validation/ValidatorInterface.php b/src/Bus/Validation/ValidatorInterface.php
index 8ed5d69..cf594ca 100644
--- a/src/Bus/Validation/ValidatorInterface.php
+++ b/src/Bus/Validation/ValidatorInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/AggregateInterface.php b/src/Domain/AggregateInterface.php
index 7de3e83..3ec2266 100644
--- a/src/Domain/AggregateInterface.php
+++ b/src/Domain/AggregateInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/EntityInterface.php b/src/Domain/EntityInterface.php
index 2afd8a2..4815d4c 100644
--- a/src/Domain/EntityInterface.php
+++ b/src/Domain/EntityInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/EntityTrait.php b/src/Domain/EntityTrait.php
index 6009fca..64e8685 100644
--- a/src/Domain/EntityTrait.php
+++ b/src/Domain/EntityTrait.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/EntityWithNullableIdTrait.php b/src/Domain/EntityWithNullableIdTrait.php
index 5b48b69..171197a 100644
--- a/src/Domain/EntityWithNullableIdTrait.php
+++ b/src/Domain/EntityWithNullableIdTrait.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Events/DispatcherInterface.php b/src/Domain/Events/DispatcherInterface.php
index 0bb03a5..b279ac2 100644
--- a/src/Domain/Events/DispatcherInterface.php
+++ b/src/Domain/Events/DispatcherInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Events/DomainEventInterface.php b/src/Domain/Events/DomainEventInterface.php
index 8ac0710..8faf824 100644
--- a/src/Domain/Events/DomainEventInterface.php
+++ b/src/Domain/Events/DomainEventInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/Events/OccursImmediately.php b/src/Domain/Events/OccursImmediately.php
index 390b4e9..ef38390 100644
--- a/src/Domain/Events/OccursImmediately.php
+++ b/src/Domain/Events/OccursImmediately.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Domain/IdentifierOrEntity.php b/src/Domain/IdentifierOrEntity.php
index d25f49f..0665607 100644
--- a/src/Domain/IdentifierOrEntity.php
+++ b/src/Domain/IdentifierOrEntity.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/EventBus/EventBus.php b/src/EventBus/EventBus.php
index 787f648..aa5ba14 100644
--- a/src/EventBus/EventBus.php
+++ b/src/EventBus/EventBus.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/EventBus/EventBusInterface.php b/src/EventBus/EventBusInterface.php
index 643f029..9882b16 100644
--- a/src/EventBus/EventBusInterface.php
+++ b/src/EventBus/EventBusInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/EventBus/Inbound/Notifier.php b/src/EventBus/Inbound/Notifier.php
index 0ee90d8..e9cb583 100644
--- a/src/EventBus/Inbound/Notifier.php
+++ b/src/EventBus/Inbound/Notifier.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/EventBus/Inbound/NotifierInterface.php b/src/EventBus/Inbound/NotifierInterface.php
index 55b7fbb..6ba68b6 100644
--- a/src/EventBus/Inbound/NotifierInterface.php
+++ b/src/EventBus/Inbound/NotifierInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/EventBus/IntegrationEventHandler.php b/src/EventBus/IntegrationEventHandler.php
index 51136de..91d3dc0 100644
--- a/src/EventBus/IntegrationEventHandler.php
+++ b/src/EventBus/IntegrationEventHandler.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/EventBus/IntegrationEventHandlerContainer.php b/src/EventBus/IntegrationEventHandlerContainer.php
index ec2b293..86a9b26 100644
--- a/src/EventBus/IntegrationEventHandlerContainer.php
+++ b/src/EventBus/IntegrationEventHandlerContainer.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/EventBus/IntegrationEventHandlerContainerInterface.php b/src/EventBus/IntegrationEventHandlerContainerInterface.php
index 2ea3a8f..8b98514 100644
--- a/src/EventBus/IntegrationEventHandlerContainerInterface.php
+++ b/src/EventBus/IntegrationEventHandlerContainerInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/EventBus/IntegrationEventHandlerInterface.php b/src/EventBus/IntegrationEventHandlerInterface.php
index b4f918c..350526b 100644
--- a/src/EventBus/IntegrationEventHandlerInterface.php
+++ b/src/EventBus/IntegrationEventHandlerInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/EventBus/Middleware/IntegrationEventMiddlewareInterface.php b/src/EventBus/Middleware/IntegrationEventMiddlewareInterface.php
index ab04f95..34ac73f 100644
--- a/src/EventBus/Middleware/IntegrationEventMiddlewareInterface.php
+++ b/src/EventBus/Middleware/IntegrationEventMiddlewareInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/EventBus/Middleware/LogInboundIntegrationEvent.php b/src/EventBus/Middleware/LogInboundIntegrationEvent.php
index 16c9b5b..67aa011 100644
--- a/src/EventBus/Middleware/LogInboundIntegrationEvent.php
+++ b/src/EventBus/Middleware/LogInboundIntegrationEvent.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/EventBus/Middleware/LogOutboundIntegrationEvent.php b/src/EventBus/Middleware/LogOutboundIntegrationEvent.php
index fa2786a..18c7320 100644
--- a/src/EventBus/Middleware/LogOutboundIntegrationEvent.php
+++ b/src/EventBus/Middleware/LogOutboundIntegrationEvent.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/EventBus/Outbound/Publisher.php b/src/EventBus/Outbound/Publisher.php
index 4914b2d..2794221 100644
--- a/src/EventBus/Outbound/Publisher.php
+++ b/src/EventBus/Outbound/Publisher.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/EventBus/Outbound/PublisherInterface.php b/src/EventBus/Outbound/PublisherInterface.php
index 8d2862d..0228ca9 100644
--- a/src/EventBus/Outbound/PublisherInterface.php
+++ b/src/EventBus/Outbound/PublisherInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/DomainEventDispatching/DeferredDispatcher.php b/src/Infrastructure/DomainEventDispatching/DeferredDispatcher.php
index af36a03..4f1f915 100644
--- a/src/Infrastructure/DomainEventDispatching/DeferredDispatcher.php
+++ b/src/Infrastructure/DomainEventDispatching/DeferredDispatcher.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/DomainEventDispatching/DeferredDispatcherInterface.php b/src/Infrastructure/DomainEventDispatching/DeferredDispatcherInterface.php
index 84e0d2c..3296edd 100644
--- a/src/Infrastructure/DomainEventDispatching/DeferredDispatcherInterface.php
+++ b/src/Infrastructure/DomainEventDispatching/DeferredDispatcherInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/DomainEventDispatching/DispatchAfterCommit.php b/src/Infrastructure/DomainEventDispatching/DispatchAfterCommit.php
index 92ff5d4..2b5fd39 100644
--- a/src/Infrastructure/DomainEventDispatching/DispatchAfterCommit.php
+++ b/src/Infrastructure/DomainEventDispatching/DispatchAfterCommit.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/DomainEventDispatching/DispatchBeforeCommit.php b/src/Infrastructure/DomainEventDispatching/DispatchBeforeCommit.php
index b8a4d91..c046052 100644
--- a/src/Infrastructure/DomainEventDispatching/DispatchBeforeCommit.php
+++ b/src/Infrastructure/DomainEventDispatching/DispatchBeforeCommit.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/DomainEventDispatching/Dispatcher.php b/src/Infrastructure/DomainEventDispatching/Dispatcher.php
index b6cace3..ae98adb 100644
--- a/src/Infrastructure/DomainEventDispatching/Dispatcher.php
+++ b/src/Infrastructure/DomainEventDispatching/Dispatcher.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/DomainEventDispatching/DispatcherInterface.php b/src/Infrastructure/DomainEventDispatching/DispatcherInterface.php
index fc003ee..b2049a9 100644
--- a/src/Infrastructure/DomainEventDispatching/DispatcherInterface.php
+++ b/src/Infrastructure/DomainEventDispatching/DispatcherInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/DomainEventDispatching/EventHandler.php b/src/Infrastructure/DomainEventDispatching/EventHandler.php
index a96d852..f52c281 100644
--- a/src/Infrastructure/DomainEventDispatching/EventHandler.php
+++ b/src/Infrastructure/DomainEventDispatching/EventHandler.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/DomainEventDispatching/ListenerContainer.php b/src/Infrastructure/DomainEventDispatching/ListenerContainer.php
index 31ed7f9..befc5b4 100644
--- a/src/Infrastructure/DomainEventDispatching/ListenerContainer.php
+++ b/src/Infrastructure/DomainEventDispatching/ListenerContainer.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/DomainEventDispatching/ListenerContainerInterface.php b/src/Infrastructure/DomainEventDispatching/ListenerContainerInterface.php
index f859911..89c7842 100644
--- a/src/Infrastructure/DomainEventDispatching/ListenerContainerInterface.php
+++ b/src/Infrastructure/DomainEventDispatching/ListenerContainerInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/DomainEventDispatching/Middleware/EventMiddlewareInterface.php b/src/Infrastructure/DomainEventDispatching/Middleware/EventMiddlewareInterface.php
index fa5af3b..5e6be35 100644
--- a/src/Infrastructure/DomainEventDispatching/Middleware/EventMiddlewareInterface.php
+++ b/src/Infrastructure/DomainEventDispatching/Middleware/EventMiddlewareInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/DomainEventDispatching/Middleware/LogDomainEventDispatch.php b/src/Infrastructure/DomainEventDispatching/Middleware/LogDomainEventDispatch.php
index c7a73df..c8432b7 100644
--- a/src/Infrastructure/DomainEventDispatching/Middleware/LogDomainEventDispatch.php
+++ b/src/Infrastructure/DomainEventDispatching/Middleware/LogDomainEventDispatch.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/DomainEventDispatching/UnitOfWorkAwareDispatcher.php b/src/Infrastructure/DomainEventDispatching/UnitOfWorkAwareDispatcher.php
index 8e1229e..a6ba228 100644
--- a/src/Infrastructure/DomainEventDispatching/UnitOfWorkAwareDispatcher.php
+++ b/src/Infrastructure/DomainEventDispatching/UnitOfWorkAwareDispatcher.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
@@ -52,7 +44,7 @@ public function dispatch(DomainEventInterface $event): void
             return;
         }
 
-        $this->unitOfWorkManager->afterCommit(function () use ($event): void {
+        $this->unitOfWorkManager->beforeCommit(function () use ($event): void {
             $this->dispatchNow($event);
         });
     }
diff --git a/src/Infrastructure/Infrastructure.php b/src/Infrastructure/Infrastructure.php
index 9526291..522b415 100644
--- a/src/Infrastructure/Infrastructure.php
+++ b/src/Infrastructure/Infrastructure.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/InfrastructureException.php b/src/Infrastructure/InfrastructureException.php
index f8efb47..c1522db 100644
--- a/src/Infrastructure/InfrastructureException.php
+++ b/src/Infrastructure/InfrastructureException.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/Log/ContextProviderInterface.php b/src/Infrastructure/Log/ContextProviderInterface.php
index 02f2538..3038a2a 100644
--- a/src/Infrastructure/Log/ContextProviderInterface.php
+++ b/src/Infrastructure/Log/ContextProviderInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/Log/ExceptionReporterInterface.php b/src/Infrastructure/Log/ExceptionReporterInterface.php
index 2b27d50..7eb90ac 100644
--- a/src/Infrastructure/Log/ExceptionReporterInterface.php
+++ b/src/Infrastructure/Log/ExceptionReporterInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/Log/ObjectContext.php b/src/Infrastructure/Log/ObjectContext.php
index ec440df..f0270da 100644
--- a/src/Infrastructure/Log/ObjectContext.php
+++ b/src/Infrastructure/Log/ObjectContext.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/Log/ResultContext.php b/src/Infrastructure/Log/ResultContext.php
index 0028586..1931d0b 100644
--- a/src/Infrastructure/Log/ResultContext.php
+++ b/src/Infrastructure/Log/ResultContext.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/Persistence/AbortOnFailureException.php b/src/Infrastructure/Persistence/AbortOnFailureException.php
new file mode 100644
index 0000000..dc40d75
--- /dev/null
+++ b/src/Infrastructure/Persistence/AbortOnFailureException.php
@@ -0,0 +1,18 @@
+<?php
+/*
+ * Copyright 2024 Cloud Creativity Limited
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
+declare(strict_types=1);
+
+namespace CloudCreativity\Modules\Infrastructure\Persistence;
+
+use CloudCreativity\Modules\Toolkit\Result\FailedResultException;
+
+final class AbortOnFailureException extends FailedResultException
+{
+}
diff --git a/src/Infrastructure/Persistence/UnitOfWorkInterface.php b/src/Infrastructure/Persistence/UnitOfWorkInterface.php
index e81251b..42b0f9b 100644
--- a/src/Infrastructure/Persistence/UnitOfWorkInterface.php
+++ b/src/Infrastructure/Persistence/UnitOfWorkInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
@@ -26,9 +18,10 @@ interface UnitOfWorkInterface
     /**
      * Execute the callback in a unit of work.
      *
-     * @param Closure $callback
+     * @template TReturn
+     * @param Closure(): TReturn $callback
      * @param int $attempts
-     * @return mixed
+     * @return TReturn
      */
     public function execute(Closure $callback, int $attempts = 1): mixed;
 }
diff --git a/src/Infrastructure/Persistence/UnitOfWorkManager.php b/src/Infrastructure/Persistence/UnitOfWorkManager.php
index 61d8165..c17b322 100644
--- a/src/Infrastructure/Persistence/UnitOfWorkManager.php
+++ b/src/Infrastructure/Persistence/UnitOfWorkManager.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/Persistence/UnitOfWorkManagerInterface.php b/src/Infrastructure/Persistence/UnitOfWorkManagerInterface.php
index 08a55f1..400980e 100644
--- a/src/Infrastructure/Persistence/UnitOfWorkManagerInterface.php
+++ b/src/Infrastructure/Persistence/UnitOfWorkManagerInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
@@ -26,9 +18,10 @@ interface UnitOfWorkManagerInterface
     /**
      * Execute the provided closure within a unit of work.
      *
-     * @param Closure $callback
+     * @template TReturn
+     * @param Closure(): TReturn $callback
      * @param int $attempts
-     * @return mixed
+     * @return TReturn
      */
     public function execute(Closure $callback, int $attempts = 1): mixed;
 
diff --git a/src/Infrastructure/Queue/Middleware/LogPushedToQueue.php b/src/Infrastructure/Queue/Middleware/LogPushedToQueue.php
index 6ba3a75..3a2ed3e 100644
--- a/src/Infrastructure/Queue/Middleware/LogPushedToQueue.php
+++ b/src/Infrastructure/Queue/Middleware/LogPushedToQueue.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
@@ -51,12 +43,12 @@ public function __invoke(QueueableInterface $queueable, Closure $next): void
 
         $this->log->log(
             $this->queueLevel,
-            "Queuing message {$name}.",
+            "Queuing job {$name}.",
             $context = ObjectContext::from($queueable)->context(),
         );
 
         $next($queueable);
 
-        $this->log->log($this->queuedLevel, "Queued message {$name}.", $context);
+        $this->log->log($this->queuedLevel, "Queued job {$name}.", $context);
     }
 }
diff --git a/src/Infrastructure/Queue/Middleware/QueueMiddlewareInterface.php b/src/Infrastructure/Queue/Middleware/QueueMiddlewareInterface.php
index 4e9a27d..6dbc45f 100644
--- a/src/Infrastructure/Queue/Middleware/QueueMiddlewareInterface.php
+++ b/src/Infrastructure/Queue/Middleware/QueueMiddlewareInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/Queue/Queue.php b/src/Infrastructure/Queue/Queue.php
index 67b718f..4b50372 100644
--- a/src/Infrastructure/Queue/Queue.php
+++ b/src/Infrastructure/Queue/Queue.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/Queue/QueueHandler.php b/src/Infrastructure/Queue/QueueHandler.php
index 6a84920..f02f5fe 100644
--- a/src/Infrastructure/Queue/QueueHandler.php
+++ b/src/Infrastructure/Queue/QueueHandler.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/Queue/QueueHandlerContainer.php b/src/Infrastructure/Queue/QueueHandlerContainer.php
index 9c0eebc..4507ec5 100644
--- a/src/Infrastructure/Queue/QueueHandlerContainer.php
+++ b/src/Infrastructure/Queue/QueueHandlerContainer.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/Queue/QueueHandlerContainerInterface.php b/src/Infrastructure/Queue/QueueHandlerContainerInterface.php
index 533753c..12597d9 100644
--- a/src/Infrastructure/Queue/QueueHandlerContainerInterface.php
+++ b/src/Infrastructure/Queue/QueueHandlerContainerInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/Queue/QueueHandlerInterface.php b/src/Infrastructure/Queue/QueueHandlerInterface.php
index bd24af1..7f8d5bf 100644
--- a/src/Infrastructure/Queue/QueueHandlerInterface.php
+++ b/src/Infrastructure/Queue/QueueHandlerInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/Queue/QueueInterface.php b/src/Infrastructure/Queue/QueueInterface.php
index 363c710..2393cd6 100644
--- a/src/Infrastructure/Queue/QueueInterface.php
+++ b/src/Infrastructure/Queue/QueueInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/Queue/QueueThroughMiddleware.php b/src/Infrastructure/Queue/QueueThroughMiddleware.php
index 96b8065..d9e9baa 100644
--- a/src/Infrastructure/Queue/QueueThroughMiddleware.php
+++ b/src/Infrastructure/Queue/QueueThroughMiddleware.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/Queue/QueueableBatch.php b/src/Infrastructure/Queue/QueueableBatch.php
index d5972b7..b7984b7 100644
--- a/src/Infrastructure/Queue/QueueableBatch.php
+++ b/src/Infrastructure/Queue/QueueableBatch.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/Queue/QueueableInterface.php b/src/Infrastructure/Queue/QueueableInterface.php
index 56f5308..5201019 100644
--- a/src/Infrastructure/Queue/QueueableInterface.php
+++ b/src/Infrastructure/Queue/QueueableInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Infrastructure/Queue/QueuesBatches.php b/src/Infrastructure/Queue/QueuesBatches.php
index 186d842..990ec49 100644
--- a/src/Infrastructure/Queue/QueuesBatches.php
+++ b/src/Infrastructure/Queue/QueuesBatches.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/ContractException.php b/src/Toolkit/ContractException.php
index a96c4ab..313e25e 100644
--- a/src/Toolkit/ContractException.php
+++ b/src/Toolkit/ContractException.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Contracts.php b/src/Toolkit/Contracts.php
index a2cb31b..1ab23f4 100644
--- a/src/Toolkit/Contracts.php
+++ b/src/Toolkit/Contracts.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Identifiers/Guid.php b/src/Toolkit/Identifiers/Guid.php
index 054b189..fa8fa09 100644
--- a/src/Toolkit/Identifiers/Guid.php
+++ b/src/Toolkit/Identifiers/Guid.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Identifiers/GuidTypeMap.php b/src/Toolkit/Identifiers/GuidTypeMap.php
index 62b6dca..df6a3ef 100644
--- a/src/Toolkit/Identifiers/GuidTypeMap.php
+++ b/src/Toolkit/Identifiers/GuidTypeMap.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Identifiers/Identifier.php b/src/Toolkit/Identifiers/Identifier.php
index bcb6dc0..b2c3abd 100644
--- a/src/Toolkit/Identifiers/Identifier.php
+++ b/src/Toolkit/Identifiers/Identifier.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Identifiers/IdentifierInterface.php b/src/Toolkit/Identifiers/IdentifierInterface.php
index 49572fe..c0b59d2 100644
--- a/src/Toolkit/Identifiers/IdentifierInterface.php
+++ b/src/Toolkit/Identifiers/IdentifierInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Identifiers/IntegerId.php b/src/Toolkit/Identifiers/IntegerId.php
index b269b5f..6347b05 100644
--- a/src/Toolkit/Identifiers/IntegerId.php
+++ b/src/Toolkit/Identifiers/IntegerId.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Identifiers/LazyListOfGuids.php b/src/Toolkit/Identifiers/LazyListOfGuids.php
index c5448f1..d554489 100644
--- a/src/Toolkit/Identifiers/LazyListOfGuids.php
+++ b/src/Toolkit/Identifiers/LazyListOfGuids.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Identifiers/LazyListOfIdentifiers.php b/src/Toolkit/Identifiers/LazyListOfIdentifiers.php
index 87d13e0..4064cec 100644
--- a/src/Toolkit/Identifiers/LazyListOfIdentifiers.php
+++ b/src/Toolkit/Identifiers/LazyListOfIdentifiers.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Identifiers/LazyListOfIntegerIds.php b/src/Toolkit/Identifiers/LazyListOfIntegerIds.php
index ea7fa48..f27e16b 100644
--- a/src/Toolkit/Identifiers/LazyListOfIntegerIds.php
+++ b/src/Toolkit/Identifiers/LazyListOfIntegerIds.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Identifiers/LazyListOfStringIds.php b/src/Toolkit/Identifiers/LazyListOfStringIds.php
index db8e43e..c01d1e6 100644
--- a/src/Toolkit/Identifiers/LazyListOfStringIds.php
+++ b/src/Toolkit/Identifiers/LazyListOfStringIds.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Identifiers/LazyListOfUuids.php b/src/Toolkit/Identifiers/LazyListOfUuids.php
index a433a88..94ea788 100644
--- a/src/Toolkit/Identifiers/LazyListOfUuids.php
+++ b/src/Toolkit/Identifiers/LazyListOfUuids.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Identifiers/ListOfIdentifiers.php b/src/Toolkit/Identifiers/ListOfIdentifiers.php
index c9f2ead..10abc95 100644
--- a/src/Toolkit/Identifiers/ListOfIdentifiers.php
+++ b/src/Toolkit/Identifiers/ListOfIdentifiers.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Identifiers/PossiblyNumericId.php b/src/Toolkit/Identifiers/PossiblyNumericId.php
index 42498e4..a5743f8 100644
--- a/src/Toolkit/Identifiers/PossiblyNumericId.php
+++ b/src/Toolkit/Identifiers/PossiblyNumericId.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Identifiers/StringId.php b/src/Toolkit/Identifiers/StringId.php
index 57856b2..14d8740 100644
--- a/src/Toolkit/Identifiers/StringId.php
+++ b/src/Toolkit/Identifiers/StringId.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Identifiers/Uuid.php b/src/Toolkit/Identifiers/Uuid.php
index dfe5517..dfff76d 100644
--- a/src/Toolkit/Identifiers/Uuid.php
+++ b/src/Toolkit/Identifiers/Uuid.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Identifiers/UuidFactory.php b/src/Toolkit/Identifiers/UuidFactory.php
index 400bbfc..6df7662 100644
--- a/src/Toolkit/Identifiers/UuidFactory.php
+++ b/src/Toolkit/Identifiers/UuidFactory.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Identifiers/UuidFactoryInterface.php b/src/Toolkit/Identifiers/UuidFactoryInterface.php
index 07d9542..1bf75a0 100644
--- a/src/Toolkit/Identifiers/UuidFactoryInterface.php
+++ b/src/Toolkit/Identifiers/UuidFactoryInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Iterables/KeyedSetInterface.php b/src/Toolkit/Iterables/KeyedSetInterface.php
index 5d311ef..214a6bb 100644
--- a/src/Toolkit/Iterables/KeyedSetInterface.php
+++ b/src/Toolkit/Iterables/KeyedSetInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Iterables/KeyedSetTrait.php b/src/Toolkit/Iterables/KeyedSetTrait.php
index b38a777..e7eea2f 100644
--- a/src/Toolkit/Iterables/KeyedSetTrait.php
+++ b/src/Toolkit/Iterables/KeyedSetTrait.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Iterables/LazyListInterface.php b/src/Toolkit/Iterables/LazyListInterface.php
index c3bff7f..85b3154 100644
--- a/src/Toolkit/Iterables/LazyListInterface.php
+++ b/src/Toolkit/Iterables/LazyListInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Iterables/LazyListTrait.php b/src/Toolkit/Iterables/LazyListTrait.php
index 3ce995e..206aa59 100644
--- a/src/Toolkit/Iterables/LazyListTrait.php
+++ b/src/Toolkit/Iterables/LazyListTrait.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Iterables/ListInterface.php b/src/Toolkit/Iterables/ListInterface.php
index b4dc507..4e561d8 100644
--- a/src/Toolkit/Iterables/ListInterface.php
+++ b/src/Toolkit/Iterables/ListInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Iterables/ListTrait.php b/src/Toolkit/Iterables/ListTrait.php
index c304ca8..b208454 100644
--- a/src/Toolkit/Iterables/ListTrait.php
+++ b/src/Toolkit/Iterables/ListTrait.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Loggable/ContextProviderInterface.php b/src/Toolkit/Loggable/ContextProviderInterface.php
index eb49d53..ffd934f 100644
--- a/src/Toolkit/Loggable/ContextProviderInterface.php
+++ b/src/Toolkit/Loggable/ContextProviderInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Messages/CommandInterface.php b/src/Toolkit/Messages/CommandInterface.php
index d98b9ad..1da1954 100644
--- a/src/Toolkit/Messages/CommandInterface.php
+++ b/src/Toolkit/Messages/CommandInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Messages/DispatchThroughMiddleware.php b/src/Toolkit/Messages/DispatchThroughMiddleware.php
index 8b19f02..0052212 100644
--- a/src/Toolkit/Messages/DispatchThroughMiddleware.php
+++ b/src/Toolkit/Messages/DispatchThroughMiddleware.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Messages/IntegrationEventInterface.php b/src/Toolkit/Messages/IntegrationEventInterface.php
index 76977f9..db9f42a 100644
--- a/src/Toolkit/Messages/IntegrationEventInterface.php
+++ b/src/Toolkit/Messages/IntegrationEventInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Messages/MessageInterface.php b/src/Toolkit/Messages/MessageInterface.php
index 0e34c31..f95621e 100644
--- a/src/Toolkit/Messages/MessageInterface.php
+++ b/src/Toolkit/Messages/MessageInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Messages/QueryInterface.php b/src/Toolkit/Messages/QueryInterface.php
index 9b08646..1a148d0 100644
--- a/src/Toolkit/Messages/QueryInterface.php
+++ b/src/Toolkit/Messages/QueryInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/ModuleBasename.php b/src/Toolkit/ModuleBasename.php
index 47556cf..2ac5c36 100644
--- a/src/Toolkit/ModuleBasename.php
+++ b/src/Toolkit/ModuleBasename.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Pipeline/AccumulationProcessor.php b/src/Toolkit/Pipeline/AccumulationProcessor.php
index 45608ae..cd14e55 100644
--- a/src/Toolkit/Pipeline/AccumulationProcessor.php
+++ b/src/Toolkit/Pipeline/AccumulationProcessor.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Pipeline/InterruptibleProcessor.php b/src/Toolkit/Pipeline/InterruptibleProcessor.php
index 7aa597c..c1f9ef8 100644
--- a/src/Toolkit/Pipeline/InterruptibleProcessor.php
+++ b/src/Toolkit/Pipeline/InterruptibleProcessor.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Pipeline/LazyPipe.php b/src/Toolkit/Pipeline/LazyPipe.php
index 164f45d..c8c82b0 100644
--- a/src/Toolkit/Pipeline/LazyPipe.php
+++ b/src/Toolkit/Pipeline/LazyPipe.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Pipeline/MiddlewareProcessor.php b/src/Toolkit/Pipeline/MiddlewareProcessor.php
index 1b6b72e..bfb6ee8 100644
--- a/src/Toolkit/Pipeline/MiddlewareProcessor.php
+++ b/src/Toolkit/Pipeline/MiddlewareProcessor.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Pipeline/PipeContainer.php b/src/Toolkit/Pipeline/PipeContainer.php
index 9fa0cee..d3799db 100644
--- a/src/Toolkit/Pipeline/PipeContainer.php
+++ b/src/Toolkit/Pipeline/PipeContainer.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Pipeline/PipeContainerInterface.php b/src/Toolkit/Pipeline/PipeContainerInterface.php
index ebf9ec5..0c6f88d 100644
--- a/src/Toolkit/Pipeline/PipeContainerInterface.php
+++ b/src/Toolkit/Pipeline/PipeContainerInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Pipeline/Pipeline.php b/src/Toolkit/Pipeline/Pipeline.php
index 2b76466..fe43245 100644
--- a/src/Toolkit/Pipeline/Pipeline.php
+++ b/src/Toolkit/Pipeline/Pipeline.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Pipeline/PipelineBuilder.php b/src/Toolkit/Pipeline/PipelineBuilder.php
index b5d9f78..6ef7e1b 100644
--- a/src/Toolkit/Pipeline/PipelineBuilder.php
+++ b/src/Toolkit/Pipeline/PipelineBuilder.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Pipeline/PipelineBuilderFactory.php b/src/Toolkit/Pipeline/PipelineBuilderFactory.php
index 745b0de..4bc2f89 100644
--- a/src/Toolkit/Pipeline/PipelineBuilderFactory.php
+++ b/src/Toolkit/Pipeline/PipelineBuilderFactory.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Pipeline/PipelineBuilderFactoryInterface.php b/src/Toolkit/Pipeline/PipelineBuilderFactoryInterface.php
index c36ee50..ffc0983 100644
--- a/src/Toolkit/Pipeline/PipelineBuilderFactoryInterface.php
+++ b/src/Toolkit/Pipeline/PipelineBuilderFactoryInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Pipeline/PipelineBuilderInterface.php b/src/Toolkit/Pipeline/PipelineBuilderInterface.php
index dde1f80..3c7bac8 100644
--- a/src/Toolkit/Pipeline/PipelineBuilderInterface.php
+++ b/src/Toolkit/Pipeline/PipelineBuilderInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Pipeline/PipelineInterface.php b/src/Toolkit/Pipeline/PipelineInterface.php
index 7d0185d..e4051e3 100644
--- a/src/Toolkit/Pipeline/PipelineInterface.php
+++ b/src/Toolkit/Pipeline/PipelineInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Pipeline/ProcessorInterface.php b/src/Toolkit/Pipeline/ProcessorInterface.php
index 5839db1..60a682b 100644
--- a/src/Toolkit/Pipeline/ProcessorInterface.php
+++ b/src/Toolkit/Pipeline/ProcessorInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Pipeline/SimpleProcessor.php b/src/Toolkit/Pipeline/SimpleProcessor.php
index 3bca0f2..975fc7c 100644
--- a/src/Toolkit/Pipeline/SimpleProcessor.php
+++ b/src/Toolkit/Pipeline/SimpleProcessor.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Result/Error.php b/src/Toolkit/Result/Error.php
index 44f1819..93fc7ac 100644
--- a/src/Toolkit/Result/Error.php
+++ b/src/Toolkit/Result/Error.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Result/ErrorInterface.php b/src/Toolkit/Result/ErrorInterface.php
index de81a5e..eac9fa6 100644
--- a/src/Toolkit/Result/ErrorInterface.php
+++ b/src/Toolkit/Result/ErrorInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Result/FailedResultException.php b/src/Toolkit/Result/FailedResultException.php
new file mode 100644
index 0000000..15b5f62
--- /dev/null
+++ b/src/Toolkit/Result/FailedResultException.php
@@ -0,0 +1,40 @@
+<?php
+/*
+ * Copyright 2024 Cloud Creativity Limited
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
+declare(strict_types=1);
+
+namespace CloudCreativity\Modules\Toolkit\Result;
+
+use RuntimeException;
+use Throwable;
+
+class FailedResultException extends RuntimeException
+{
+    /**
+     * FailedResultException constructor.
+     *
+     * @param ResultInterface<mixed> $result
+     */
+    public function __construct(
+        private readonly ResultInterface $result,
+        int $code = 0,
+        Throwable $previous = null,
+    ) {
+        assert($result->didFail(), 'Expecting a failed result.');
+        parent::__construct($result->error() ?? '', $code, $previous);
+    }
+
+    /**
+     * @return ResultInterface<mixed>
+     */
+    public function getResult(): ResultInterface
+    {
+        return $this->result;
+    }
+}
diff --git a/src/Toolkit/Result/KeyedSetOfErrors.php b/src/Toolkit/Result/KeyedSetOfErrors.php
index 5ae7955..2252604 100644
--- a/src/Toolkit/Result/KeyedSetOfErrors.php
+++ b/src/Toolkit/Result/KeyedSetOfErrors.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Result/ListOfErrors.php b/src/Toolkit/Result/ListOfErrors.php
index cc0b4c6..5a3e066 100644
--- a/src/Toolkit/Result/ListOfErrors.php
+++ b/src/Toolkit/Result/ListOfErrors.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Result/ListOfErrorsInterface.php b/src/Toolkit/Result/ListOfErrorsInterface.php
index ad46574..26d5fe0 100644
--- a/src/Toolkit/Result/ListOfErrorsInterface.php
+++ b/src/Toolkit/Result/ListOfErrorsInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Result/Meta.php b/src/Toolkit/Result/Meta.php
index 5e05515..beee3fe 100644
--- a/src/Toolkit/Result/Meta.php
+++ b/src/Toolkit/Result/Meta.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Result/Result.php b/src/Toolkit/Result/Result.php
index 7c4e535..4ffe101 100644
--- a/src/Toolkit/Result/Result.php
+++ b/src/Toolkit/Result/Result.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/src/Toolkit/Result/ResultInterface.php b/src/Toolkit/Result/ResultInterface.php
index c5e3431..2e5f409 100644
--- a/src/Toolkit/Result/ResultInterface.php
+++ b/src/Toolkit/Result/ResultInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/CommandDispatcherTest.php b/tests/Unit/Bus/CommandDispatcherTest.php
index c182577..0b4a4b7 100644
--- a/tests/Unit/Bus/CommandDispatcherTest.php
+++ b/tests/Unit/Bus/CommandDispatcherTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/CommandHandlerContainerTest.php b/tests/Unit/Bus/CommandHandlerContainerTest.php
index 56a4623..62e25f2 100644
--- a/tests/Unit/Bus/CommandHandlerContainerTest.php
+++ b/tests/Unit/Bus/CommandHandlerContainerTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/CommandHandlerTest.php b/tests/Unit/Bus/CommandHandlerTest.php
index cd128c7..686c7ce 100644
--- a/tests/Unit/Bus/CommandHandlerTest.php
+++ b/tests/Unit/Bus/CommandHandlerTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/Middleware/ExecuteInUnitOfWorkTest.php b/tests/Unit/Bus/Middleware/ExecuteInUnitOfWorkTest.php
index 7bfbc0d..149395d 100644
--- a/tests/Unit/Bus/Middleware/ExecuteInUnitOfWorkTest.php
+++ b/tests/Unit/Bus/Middleware/ExecuteInUnitOfWorkTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
@@ -22,18 +14,24 @@
 use CloudCreativity\Modules\Bus\Middleware\ExecuteInUnitOfWork;
 use CloudCreativity\Modules\Infrastructure\Persistence\UnitOfWorkManagerInterface;
 use CloudCreativity\Modules\Toolkit\Messages\CommandInterface;
-use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
+use CloudCreativity\Modules\Toolkit\Result\Result;
 use PHPUnit\Framework\TestCase;
+use Throwable;
 
 class ExecuteInUnitOfWorkTest extends TestCase
 {
+    /**
+     * @var array<string>
+     */
+    private array $sequence = [];
+
     /**
      * @return void
      */
-    public function test(): void
+    public function testItCommitsUnitOfWorkOnSuccess(): void
     {
         $command = $this->createMock(CommandInterface::class);
-        $expected = $this->createMock(ResultInterface::class);
+        $expected = Result::ok();
 
         $middleware = new ExecuteInUnitOfWork(
             $transactions = $this->createMock(UnitOfWorkManagerInterface::class),
@@ -45,14 +43,93 @@ public function test(): void
             ->method('execute')
             ->willReturnCallback(function (\Closure $callback, int $attempts) {
                 $this->assertSame(2, $attempts);
-                return $callback();
+                $this->sequence[] = 'begin';
+                $result = $callback();
+                $this->sequence[] = 'commit';
+                return $result;
             });
 
         $actual = $middleware($command, function ($cmd) use ($command, $expected) {
             $this->assertSame($command, $cmd);
+            $this->sequence[] = 'handler';
             return $expected;
         });
 
+        $this->assertSame(['begin', 'handler', 'commit'], $this->sequence);
+        $this->assertSame($expected, $actual);
+    }
+
+    /**
+     * @return void
+     */
+    public function testItDoesNotCommitUnitOfWorkOnFailure(): void
+    {
+        $command = $this->createMock(CommandInterface::class);
+        $expected = Result::failed('Something went wrong.');
+
+        $middleware = new ExecuteInUnitOfWork(
+            $transactions = $this->createMock(UnitOfWorkManagerInterface::class),
+            2,
+        );
+
+        $transactions
+            ->expects($this->once())
+            ->method('execute')
+            ->willReturnCallback(function (\Closure $callback, int $attempts) {
+                $this->assertSame(2, $attempts);
+                $this->sequence[] = 'begin';
+                $result = $callback();
+                $this->sequence[] = 'commit';
+                return $result;
+            });
+
+        $actual = $middleware($command, function ($cmd) use ($command, $expected) {
+            $this->assertSame($command, $cmd);
+            $this->sequence[] = 'handler';
+            return $expected;
+        });
+
+        $this->assertSame(['begin', 'handler'], $this->sequence);
+        $this->assertSame($expected, $actual);
+    }
+
+    /**
+     * @return void
+     */
+    public function testItDoesNotCatchExceptions(): void
+    {
+        $command = $this->createMock(CommandInterface::class);
+        $expected = new \RuntimeException('Boom! Something went wrong.');
+
+        $middleware = new ExecuteInUnitOfWork(
+            $transactions = $this->createMock(UnitOfWorkManagerInterface::class),
+            2,
+        );
+
+        $transactions
+            ->expects($this->once())
+            ->method('execute')
+            ->willReturnCallback(function (\Closure $callback, int $attempts) {
+                $this->assertSame(2, $attempts);
+                $this->sequence[] = 'begin';
+                $result = $callback();
+                $this->sequence[] = 'commit';
+                return $result;
+            });
+
+        $actual = null;
+
+        try {
+            $middleware($command, function ($cmd) use ($command, $expected): never {
+                $this->assertSame($command, $cmd);
+                $this->sequence[] = 'handler';
+                throw $expected;
+            });
+        } catch (Throwable $ex) {
+            $actual = $ex;
+        }
+
+        $this->assertSame(['begin', 'handler'], $this->sequence);
         $this->assertSame($expected, $actual);
     }
 }
diff --git a/tests/Unit/Bus/Middleware/FlushDeferredEventsTest.php b/tests/Unit/Bus/Middleware/FlushDeferredEventsTest.php
index 55489fa..ca64a8b 100644
--- a/tests/Unit/Bus/Middleware/FlushDeferredEventsTest.php
+++ b/tests/Unit/Bus/Middleware/FlushDeferredEventsTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/Middleware/LogMessageDispatchTest.php b/tests/Unit/Bus/Middleware/LogMessageDispatchTest.php
index 1ff2282..824c551 100644
--- a/tests/Unit/Bus/Middleware/LogMessageDispatchTest.php
+++ b/tests/Unit/Bus/Middleware/LogMessageDispatchTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/Middleware/SetupBeforeDispatchTest.php b/tests/Unit/Bus/Middleware/SetupBeforeDispatchTest.php
index 8e25e23..baf2b12 100644
--- a/tests/Unit/Bus/Middleware/SetupBeforeDispatchTest.php
+++ b/tests/Unit/Bus/Middleware/SetupBeforeDispatchTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/Middleware/TearDownAfterDispatchTest.php b/tests/Unit/Bus/Middleware/TearDownAfterDispatchTest.php
index 3213b45..4ff4854 100644
--- a/tests/Unit/Bus/Middleware/TearDownAfterDispatchTest.php
+++ b/tests/Unit/Bus/Middleware/TearDownAfterDispatchTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/Middleware/ValidateCommandTest.php b/tests/Unit/Bus/Middleware/ValidateCommandTest.php
index 46331b2..239912b 100644
--- a/tests/Unit/Bus/Middleware/ValidateCommandTest.php
+++ b/tests/Unit/Bus/Middleware/ValidateCommandTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/Middleware/ValidateQueryTest.php b/tests/Unit/Bus/Middleware/ValidateQueryTest.php
index 2bbaa4e..3fc6763 100644
--- a/tests/Unit/Bus/Middleware/ValidateQueryTest.php
+++ b/tests/Unit/Bus/Middleware/ValidateQueryTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/QueryDispatcherTest.php b/tests/Unit/Bus/QueryDispatcherTest.php
index 620e0a4..6618c4f 100644
--- a/tests/Unit/Bus/QueryDispatcherTest.php
+++ b/tests/Unit/Bus/QueryDispatcherTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/QueryHandlerContainerTest.php b/tests/Unit/Bus/QueryHandlerContainerTest.php
index 904e586..bb2b031 100644
--- a/tests/Unit/Bus/QueryHandlerContainerTest.php
+++ b/tests/Unit/Bus/QueryHandlerContainerTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/QueryHandlerTest.php b/tests/Unit/Bus/QueryHandlerTest.php
index 21266e1..ccc0d94 100644
--- a/tests/Unit/Bus/QueryHandlerTest.php
+++ b/tests/Unit/Bus/QueryHandlerTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/TestCommand.php b/tests/Unit/Bus/TestCommand.php
index 1bbdf5c..2a4713c 100644
--- a/tests/Unit/Bus/TestCommand.php
+++ b/tests/Unit/Bus/TestCommand.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/TestCommandHandler.php b/tests/Unit/Bus/TestCommandHandler.php
index fea7bb0..f1e1117 100644
--- a/tests/Unit/Bus/TestCommandHandler.php
+++ b/tests/Unit/Bus/TestCommandHandler.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/TestCommandHandlerInterface.php b/tests/Unit/Bus/TestCommandHandlerInterface.php
index d225dfc..4a5f7e2 100644
--- a/tests/Unit/Bus/TestCommandHandlerInterface.php
+++ b/tests/Unit/Bus/TestCommandHandlerInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/TestQuery.php b/tests/Unit/Bus/TestQuery.php
index c652b9f..92fc4ab 100644
--- a/tests/Unit/Bus/TestQuery.php
+++ b/tests/Unit/Bus/TestQuery.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/TestQueryHandler.php b/tests/Unit/Bus/TestQueryHandler.php
index 167cd4b..d1c5a3e 100644
--- a/tests/Unit/Bus/TestQueryHandler.php
+++ b/tests/Unit/Bus/TestQueryHandler.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/TestQueryHandlerInterface.php b/tests/Unit/Bus/TestQueryHandlerInterface.php
index 07c4e79..9f75541 100644
--- a/tests/Unit/Bus/TestQueryHandlerInterface.php
+++ b/tests/Unit/Bus/TestQueryHandlerInterface.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/Validation/CommandValidatorTest.php b/tests/Unit/Bus/Validation/CommandValidatorTest.php
index 8b64a32..b6fff52 100644
--- a/tests/Unit/Bus/Validation/CommandValidatorTest.php
+++ b/tests/Unit/Bus/Validation/CommandValidatorTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Bus/Validation/QueryValidatorTest.php b/tests/Unit/Bus/Validation/QueryValidatorTest.php
index 3f91f2e..029e550 100644
--- a/tests/Unit/Bus/Validation/QueryValidatorTest.php
+++ b/tests/Unit/Bus/Validation/QueryValidatorTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Domain/EntityTest.php b/tests/Unit/Domain/EntityTest.php
index 38efb45..8227fc8 100644
--- a/tests/Unit/Domain/EntityTest.php
+++ b/tests/Unit/Domain/EntityTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Domain/EntityWithNullableGuidTest.php b/tests/Unit/Domain/EntityWithNullableGuidTest.php
index 40cabf3..0743ecb 100644
--- a/tests/Unit/Domain/EntityWithNullableGuidTest.php
+++ b/tests/Unit/Domain/EntityWithNullableGuidTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Domain/IdentifierOrEntityTest.php b/tests/Unit/Domain/IdentifierOrEntityTest.php
index 9fa4965..8cc04b5 100644
--- a/tests/Unit/Domain/IdentifierOrEntityTest.php
+++ b/tests/Unit/Domain/IdentifierOrEntityTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Domain/TestEntity.php b/tests/Unit/Domain/TestEntity.php
index fdfbbb1..b8db677 100644
--- a/tests/Unit/Domain/TestEntity.php
+++ b/tests/Unit/Domain/TestEntity.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Domain/TestEntityWithNullableId.php b/tests/Unit/Domain/TestEntityWithNullableId.php
index 85de079..f3479bb 100644
--- a/tests/Unit/Domain/TestEntityWithNullableId.php
+++ b/tests/Unit/Domain/TestEntityWithNullableId.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/EventBus/EventBusTest.php b/tests/Unit/EventBus/EventBusTest.php
index 72808c6..f516190 100644
--- a/tests/Unit/EventBus/EventBusTest.php
+++ b/tests/Unit/EventBus/EventBusTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/EventBus/Inbound/NotifierTest.php b/tests/Unit/EventBus/Inbound/NotifierTest.php
index d7ebd94..4e53fb8 100644
--- a/tests/Unit/EventBus/Inbound/NotifierTest.php
+++ b/tests/Unit/EventBus/Inbound/NotifierTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/EventBus/IntegrationEventHandlerContainerTest.php b/tests/Unit/EventBus/IntegrationEventHandlerContainerTest.php
index b624847..b2a0e45 100644
--- a/tests/Unit/EventBus/IntegrationEventHandlerContainerTest.php
+++ b/tests/Unit/EventBus/IntegrationEventHandlerContainerTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/EventBus/IntegrationEventHandlerTest.php b/tests/Unit/EventBus/IntegrationEventHandlerTest.php
index 82ab750..dcb2c58 100644
--- a/tests/Unit/EventBus/IntegrationEventHandlerTest.php
+++ b/tests/Unit/EventBus/IntegrationEventHandlerTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/EventBus/Middleware/LogInboundIntegrationEventTest.php b/tests/Unit/EventBus/Middleware/LogInboundIntegrationEventTest.php
index eaf7273..b7b2857 100644
--- a/tests/Unit/EventBus/Middleware/LogInboundIntegrationEventTest.php
+++ b/tests/Unit/EventBus/Middleware/LogInboundIntegrationEventTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/EventBus/Middleware/LogOutboundIntegrationEventTest.php b/tests/Unit/EventBus/Middleware/LogOutboundIntegrationEventTest.php
index 40d8ce9..55b5ebd 100644
--- a/tests/Unit/EventBus/Middleware/LogOutboundIntegrationEventTest.php
+++ b/tests/Unit/EventBus/Middleware/LogOutboundIntegrationEventTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/EventBus/Outbound/PublisherTest.php b/tests/Unit/EventBus/Outbound/PublisherTest.php
index 2df0e29..7e151ce 100644
--- a/tests/Unit/EventBus/Outbound/PublisherTest.php
+++ b/tests/Unit/EventBus/Outbound/PublisherTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/EventBus/TestIntegrationEvent.php b/tests/Unit/EventBus/TestIntegrationEvent.php
index 2d0f8f2..5fd93e2 100644
--- a/tests/Unit/EventBus/TestIntegrationEvent.php
+++ b/tests/Unit/EventBus/TestIntegrationEvent.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/EventBus/TestIntegrationEventHandler.php b/tests/Unit/EventBus/TestIntegrationEventHandler.php
index 38b85f6..148dc49 100644
--- a/tests/Unit/EventBus/TestIntegrationEventHandler.php
+++ b/tests/Unit/EventBus/TestIntegrationEventHandler.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/DomainEventDispatching/DeferredDispatcherTest.php b/tests/Unit/Infrastructure/DomainEventDispatching/DeferredDispatcherTest.php
index e0faeb7..9b65c2f 100644
--- a/tests/Unit/Infrastructure/DomainEventDispatching/DeferredDispatcherTest.php
+++ b/tests/Unit/Infrastructure/DomainEventDispatching/DeferredDispatcherTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/DomainEventDispatching/DispatcherTest.php b/tests/Unit/Infrastructure/DomainEventDispatching/DispatcherTest.php
index 9a8c016..f6a1692 100644
--- a/tests/Unit/Infrastructure/DomainEventDispatching/DispatcherTest.php
+++ b/tests/Unit/Infrastructure/DomainEventDispatching/DispatcherTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/DomainEventDispatching/ListenerContainerTest.php b/tests/Unit/Infrastructure/DomainEventDispatching/ListenerContainerTest.php
index 7f3bd3b..f6a05b1 100644
--- a/tests/Unit/Infrastructure/DomainEventDispatching/ListenerContainerTest.php
+++ b/tests/Unit/Infrastructure/DomainEventDispatching/ListenerContainerTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/DomainEventDispatching/Middleware/LogDomainEventDispatchTest.php b/tests/Unit/Infrastructure/DomainEventDispatching/Middleware/LogDomainEventDispatchTest.php
index 102a1d8..3fb76c6 100644
--- a/tests/Unit/Infrastructure/DomainEventDispatching/Middleware/LogDomainEventDispatchTest.php
+++ b/tests/Unit/Infrastructure/DomainEventDispatching/Middleware/LogDomainEventDispatchTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/DomainEventDispatching/TestDomainEvent.php b/tests/Unit/Infrastructure/DomainEventDispatching/TestDomainEvent.php
index a04a81e..bc31b3b 100644
--- a/tests/Unit/Infrastructure/DomainEventDispatching/TestDomainEvent.php
+++ b/tests/Unit/Infrastructure/DomainEventDispatching/TestDomainEvent.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/DomainEventDispatching/TestImmediateDomainEvent.php b/tests/Unit/Infrastructure/DomainEventDispatching/TestImmediateDomainEvent.php
index 9e22dbd..60d01af 100644
--- a/tests/Unit/Infrastructure/DomainEventDispatching/TestImmediateDomainEvent.php
+++ b/tests/Unit/Infrastructure/DomainEventDispatching/TestImmediateDomainEvent.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/DomainEventDispatching/TestListener.php b/tests/Unit/Infrastructure/DomainEventDispatching/TestListener.php
index c46ebdb..6f12fe0 100644
--- a/tests/Unit/Infrastructure/DomainEventDispatching/TestListener.php
+++ b/tests/Unit/Infrastructure/DomainEventDispatching/TestListener.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/DomainEventDispatching/TestListenerAfterCommit.php b/tests/Unit/Infrastructure/DomainEventDispatching/TestListenerAfterCommit.php
index 2a9ec7a..3c6f5fd 100644
--- a/tests/Unit/Infrastructure/DomainEventDispatching/TestListenerAfterCommit.php
+++ b/tests/Unit/Infrastructure/DomainEventDispatching/TestListenerAfterCommit.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/DomainEventDispatching/TestListenerBeforeCommit.php b/tests/Unit/Infrastructure/DomainEventDispatching/TestListenerBeforeCommit.php
index 3dc445c..eb2ce7b 100644
--- a/tests/Unit/Infrastructure/DomainEventDispatching/TestListenerBeforeCommit.php
+++ b/tests/Unit/Infrastructure/DomainEventDispatching/TestListenerBeforeCommit.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/DomainEventDispatching/UnitOfWorkAwareDispatcherTest.php b/tests/Unit/Infrastructure/DomainEventDispatching/UnitOfWorkAwareDispatcherTest.php
index 06cebd3..61f3917 100644
--- a/tests/Unit/Infrastructure/DomainEventDispatching/UnitOfWorkAwareDispatcherTest.php
+++ b/tests/Unit/Infrastructure/DomainEventDispatching/UnitOfWorkAwareDispatcherTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
@@ -175,12 +167,12 @@ public function testItDoesNotDispatchImmediately(): void
             ->method('handle');
 
         $this->unitOfWorkManager
-            ->expects($this->never())
-            ->method('beforeCommit');
+            ->expects($this->once())
+            ->method('beforeCommit');  // we'll prove this works in the subsequent test
 
         $this->unitOfWorkManager
-            ->expects($this->exactly(1))
-            ->method('afterCommit'); // we'll prove this works in the subsequent test
+            ->expects($this->never())
+            ->method('afterCommit');
 
         $this->dispatcher->listen($event::class, [
             'Listener1',
@@ -194,7 +186,7 @@ public function testItDoesNotDispatchImmediately(): void
      * @return void
      * @depends testItDoesNotDispatchImmediately
      */
-    public function testItDispatchesEventInAfterCommitCallback(): void
+    public function testItDispatchesEventInBeforeCommitCallback(): void
     {
         $event = new TestDomainEvent();
 
@@ -221,8 +213,8 @@ public function testItDispatchesEventInAfterCommitCallback(): void
             ->with($this->identicalTo($event));
 
         $this->unitOfWorkManager
-            ->expects($this->exactly(1))
-            ->method('afterCommit')
+            ->expects($this->once())
+            ->method('beforeCommit')
             ->with($this->callback(function (Closure $callback): bool {
                 $callback();
                 return true;
diff --git a/tests/Unit/Infrastructure/InfrastructureTest.php b/tests/Unit/Infrastructure/InfrastructureTest.php
index 4d0cbd9..81b52be 100644
--- a/tests/Unit/Infrastructure/InfrastructureTest.php
+++ b/tests/Unit/Infrastructure/InfrastructureTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/Log/ObjectContextTest.php b/tests/Unit/Infrastructure/Log/ObjectContextTest.php
index 6fdc502..f71c5c0 100644
--- a/tests/Unit/Infrastructure/Log/ObjectContextTest.php
+++ b/tests/Unit/Infrastructure/Log/ObjectContextTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/Log/ResultContextTest.php b/tests/Unit/Infrastructure/Log/ResultContextTest.php
index a171fcc..a7ec78b 100644
--- a/tests/Unit/Infrastructure/Log/ResultContextTest.php
+++ b/tests/Unit/Infrastructure/Log/ResultContextTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/Log/TestEnum.php b/tests/Unit/Infrastructure/Log/TestEnum.php
index 6f6cd78..9e8edcc 100644
--- a/tests/Unit/Infrastructure/Log/TestEnum.php
+++ b/tests/Unit/Infrastructure/Log/TestEnum.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/Persistence/UnitOfWorkManagerTest.php b/tests/Unit/Infrastructure/Persistence/UnitOfWorkManagerTest.php
index 060e483..9c9d089 100644
--- a/tests/Unit/Infrastructure/Persistence/UnitOfWorkManagerTest.php
+++ b/tests/Unit/Infrastructure/Persistence/UnitOfWorkManagerTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/Queue/Middleware/LogPushedToQueueTest.php b/tests/Unit/Infrastructure/Queue/Middleware/LogPushedToQueueTest.php
index 27bbab8..bb8ceff 100644
--- a/tests/Unit/Infrastructure/Queue/Middleware/LogPushedToQueueTest.php
+++ b/tests/Unit/Infrastructure/Queue/Middleware/LogPushedToQueueTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
@@ -76,8 +68,8 @@ public function test(): void
         $context = ['foo' => 'baz', 'bar' => 'bat'];
 
         $this->assertSame([
-            [LogLevel::DEBUG, "Queuing message {$messageName}.", $context],
-            [LogLevel::INFO, "Queued message {$messageName}.", $context],
+            [LogLevel::DEBUG, "Queuing job {$messageName}.", $context],
+            [LogLevel::INFO, "Queued job {$messageName}.", $context],
         ], $logs);
     }
 
@@ -105,8 +97,8 @@ public function testWithCustomLevels(): void
         $context = ['foo' => 'baz', 'bar' => 'bat'];
 
         $this->assertSame([
-            [LogLevel::NOTICE, "Queuing message {$messageName}.", $context],
-            [LogLevel::WARNING, "Queued message {$messageName}.", $context],
+            [LogLevel::NOTICE, "Queuing job {$messageName}.", $context],
+            [LogLevel::WARNING, "Queued job {$messageName}.", $context],
         ], $logs);
     }
 
@@ -122,7 +114,7 @@ public function testItLogsAfterTheNextClosureIsInvoked(): void
         $this->logger
             ->expects($this->once())
             ->method('log')
-            ->with(LogLevel::DEBUG, "Queuing message {$messageName}.", $context);
+            ->with(LogLevel::DEBUG, "Queuing job {$messageName}.", $context);
 
         $middleware = new LogPushedToQueue($this->logger);
 
diff --git a/tests/Unit/Infrastructure/Queue/QueueHandlerContainerTest.php b/tests/Unit/Infrastructure/Queue/QueueHandlerContainerTest.php
index 89ec06a..ad7d9b9 100644
--- a/tests/Unit/Infrastructure/Queue/QueueHandlerContainerTest.php
+++ b/tests/Unit/Infrastructure/Queue/QueueHandlerContainerTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/Queue/QueueHandlerTest.php b/tests/Unit/Infrastructure/Queue/QueueHandlerTest.php
index 2134949..0c3f411 100644
--- a/tests/Unit/Infrastructure/Queue/QueueHandlerTest.php
+++ b/tests/Unit/Infrastructure/Queue/QueueHandlerTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/Queue/QueueTest.php b/tests/Unit/Infrastructure/Queue/QueueTest.php
index dfb1789..5674978 100644
--- a/tests/Unit/Infrastructure/Queue/QueueTest.php
+++ b/tests/Unit/Infrastructure/Queue/QueueTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/Queue/QueueableBatchTest.php b/tests/Unit/Infrastructure/Queue/QueueableBatchTest.php
index 83ab927..c5e554c 100644
--- a/tests/Unit/Infrastructure/Queue/QueueableBatchTest.php
+++ b/tests/Unit/Infrastructure/Queue/QueueableBatchTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/Queue/TestQueueHandler.php b/tests/Unit/Infrastructure/Queue/TestQueueHandler.php
index 7de1a08..d083c5b 100644
--- a/tests/Unit/Infrastructure/Queue/TestQueueHandler.php
+++ b/tests/Unit/Infrastructure/Queue/TestQueueHandler.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Infrastructure/Queue/TestQueueable.php b/tests/Unit/Infrastructure/Queue/TestQueueable.php
index e4b5512..9a7c62f 100644
--- a/tests/Unit/Infrastructure/Queue/TestQueueable.php
+++ b/tests/Unit/Infrastructure/Queue/TestQueueable.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/ContractsTest.php b/tests/Unit/Toolkit/ContractsTest.php
index 11978c0..e42ff69 100644
--- a/tests/Unit/Toolkit/ContractsTest.php
+++ b/tests/Unit/Toolkit/ContractsTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Identifiers/GuidTest.php b/tests/Unit/Toolkit/Identifiers/GuidTest.php
index 48f5348..0c0e878 100644
--- a/tests/Unit/Toolkit/Identifiers/GuidTest.php
+++ b/tests/Unit/Toolkit/Identifiers/GuidTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Identifiers/GuidTypeMapTest.php b/tests/Unit/Toolkit/Identifiers/GuidTypeMapTest.php
index 8c36b66..e89ab53 100644
--- a/tests/Unit/Toolkit/Identifiers/GuidTypeMapTest.php
+++ b/tests/Unit/Toolkit/Identifiers/GuidTypeMapTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Identifiers/IntegerIdTest.php b/tests/Unit/Toolkit/Identifiers/IntegerIdTest.php
index c120601..e6d73f3 100644
--- a/tests/Unit/Toolkit/Identifiers/IntegerIdTest.php
+++ b/tests/Unit/Toolkit/Identifiers/IntegerIdTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Identifiers/LazyListOfGuidsTest.php b/tests/Unit/Toolkit/Identifiers/LazyListOfGuidsTest.php
index e35cf9d..a218d6a 100644
--- a/tests/Unit/Toolkit/Identifiers/LazyListOfGuidsTest.php
+++ b/tests/Unit/Toolkit/Identifiers/LazyListOfGuidsTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Identifiers/LazyListOfIdentifiersTest.php b/tests/Unit/Toolkit/Identifiers/LazyListOfIdentifiersTest.php
index ef5cd4c..3a0774c 100644
--- a/tests/Unit/Toolkit/Identifiers/LazyListOfIdentifiersTest.php
+++ b/tests/Unit/Toolkit/Identifiers/LazyListOfIdentifiersTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Identifiers/ListOfIdentifiersTest.php b/tests/Unit/Toolkit/Identifiers/ListOfIdentifiersTest.php
index 7e7e96d..25b7219 100644
--- a/tests/Unit/Toolkit/Identifiers/ListOfIdentifiersTest.php
+++ b/tests/Unit/Toolkit/Identifiers/ListOfIdentifiersTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Identifiers/PossiblyNumericIdTest.php b/tests/Unit/Toolkit/Identifiers/PossiblyNumericIdTest.php
index 90e061d..b9d06d3 100644
--- a/tests/Unit/Toolkit/Identifiers/PossiblyNumericIdTest.php
+++ b/tests/Unit/Toolkit/Identifiers/PossiblyNumericIdTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Identifiers/StringIdTest.php b/tests/Unit/Toolkit/Identifiers/StringIdTest.php
index 631c0e6..2fa482f 100644
--- a/tests/Unit/Toolkit/Identifiers/StringIdTest.php
+++ b/tests/Unit/Toolkit/Identifiers/StringIdTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Identifiers/UuidFactoryTest.php b/tests/Unit/Toolkit/Identifiers/UuidFactoryTest.php
index 205ae52..0181cbd 100644
--- a/tests/Unit/Toolkit/Identifiers/UuidFactoryTest.php
+++ b/tests/Unit/Toolkit/Identifiers/UuidFactoryTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Identifiers/UuidTest.php b/tests/Unit/Toolkit/Identifiers/UuidTest.php
index 29e0f77..bb2e1cf 100644
--- a/tests/Unit/Toolkit/Identifiers/UuidTest.php
+++ b/tests/Unit/Toolkit/Identifiers/UuidTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Iterables/LazyListTraitTest.php b/tests/Unit/Toolkit/Iterables/LazyListTraitTest.php
index ff7b6c8..48c48a5 100644
--- a/tests/Unit/Toolkit/Iterables/LazyListTraitTest.php
+++ b/tests/Unit/Toolkit/Iterables/LazyListTraitTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/ModuleBasenameTest.php b/tests/Unit/Toolkit/ModuleBasenameTest.php
index cd2cbb5..fcd7933 100644
--- a/tests/Unit/Toolkit/ModuleBasenameTest.php
+++ b/tests/Unit/Toolkit/ModuleBasenameTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Pipeline/AccumulationProcessorTest.php b/tests/Unit/Toolkit/Pipeline/AccumulationProcessorTest.php
index ac7afff..d66f09d 100644
--- a/tests/Unit/Toolkit/Pipeline/AccumulationProcessorTest.php
+++ b/tests/Unit/Toolkit/Pipeline/AccumulationProcessorTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Pipeline/InterruptibleProcessorTest.php b/tests/Unit/Toolkit/Pipeline/InterruptibleProcessorTest.php
index f4bc757..0921db5 100644
--- a/tests/Unit/Toolkit/Pipeline/InterruptibleProcessorTest.php
+++ b/tests/Unit/Toolkit/Pipeline/InterruptibleProcessorTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Pipeline/LazyPipeTest.php b/tests/Unit/Toolkit/Pipeline/LazyPipeTest.php
index f084b11..855c2d4 100644
--- a/tests/Unit/Toolkit/Pipeline/LazyPipeTest.php
+++ b/tests/Unit/Toolkit/Pipeline/LazyPipeTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Pipeline/MiddlewareProcessorTest.php b/tests/Unit/Toolkit/Pipeline/MiddlewareProcessorTest.php
index 960c843..089a27d 100644
--- a/tests/Unit/Toolkit/Pipeline/MiddlewareProcessorTest.php
+++ b/tests/Unit/Toolkit/Pipeline/MiddlewareProcessorTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Pipeline/PipeContainerTest.php b/tests/Unit/Toolkit/Pipeline/PipeContainerTest.php
index 4a911e1..17e8f34 100644
--- a/tests/Unit/Toolkit/Pipeline/PipeContainerTest.php
+++ b/tests/Unit/Toolkit/Pipeline/PipeContainerTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Pipeline/PipelineBuilderTest.php b/tests/Unit/Toolkit/Pipeline/PipelineBuilderTest.php
index 3c90b11..033a989 100644
--- a/tests/Unit/Toolkit/Pipeline/PipelineBuilderTest.php
+++ b/tests/Unit/Toolkit/Pipeline/PipelineBuilderTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Pipeline/PipelineTest.php b/tests/Unit/Toolkit/Pipeline/PipelineTest.php
index 10384f1..5863cb5 100644
--- a/tests/Unit/Toolkit/Pipeline/PipelineTest.php
+++ b/tests/Unit/Toolkit/Pipeline/PipelineTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Pipeline/SimpleProcessorTest.php b/tests/Unit/Toolkit/Pipeline/SimpleProcessorTest.php
index 3a49a57..b82d2a3 100644
--- a/tests/Unit/Toolkit/Pipeline/SimpleProcessorTest.php
+++ b/tests/Unit/Toolkit/Pipeline/SimpleProcessorTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Result/ErrorTest.php b/tests/Unit/Toolkit/Result/ErrorTest.php
index 540f744..d586491 100644
--- a/tests/Unit/Toolkit/Result/ErrorTest.php
+++ b/tests/Unit/Toolkit/Result/ErrorTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Result/KeyedSetOfErrorsTest.php b/tests/Unit/Toolkit/Result/KeyedSetOfErrorsTest.php
index d6a3c82..57e1e55 100644
--- a/tests/Unit/Toolkit/Result/KeyedSetOfErrorsTest.php
+++ b/tests/Unit/Toolkit/Result/KeyedSetOfErrorsTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Result/ListOfErrorsTest.php b/tests/Unit/Toolkit/Result/ListOfErrorsTest.php
index e2f1182..718f3f6 100644
--- a/tests/Unit/Toolkit/Result/ListOfErrorsTest.php
+++ b/tests/Unit/Toolkit/Result/ListOfErrorsTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Result/MetaTest.php b/tests/Unit/Toolkit/Result/MetaTest.php
index 3f0a76f..6fab5a4 100644
--- a/tests/Unit/Toolkit/Result/MetaTest.php
+++ b/tests/Unit/Toolkit/Result/MetaTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);
diff --git a/tests/Unit/Toolkit/Result/ResultTest.php b/tests/Unit/Toolkit/Result/ResultTest.php
index d86b768..6867f4c 100644
--- a/tests/Unit/Toolkit/Result/ResultTest.php
+++ b/tests/Unit/Toolkit/Result/ResultTest.php
@@ -2,17 +2,9 @@
 /*
  * Copyright 2024 Cloud Creativity Limited
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 declare(strict_types=1);