diff --git a/Pnotify.php b/Pnotify.php
new file mode 100644
index 00000000..a1827fb4
--- /dev/null
+++ b/Pnotify.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Flasher\Pnotify\Prime;
+
+use Flasher\Prime\Notification\Notification;
+
+final class Pnotify extends Notification
+{
+
+}
diff --git a/PnotifyBuilder.php b/PnotifyBuilder.php
new file mode 100644
index 00000000..c1ee708b
--- /dev/null
+++ b/PnotifyBuilder.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Flasher\Pnotify\Prime;
+
+use Flasher\Prime\Notification\NotificationBuilder;
+
+/**
+ * @method Pnotify getNotification()
+ */
+final class PnotifyBuilder extends NotificationBuilder
+{
+
+}
diff --git a/PnotifyFactory.php b/PnotifyFactory.php
new file mode 100644
index 00000000..f9ae4a6b
--- /dev/null
+++ b/PnotifyFactory.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Flasher\Pnotify\Prime;
+
+use Flasher\Prime\Factory\AbstractFactory;
+
+final class PnotifyFactory extends AbstractFactory
+{
+    /**
+     * @inheritDoc
+     */
+    public function createNotification()
+    {
+        return new Pnotify();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function createNotificationBuilder()
+    {
+        return new PnotifyBuilder($this->getEventDispatcher(), $this->createNotification(), 'pnotify');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function supports($name = null, array $context = array())
+    {
+        return in_array($name, array(__CLASS__, 'pnotify'));
+    }
+}
diff --git a/Renderer/PnotifyRenderer.php b/PnotifyRenderer.php
similarity index 77%
rename from Renderer/PnotifyRenderer.php
rename to PnotifyRenderer.php
index da52f080..8c5d997e 100644
--- a/Renderer/PnotifyRenderer.php
+++ b/PnotifyRenderer.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Flasher\PFlasher\Prime\Renderer;
+namespace Flasher\PFlasher\Prime;
 
 use Flasher\Prime\Config\ConfigInterface;
 use Flasher\Prime\Envelope;
-use Flasher\Prime\Renderer\HasGlobalOptionsInterface;
+use Flasher\Prime\Renderer\HasOptionsInterface;
 use Flasher\Prime\Renderer\HasScriptsInterface;
 use Flasher\Prime\Renderer\HasStylesInterface;
 use Flasher\Prime\Renderer\RendererInterface;
 
-class PnotifyRenderer implements RendererInterface, HasScriptsInterface, HasStylesInterface, HasGlobalOptionsInterface
+class PnotifyRenderer implements RendererInterface, HasScriptsInterface, HasStylesInterface, HasOptionsInterface
 {
     /**
      * @var ConfigInterface
@@ -44,10 +44,8 @@ class PnotifyRenderer implements RendererInterface, HasScriptsInterface, HasStyl
      */
     public function render(Envelope $envelope)
     {
-        $context = $envelope->getContext();
-        $options = isset($context['options']) ? $context['options'] : array();
+        $options = $envelope->getOptions();
 
-        $options['title'] = " " . $envelope->getTitle();
         $options['text'] = $envelope->getMessage();
         $options['type'] = $envelope->getType();
 
@@ -74,4 +72,12 @@ class PnotifyRenderer implements RendererInterface, HasScriptsInterface, HasStyl
     {
         return sprintf('PNotify.defaults = %s;', json_encode($this->options));
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function supports($name = null, array $context = array())
+    {
+        return in_array($name, array(__CLASS__, 'pnotify', 'Flasher\Pnotify\Prime\PnotifyFactory', 'Flasher\Pnotify\Prime\Pnotify'));
+    }
 }
diff --git a/Producer/PnotifyProducer.php b/Producer/PnotifyProducer.php
deleted file mode 100644
index d4e60d4d..00000000
--- a/Producer/PnotifyProducer.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Flasher\PFlasher\Prime\TestsProducer;
-
-use Flasher\Prime\AbstractFlasher;
-
-final class PnotifyProducer extends AbstractFlasher
-{
-    /**
-     * @inheritDoc
-     */
-    public function getRenderer()
-    {
-        return 'pnotify';
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function warning($message, $title = '', $context = array(), array $stamps = array())
-    {
-        return $this->render('notice', $message, $title, $context, $stamps);
-    }
-}
diff --git a/Tests/.gitkeep b/Tests/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/composer.json b/composer.json
index cb37e1aa..1a3fa8e4 100644
--- a/composer.json
+++ b/composer.json
@@ -26,19 +26,19 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher": "^1.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "4.8.36"
+        "php-flasher/flasher": "dev-main"
     },
     "autoload": {
         "psr-4": {
-            "Flasher\\Pnotify\\": "src"
+            "Flasher\\Pnotify\\": "",
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Flasher\\Pnotify\\Tests\\": "tests/"
+            "Flasher\\Pnotify\\Tests\\": "Tests/"
         }
     },
     "config": {