diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..f7e2a69
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.neon]
+indent_style = tab
+
+[phars.xml]
+indent_size = 2
+
+[*.js]
+indent_size = 2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2378dde
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,32 @@
+/composer.lock
+*.diff
+*.err
+*.log
+*.orig
+*.rej
+*.swo
+*.swp
+*.vi
+*~
+.idea/*
+nbproject/*
+.vscode
+.DS_Store
+.cache
+.phpunit.cache
+.project
+.settings
+.svn
+errors.err
+tags
+node_modules
+package-lock.json
+/.phpunit.result.cache
+/nbproject/
+/tools
+/vendor
+/phpunit.xml
+/webroot/css/style.css.map
+/webroot/mix.js.map
+/webroot/mix-manifest.json
+.ddev/*
\ No newline at end of file
diff --git a/Console/Command/Task/NewRelicTask.php b/Console/Command/Task/NewRelicTask.php
deleted file mode 100644
index 386f143..0000000
--- a/Console/Command/Task/NewRelicTask.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-App::uses('AppShell', 'Console/Command');
-App::uses('NewRelicTrait', 'NewRelic.Trait');
-
-class NewRelicTask extends AppShell {
-
-	use NewRelicTrait;
-
-}
diff --git a/Controller/Component/NewRelicComponent.php b/Controller/Component/NewRelicComponent.php
deleted file mode 100644
index 46644f8..0000000
--- a/Controller/Component/NewRelicComponent.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-App::uses('NewRelic', 'NewRelic.Lib');
-App::uses('NewRelicTrait', 'NewRelic.Trait');
-
-/**
- * New Relic Component
- *
- * @author Christian Winther
- */
-class NewRelicComponent extends Component {
-
-	use NewRelicTrait;
-
-/**
- * Called before the Controller::beforeFilter().
- *
- * Start NewRelic and configure transaction name
- *
- * @param Controller $controller
- * @return void
- */
-	public function initialize(Controller $controller) {
-		$this->setName($controller->request);
-		$this->start();
-
-		if ($controller->Auth) {
-			$this->user($controller->Auth->user('id'), $controller->Auth->user('email'), '');
-		}
-
-		$this->captureParams(true);
-
-		$this->addTracer('CakeRoute::match');
-		$this->addTracer('CrudComponent::executeAction');
-		$this->addTracer('Controller::render');
-		$this->addTracer('View::render');
-		$this->addTracer('View::element');
-		$this->addTracer('View::renderLayout');
-		$this->addTracer('DboSource::_execute');
-		$this->addTracer('AttemptChecker::attempt');
-	}
-
-}
diff --git a/Lib/NewRelic.php b/Lib/NewRelic.php
deleted file mode 100644
index 1e11401..0000000
--- a/Lib/NewRelic.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-
-/**
- * Class to help work with NewRelic in PHP
- *
- * @author Christian Winther
- * @see https://docs.newrelic.com/docs/php/the-php-api
- */
-class NewRelic {
-
-/**
- * Static instance of NewRelic
- *
- * @var NewRelic
- */
-	protected static $_instance;
-
-/**
- * Get the singleton instance of NewRelic
- *
- * @return NewRelic
- */
-	public static function getInstance() {
-		if (static::$_instance === null) {
-			static::$_instance = new NewRelic();
-		}
-
-		return static::$_instance;
-	}
-
-/**
- * Change the application name
- *
- * @param  string $name
- * @return void
- */
-	public function applicationName($name) {
-		if (!$this->hasNewRelic()) {
-			return;
-		}
-
-		newrelic_set_appname($name);
-	}
-
-/**
- * Start a New Relic transaction
- *
- * @param  string $name
- * @return void
- */
-	public function start($name = null) {
-		if (!$this->hasNewRelic()) {
-			return;
-		}
-
-		newrelic_start_transaction(NEW_RELIC_APP_NAME);
-		newrelic_name_transaction($name);
-	}
-
-/**
- * End a New Relic transaction
- *
- * @param  boolean $ignore Should the statistics NewRelic gathered be discarded?
- * @return void
- */
-	public function stop($ignore = false) {
-		if (!$this->hasNewRelic()) {
-			return;
-		}
-
-		newrelic_end_transaction($ignore);
-	}
-
-/**
- * Ignore the current transaction
- *
- * @return
- */
-	public function ignoreTransaction() {
-		if (!$this->hasNewRelic()) {
-			return;
-		}
-
-		newrelic_ignore_transaction();
-	}
-
-/**
- * Ignore the current apdex
- *
- * @return
- */
-	public function ignoreApdex() {
-		if (!$this->hasNewRelic()) {
-			return;
-		}
-
-		newrelic_ignore_apdex();
-	}
-
-/**
- * Should NewRelic capture params ?
- *
- * @param  boolean $boolean
- * @return void
- */
-	public function captureParams($boolean) {
-		if (!$this->hasNewRelic()) {
-			return;
-		}
-
-		newrelic_capture_params($boolean);
-	}
-
-/**
- * Add custom tracer method
- *
- * @param string $method
- */
-	public function addTracer($method) {
-		if (!$this->hasNewRelic()) {
-			return;
-		}
-
-		newrelic_add_custom_tracer($method);
-	}
-
-/**
- * Add a custom parameter to the New Relic transaction
- *
- * @param string $key
- * @param mixed $value
- */
-	public function parameter($key, $value) {
-		if (!$this->hasNewRelic()) {
-			return false;
-		}
-
-		if (!is_scalar($value)) {
-			$value = json_encode($value);
-		}
-
-		newrelic_add_custom_parameter($key, $value);
-	}
-
-/**
- * Track a custom metric
- *
- * @param  string $key
- * @param  integer|float $value
- * @return
- */
-	public function metric($key, $value) {
-		if (!$this->hasNewRelic()) {
-			return;
-		}
-
-		if (!is_numeric($value)) {
-			throw new CakeException('Value must be numeric');
-		}
-
-		newrelic_custom_metric($key, $value);
-	}
-
-/**
- * Add a custom method to have traced by NewRelic
- *
- * @param  string $method
- * @return void
- */
-	public function tracer($method) {
-		if (!$this->hasNewRelic()) {
-			return;
-		}
-
-		newrelic_add_custom_tracer($method);
-	}
-
-/**
- * Send an exception to New Relic
- *
- * @param  Exception $e
- * @return void
- */
-	public function sendException(Exception $e) {
-		if (!$this->hasNewRelic()) {
-			return;
-		}
-
-		newrelic_notice_error(null, $e);
-	}
-
-/**
- * Set user attributes
- *
- * @param  string $user
- * @param  string $account
- * @param  string $product
- * @return void
- */
-	public function user($user, $account, $product) {
-		if (!$this->hasNewRelic()) {
-			return;
-		}
-
-		newrelic_set_user_attributes($user, $account, $product);
-	}
-
-/**
- * Check if the NewRelic PHP extension is loaded
- *
- * @return boolean
- */
-	public function hasNewRelic() {
-		return extension_loaded('newrelic');
-	}
-
-}
diff --git a/README.md b/README.md
index e498b4d..6fc3f99 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # CakePHP <3 NewRelic
 
-You can modify your files like this
+You can modify your files like this to have full NewRelic support.
 
 ## Things included
 
@@ -9,9 +9,21 @@ You can modify your files like this
 - NewRelicTrait trait
 - NewRelic.NewRelic
 
-### Console
+## Requirements
+- [New Relic PHP agent](https://docs.newrelic.com/docs/agents/php-agent/getting-started/introduction-new-relic-php) installed as a PHP module
 
-Include this snippet in `app/Console/AppShell.php`
+## Installation
+
+Note: This branch is for CakePHP 5.x
+
+```
+composer require jippi/cakephp-newrelic:dev-cake4
+```
+
+
+### Shell
+
+Include this snippet in `src/Shell/AppShell.php`
 
 ```php
 	public function startup() {
@@ -29,12 +41,11 @@ Include this snippet in `app/Console/AppShell.php`
 
 Simply add `NewRelic.NewRelic` to your `$components` list
 
-## app/webroot/index.php
+## webroot/index.php
 
 Add this in top of your file before `define('DS', 'DIRECTORY_SEPARATOR')`
 
 ```php
-<?php
 require_once dirname(dirname(__DIR__)) . '/vendors/autoload.php';
 
 if (extension_loaded('newrelic')) {
@@ -55,10 +66,9 @@ if (extension_loaded('newrelic')) {
 // Rest of your index.php here
 ```
 
-## app/Console/cake.php
+## bin/cake.php
 
 ```php
-<?php
 require_once dirname(dirname(__DIR__)) . '/vendors/autoload.php';
 
 if (extension_loaded('newrelic')) {
diff --git a/Trait/NewRelicTrait.php b/Trait/NewRelicTrait.php
deleted file mode 100644
index 035318d..0000000
--- a/Trait/NewRelicTrait.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-
-App::uses('NewRelic', 'NewRelic.Lib');
-
-trait NewRelicTrait {
-
-/**
- * The transaction name to use
- *
- * @var string
- */
-	protected $_name;
-
-/**
- * Set the transaction name
- *
- * If `$name` is a Shell instance, the name will
- * automatically be derived based on best practices
- *
- * @param string|Shell $name
- */
-	public function setName($name) {
-		if ($name instanceof Shell) {
-			$name = $this->_deriveNameFromShell($name);
-		}
-
-		if ($name instanceof CakeRequest) {
-			$name = $this->_deriveNameFromRequest($name);
-		}
-
-		$this->_name = $name;
-	}
-
-/**
- * Get the name
- *
- * @return string
- */
-	public function getName() {
-		return $this->_name;
-	}
-
-/**
- * Change the application name
- *
- * @param  string $name
- * @return void
- */
-	public function applicationName($name) {
-		NewRelic::getInstance()->applicationName($name);
-	}
-
-/**
- * Start a NewRelic transaction
- *
- * @param  null|string $name
- * @return void
- */
-	public function start($name = null) {
-		NewRelic::getInstance()->start($this->_getTransactionName($name));
-	}
-
-/**
- * Stop a transaction
- *
- * @return void
- */
-	public function stop($ignore = false) {
-		NewRelic::getInstance()->stop($ignore);
-	}
-
-/**
- * Ignore current transaction
- *
- * @return void
- */
-	public function ignoreTransaction() {
-		NewRelic::getInstance()->ignoreTransaction();
-	}
-
-/**
- * Ignore current apdex
- *
- * @return void
- */
-	public function ignoreApdex() {
-		NewRelic::getInstance()->ignoreApdex();
-	}
-
-/**
- * Add custom parameter to transaction
- *
- * @param  string $key
- * @param  scalar $value
- * @return void
- */
-	public function parameter($key, $value) {
-		NewRelic::getInstance()->parameter($key, $value);
-	}
-
-/**
- * Add custom metric
- *
- * @param  string $key
- * @param  float $value
- * @return void
- */
-	public function metric($key, $value) {
-		NewRelic::getInstance()->metric($key, $value);
-	}
-
-/**
- * capture params
- *
- * @param  boolean $capture
- * @return void
- */
-	public function captureParams($capture) {
-		NewRelic::getInstance()->captureParams($capture);
-	}
-
-/**
- * Add custom tracer method
- *
- * @param string $method
- */
-	public function addTracer($method) {
-		NewRelic::getInstance()->addTracer($method);
-	}
-
-/**
- * Set user attributes
- *
- * @param  string $user
- * @param  string $account
- * @param  string $product
- * @return void
- */
-	public function user($user, $account, $product) {
-		NewRelic::getInstance()->user($user, $account, $product);
-	}
-
-/**
- * Send an exception to New Relic
- *
- * @param  Exception $e
- * @return void
- */
-	public function sendException(Exception $e) {
-		NewRelic::getInstance()->sendException($e);
-	}
-
-/**
- * Get transaction name
- *
- * @param  string $name
- * @return string
- */
-	protected function _getTransactionName($name) {
-		if (is_string($name)) {
-			return $name;
-		}
-
-		return $this->_name;
-	}
-
-/**
- * Derive the transaction name
- *
- * @param  Shell $name
- * @return string
- */
-	protected function _deriveNameFromShell(Shell $shell) {
-		$name = [];
-
-		if ($shell->plugin) {
-			$name[] = $shell->plugin;
-		}
-
-		$name[] = $shell->name;
-		$name[] = $shell->command;
-
-		return join('/', $name);
-	}
-
-	/**
- * Compute name based on request information
- *
- * @param  CakeRequest $request
- * @return string
- */
-	protected function _deriveNameFromRequest(CakeRequest $request) {
-		$name = [];
-
-		if ($request->prefix) {
-			$name[] = $request->prefix;
-		}
-
-		if ($request->plugin) {
-			$name[] = $request->plugin;
-		}
-
-		$name[] = $request->controller;
-		$name[] = $request->action;
-
-		$name = join('/', $name);
-
-		if ($request->ext) {
-			$name .= '.' . $request->ext;
-		}
-
-		return $name;
-	}
-
-}
diff --git a/VERSION.txt b/VERSION.txt
new file mode 100644
index 0000000..2468aa9
--- /dev/null
+++ b/VERSION.txt
@@ -0,0 +1 @@
+3.0.0-dev
diff --git a/composer.json b/composer.json
index 7f3a210..49fa85a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,32 +1,56 @@
 {
-  "name":"jippi/cakephp-newrelic",
-  "version": "1.0.0",
-  "description":"CakePHP <3 NewRelic",
-  "type":"cakephp-plugin",
-  "keywords":[
+  "name": "jippi/cakephp-newrelic",
+  "version": "3.0.0",
+  "description": "CakePHP <3 NewRelic",
+  "type": "cakephp-plugin",
+  "keywords": [
     "cakephp",
     "newrelic",
     "apm",
     "plugin"
   ],
-  "homepage":"https://github.com/jippi/cakephp-newrelic",
-  "license":"MIT",
-  "authors":[
+  "homepage": "https://github.com/jippi/cakephp-newrelic",
+  "license": "MIT",
+  "authors": [
     {
-      "name":"Christian Winther",
-      "role":"Author",
-      "homepage":"http://cakephp.nu/"
+      "name": "Christian Winther",
+      "role": "Author",
+      "homepage": "http://cakephp.nu/"
     }
   ],
-  "support":{
-    "source":"https://github.com/jippi/cakephp-newrelic",
-    "issues":"https://github.com/jippi/cakephp-newrelic/issues",
-    "irc":"irc://irc.freenode.org/friendsofcake"
+  "support": {
+    "source": "https://github.com/jippi/cakephp-newrelic",
+    "issues": "https://github.com/jippi/cakephp-newrelic/issues",
+    "irc": "irc://irc.freenode.org/friendsofcake"
   },
-  "require":{
-    "composer/installers":"*"
+  "require": {
+    "php": ">=8.1",
+    "cakephp/cakephp": "5.x-dev"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^10.1.0",
+    "cakephp/cakephp-codesniffer": "^5.0"
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
+  "autoload": {
+    "psr-4": {
+      "NewRelic\\": "src",
+      "NewRelic\\Test\\Fixture\\": "tests\\Fixture"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Cake\\Test\\": "vendor/cakephp/cakephp/tests",
+      "DebugKit\\Test\\": "tests"
+    }
   },
   "extra": {
     "installer-name": "NewRelic"
+  },
+  "config": {
+    "allow-plugins": {
+      "dealerdirect/phpcodesniffer-composer-installer": true
+    }
   }
 }
diff --git a/config/bootstrap.php b/config/bootstrap.php
new file mode 100644
index 0000000..f651d7d
--- /dev/null
+++ b/config/bootstrap.php
@@ -0,0 +1,6 @@
+<?php
+declare(strict_types=1);
+
+if (false) {
+    define('NEW_RELIC_APP_NAME', sprintf('%s - app - cli', 'production'));
+}
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
new file mode 100644
index 0000000..e69de29
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 0000000..0f5f66f
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,12 @@
+includes:
+    - phpstan-baseline.neon
+
+parameters:
+    level: 5
+    checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
+    autoload_files:
+        - tests/bootstrap.php
+    ignoreErrors:
+
+services:
\ No newline at end of file
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..269d580
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" cacheDirectory=".phpunit.cache">
+    <coverage/>
+    <php>
+        <ini name="memory_limit" value="-1"/>
+        <ini name="apc.enable_cli" value="1"/>
+        <env name="FIXTURE_SCHEMA_METADATA" value="./tests/schema.php"/>
+    </php>
+    <!-- Add any additional test suites you want to run here -->
+    <testsuites>
+        <testsuite name="CakePHP <3 NewRelic">
+            <directory>tests/TestCase/</directory>
+        </testsuite>
+    </testsuites>
+    <extensions>
+        <bootstrap class="Cake\TestSuite\Fixture\Extension\PHPUnitExtension"/>
+    </extensions>
+    <source>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </source>
+</phpunit>
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
new file mode 100644
index 0000000..d3a0c84
--- /dev/null
+++ b/psalm-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="3.11.2@d470903722cfcbc1cd04744c5491d3e6d13ec3d9">
+
+</files>
\ No newline at end of file
diff --git a/psalm.xml b/psalm.xml
new file mode 100644
index 0000000..0d865a6
--- /dev/null
+++ b/psalm.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<psalm
+    allowCoercionFromStringToClassConst="true"
+    allowStringToStandInForClass="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+	errorBaseline="psalm-baseline.xml"
+>
+    <projectFiles>
+        <directory name="src" />
+    </projectFiles>
+
+    <issueHandlers>
+        <LessSpecificReturnType errorLevel="info" />
+        <RedundantConditionGivenDocblockType errorLevel="info" />
+        <TypeCoercion errorLevel="info" />
+        <DocblockTypeContradiction errorLevel="info" />
+    </issueHandlers>
+</psalm>
\ No newline at end of file
diff --git a/src/Controller/Component/NewRelicComponent.php b/src/Controller/Component/NewRelicComponent.php
new file mode 100644
index 0000000..4c5e714
--- /dev/null
+++ b/src/Controller/Component/NewRelicComponent.php
@@ -0,0 +1,39 @@
+<?php
+declare(strict_types=1);
+
+namespace NewRelic\Controller\Component;
+
+use Cake\Controller\Component;
+use Cake\Event\EventInterface;
+use NewRelic\Traits\NewRelicTrait;
+
+/**
+ * New Relic Component
+ *
+ * @author Christian Winther
+ */
+class NewRelicComponent extends Component
+{
+	use NewRelicTrait;
+
+	/**
+	 * Called before the Controller::beforeFilter().
+	 *
+	 * Start NewRelic and configure transaction name
+	 *
+	 * @param \Cake\Event\EventInterface $event
+	 * @return void
+	 */
+	public function beforeFilter(EventInterface $event): void
+    {
+		$this->setName($event->getSubject()->getRequest());
+		$this->start();
+
+		$controller = $event->getSubject();
+		if (isset($controller->Auth)) {
+			$this->user($controller->Auth->user('id'), $controller->Auth->user('email'), '');
+		}
+
+		$this->captureParams(true);
+	}
+}
diff --git a/src/Lib/NewRelic.php b/src/Lib/NewRelic.php
new file mode 100644
index 0000000..6147a24
--- /dev/null
+++ b/src/Lib/NewRelic.php
@@ -0,0 +1,337 @@
+<?php
+declare(strict_types=1);
+
+namespace NewRelic\Lib;
+
+use Exception;
+use Throwable;
+
+/**
+ * Class to help work with NewRelic in PHP
+ *
+ * @author Christian Winther
+ * @see https://docs.newrelic.com/docs/php/the-php-api
+ */
+class NewRelic
+{
+    protected static array $ignoredExceptions = [];
+
+    protected static array $ignoredErrors = [];
+
+    protected static array $serverVariables = [];
+
+    protected static array $cookieVariables = [];
+
+    protected static string $currentTransactionName;
+
+    /**
+     * Change the application name
+     *
+     * @param string $name
+     * @return void
+     */
+    public static function applicationName(string $name): void
+    {
+        if (!static::hasNewRelic()) {
+            return;
+        }
+
+        newrelic_set_appname($name);
+    }
+
+    /**
+     * Start a New Relic transaction
+     *
+     * @param string|null $name
+     * @return void
+     */
+    public static function start(?string $name = null): void
+    {
+        if (!static::hasNewRelic()) {
+            return;
+        }
+
+        newrelic_start_transaction(NEW_RELIC_APP_NAME);
+
+        if ($name) {
+            static::$currentTransactionName = $name;
+        }
+
+        newrelic_name_transaction(static::$currentTransactionName);
+    }
+
+    /**
+     * End a New Relic transaction
+     *
+     * @param boolean $ignore Should the statistics NewRelic gathered be discarded?
+     * @return void
+     */
+    public static function stop(bool $ignore = false): void
+    {
+        if (!static::hasNewRelic()) {
+            return;
+        }
+
+        newrelic_end_transaction($ignore);
+    }
+
+    /**
+     * Ignore the current transaction
+     *
+     * @return void
+     */
+    public static function ignoreTransaction(): void
+    {
+        if (!static::hasNewRelic()) {
+            return;
+        }
+
+        newrelic_ignore_transaction();
+    }
+
+    /**
+     * Ignore the current apdex
+     *
+     * @return void
+     */
+    public static function ignoreApdex(): void
+    {
+        if (!static::hasNewRelic()) {
+            return;
+        }
+
+        newrelic_ignore_apdex();
+    }
+
+    /**
+     * Should NewRelic capture params ?
+     *
+     * @param boolean $boolean
+     * @return void
+     */
+    public static function captureParams(bool $boolean): void
+    {
+        if (!static::hasNewRelic()) {
+            return;
+        }
+
+        newrelic_capture_params($boolean);
+    }
+
+    /**
+     * Add custom tracer method
+     *
+     * @param string $method
+     */
+    public static function addTracer(string $method): void
+    {
+        if (!static::hasNewRelic()) {
+            return;
+        }
+
+        newrelic_add_custom_tracer($method);
+    }
+
+    /**
+     * Add a custom parameter to the New Relic transaction
+     *
+     * @param string $key
+     * @param mixed $value
+     * @return false|void
+     */
+    public static function parameter(string $key, mixed $value)
+    {
+        if (!static::hasNewRelic()) {
+            return false;
+        }
+
+        if (!is_scalar($value)) {
+            $value = json_encode($value);
+        }
+
+        newrelic_add_custom_parameter($key, $value);
+    }
+
+    /**
+     * Track a custom metric
+     *
+     * @param string $key
+     * @param float|integer $value
+     * @return void
+     * @throws \Exception
+     */
+    public static function metric(string $key, float|int $value): void
+    {
+        if (!static::hasNewRelic()) {
+            return;
+        }
+
+        if (!is_numeric($value)) {
+            throw new Exception('Value must be numeric');
+        }
+
+        newrelic_custom_metric($key, $value);
+    }
+
+    /**
+     * Add a custom method to have traced by NewRelic
+     *
+     * @param string $method
+     * @return void
+     */
+    public static function tracer(string $method): void
+    {
+        if (!static::hasNewRelic()) {
+            return;
+        }
+
+        newrelic_add_custom_tracer($method);
+    }
+
+    /**
+     * Ignore an exception class
+     *
+     * @param string $exception
+     * @return void
+     */
+    public static function ignoreException(string $exception): void
+    {
+        static::$ignoredExceptions = array_merge(static::$ignoredExceptions, (array) $exception);
+    }
+
+    /**
+     * Ignore error strings
+     *
+     * @param string $error
+     * @return void
+     */
+    public static function ignoreError(string $error): void
+    {
+        static::$ignoredErrors = array_merge(static::$ignoredErrors, (array) $error);
+    }
+
+    /**
+     * Server variables to collect
+     *
+     * @param  array $variables
+     * @return void
+     */
+    public static function collectServerVariables(array $variables): void
+    {
+        static::$serverVariables = array_merge(static::$serverVariables, $variables);
+    }
+
+    /**
+     * Cookie variables to collect
+     *
+     * @param  array $variables
+     * @return void
+     */
+    public static function collectCookieVariables(array $variables): void
+    {
+        static::$cookieVariables = array_merge(static::$cookieVariables, $variables);
+    }
+
+    /**
+     * Send an exception to New Relic
+     *
+     * @param \Throwable|\Exception $exception
+     * @return void
+     */
+    public static function sendException(Throwable|Exception $exception): void
+    {
+        if (!static::hasNewRelic()) {
+            return;
+        }
+
+        $exceptionClass = get_class($exception);
+        if (in_array($exceptionClass, static::$ignoredExceptions)) {
+            return;
+        }
+
+        newrelic_notice_error(0, $exception);
+    }
+
+    /**
+     * Send an error to New Relic
+     *
+     * @param mixed $code
+     * @param mixed $description
+     * @param mixed $file
+     * @param mixed $line
+     * @param mixed|null $context
+     * @return void
+     */
+    public static function sendError(
+        mixed $code,
+        mixed $description,
+        mixed $file,
+        mixed $line,
+        mixed $context = null
+    ): void {
+        if (!static::hasNewRelic()) {
+            return;
+        }
+
+        foreach (static::$ignoredErrors as $errorMessage) {
+            if (str_contains($description, $errorMessage)) {
+                return;
+            }
+        }
+
+        newrelic_notice_error($code, $description, $file, $line, $context);
+    }
+
+    /**
+     * Set user attributes
+     *
+     * @param string $user
+     * @param string $account
+     * @param string $product
+     * @return void
+     */
+    public static function user(string $user, string $account, string $product): void
+    {
+        if (!static::hasNewRelic()) {
+            return;
+        }
+
+        newrelic_set_user_attributes($user, $account, $product);
+    }
+
+    /**
+     * Check if the NewRelic PHP extension is loaded
+     *
+     * @return boolean
+     */
+    public static function hasNewRelic(): bool
+    {
+        return extension_loaded('newrelic');
+    }
+
+    /**
+     * Collect environmental data for the transaction
+     *
+     * @return void
+     */
+    public static function collect(): void
+    {
+        static::parameter('_get', $_GET);
+        static::parameter('_post', $_POST);
+        static::parameter('_files', $_FILES);
+
+        foreach ($_SERVER as $key => $value) {
+            if (!in_array($key, static::$serverVariables)) {
+                continue;
+            }
+            static::parameter('server_' . strtolower($key), $value);
+        }
+
+        foreach ($_COOKIE as $key => $value) {
+            if (!in_array($key, static::$cookieVariables)) {
+                continue;
+            }
+            static::parameter('cookie_' . strtolower($key), $value);
+        }
+    }
+}
diff --git a/src/Middleware/NewRelicErrorHandlerMiddleware.php b/src/Middleware/NewRelicErrorHandlerMiddleware.php
new file mode 100644
index 0000000..632e9a1
--- /dev/null
+++ b/src/Middleware/NewRelicErrorHandlerMiddleware.php
@@ -0,0 +1,27 @@
+<?php
+declare(strict_types=1);
+
+namespace NewRelic\Middleware;
+
+use Cake\Error\Middleware\ErrorHandlerMiddleware;
+use NewRelic\Lib\NewRelic;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Throwable;
+
+/**
+ * {@inheritDoc}
+ */
+class NewRelicErrorHandlerMiddleware extends ErrorHandlerMiddleware
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function handleException(Throwable $exception, ServerRequestInterface $request): ResponseInterface
+    {
+        NewRelic::collect();
+        NewRelic::sendException($exception);
+
+        return parent::handleException($exception, $request);
+    }
+}
diff --git a/src/Traits/NewRelicTrait.php b/src/Traits/NewRelicTrait.php
new file mode 100644
index 0000000..94be020
--- /dev/null
+++ b/src/Traits/NewRelicTrait.php
@@ -0,0 +1,232 @@
+<?php
+declare(strict_types=1);
+
+namespace NewRelic\Traits;
+
+use Cake\Command\Command;
+use Cake\Console\CommandInterface;
+use NewRelic\Lib\NewRelic;
+use Cake\Http\ServerRequest;
+use Exception;
+
+/**
+ * NewRelic Trait
+ */
+trait NewRelicTrait
+{
+	/**
+	 * The transaction name to use
+	 *
+	 * @var string
+	 */
+	protected string $_newrelicTransactionName;
+
+    /**
+     * Set the transaction name
+     *
+     * If `$name` is a Command instance, the name will
+     * automatically be derived based on best practices
+     *
+     * @param \Cake\Console\CommandInterface|\Cake\Http\ServerRequest $argument
+     */
+	public function setName(CommandInterface|ServerRequest $argument): void
+    {
+		$name = "";
+		if ($argument instanceof Command) {
+			$name = $this->_deriveNameFromCommand($argument);
+		}
+		if ($argument instanceof ServerRequest) {
+			$name = $this->_deriveNameFromRequest($argument);
+		}
+
+		$this->_newrelicTransactionName = $name;
+	}
+
+	/**
+	 * Get the name
+	 *
+	 * @return string
+	 */
+	public function getName(): string
+    {
+		return $this->_newrelicTransactionName;
+	}
+
+	/**
+	 * Change the application name
+	 *
+	 * @param string $name
+	 * @return void
+	 */
+	public function applicationName(string $name): void
+    {
+		NewRelic::applicationName($name);
+	}
+
+	/**
+	 * Start a NewRelic transaction
+	 *
+	 * @param string|null $name
+	 * @return void
+	 */
+	public function start(?string $name = null): void
+    {
+		NewRelic::start($this->_getTransactionName($name));
+	}
+
+    /**
+     * Stop a transaction
+     *
+     * @param bool $ignore
+     * @return void
+     */
+	public function stop(bool $ignore = false): void
+    {
+		NewRelic::stop($ignore);
+	}
+
+	/**
+	 * Ignore current transaction
+	 *
+	 * @return void
+	 */
+	public function ignoreTransaction(): void
+    {
+		NewRelic::ignoreTransaction();
+	}
+
+	/**
+	 * Ignore current apdex
+	 *
+	 * @return void
+	 */
+	public function ignoreApdex(): void
+    {
+		NewRelic::ignoreApdex();
+	}
+
+	/**
+	 * Add custom parameter to transaction
+	 *
+	 * @param string $key
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function parameter(string $key, mixed $value): void
+    {
+		NewRelic::parameter($key, $value);
+	}
+
+    /**
+     * Add custom metric
+     *
+     * @param string $key
+     * @param float $value
+     * @return void
+     * @throws \Exception
+     */
+	public function metric(string $key, float $value): void
+    {
+		NewRelic::metric($key, $value);
+	}
+
+	/**
+	 * capture params
+	 *
+	 * @param boolean $capture
+	 * @return void
+	 */
+	public function captureParams(bool $capture): void
+    {
+		NewRelic::captureParams($capture);
+	}
+
+	/**
+	 * Add custom tracer method
+	 *
+	 * @param string $method
+	 */
+	public function addTracer(string $method): void
+    {
+		NewRelic::addTracer($method);
+	}
+
+	/**
+	 * Set user attributes
+	 *
+	 * @param string $user
+	 * @param string $account
+	 * @param string $product
+	 * @return void
+	 */
+	public function user(string $user, string $account, string $product): void
+    {
+		NewRelic::user($user, $account, $product);
+	}
+
+	/**
+	 * Send an exception to New Relic
+	 *
+	 * @param \Exception $e
+	 * @return void
+	 */
+	public function sendException(Exception $e): void
+    {
+		NewRelic::sendException($e);
+	}
+
+	/**
+	 * Get transaction name
+	 *
+	 * @param string $name
+	 * @return string
+	 */
+	protected function _getTransactionName(string $name): string
+    {
+		if ($name) {
+			return $name;
+		}
+
+		return $this->_newrelicTransactionName;
+	}
+
+	/**
+	 * Derive the transaction name
+	 *
+	 * @param \Cake\Command\Command $command
+	 * @return string
+	 */
+	protected function _deriveNameFromCommand(Command $command): string
+    {
+        return $command->getName();
+	}
+
+	/**
+	 * Compute name based on request information
+	 *
+	 * @param  \Cake\Http\ServerRequest $request
+	 * @return string
+	 */
+	protected function _deriveNameFromRequest(ServerRequest $request): string
+    {
+		$name = [];
+		if ($request->getParam('prefix')) {
+			$name[] = $request->getParam('prefix');
+		}
+
+		if ($request->getParam('plugin')) {
+			$name[] = $request->getParam('plugin');
+		}
+
+		$name[] = $request->getParam('controller');
+		$name[] = $request->getParam('action');
+
+		$name = join('/', $name);
+
+		if ($request->getParam('ext')) {
+			$name .= '.' . $request->getParam('ext');
+		}
+
+		return $name;
+	}
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000..c9f40d2
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,45 @@
+<?php
+declare(strict_types=1);
+
+use Cake\Database\Connection;
+use Cake\Database\Driver\Mysql;
+use Cake\Datasource\ConnectionManager;
+use Cake\TestSuite\Fixture\SchemaLoader;
+use function Cake\Core\env;
+
+/**
+ * Test suite bootstrap.
+ *
+ * This function is used to find the location of CakePHP whether CakePHP
+ * has been installed as a dependency of the plugin, or the plugin is itself
+ * installed as a dependency of an application.
+ * @throws \Exception
+ */
+$findRoot = function ($root) {
+    do {
+        $lastRoot = $root;
+        $root = dirname($root);
+        if (is_dir($root . '/vendor/cakephp/cakephp')) {
+            return $root;
+        }
+    } while ($root !== $lastRoot);
+
+    throw new Exception('Cannot find the root of the application, unable to run tests');
+};
+$root = $findRoot(__FILE__);
+unset($findRoot);
+
+chdir($root);
+if (file_exists($root . '/config/bootstrap.php')) {
+    require $root . '/config/bootstrap.php';
+
+    return;
+}
+
+require $root . '/vendor/cakephp/cakephp/tests/bootstrap.php';
+
+// Create test database schema
+if (env('FIXTURE_SCHEMA_METADATA')) {
+    $loader = new SchemaLoader();
+    $loader->loadInternalFile(env('FIXTURE_SCHEMA_METADATA'));
+}
diff --git a/tests/schema.php b/tests/schema.php
new file mode 100644
index 0000000..353ace1
--- /dev/null
+++ b/tests/schema.php
@@ -0,0 +1,4 @@
+<?php
+declare(strict_types=1);
+
+return [];