diff --git a/mailhandler_comment/src/Plugin/inmail/Handler/MailhandlerComment.php b/mailhandler_comment/src/Plugin/inmail/Handler/MailhandlerComment.php
index f0e07d1..8b008e2 100644
--- a/mailhandler_comment/src/Plugin/inmail/Handler/MailhandlerComment.php
+++ b/mailhandler_comment/src/Plugin/inmail/Handler/MailhandlerComment.php
@@ -72,7 +72,7 @@ class MailhandlerComment extends HandlerBase implements ContainerFactoryPluginIn
    */
   public function invoke(MessageInterface $message, ProcessorResultInterface $processor_result) {
     try {
-      $result = $processor_result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+      $result = $processor_result->getAnalyzerResult();
 
       if (!$result->hasContext('entity_type') || $result->getContext('entity_type')->getContextValue()['entity_type'] != 'comment') {
         // Do not run this handler in case we are not dealing with comments.
diff --git a/src/Plugin/inmail/Analyzer/BodyAnalyzer.php b/src/Plugin/inmail/Analyzer/BodyAnalyzer.php
index 99fe4bc..09b89f4 100644
--- a/src/Plugin/inmail/Analyzer/BodyAnalyzer.php
+++ b/src/Plugin/inmail/Analyzer/BodyAnalyzer.php
@@ -29,7 +29,7 @@ class BodyAnalyzer extends AnalyzerBase {
    * {@inheritdoc}
    */
   public function analyze(MessageInterface $message, ProcessorResultInterface $processor_result) {
-    $result = $processor_result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+    $result = $processor_result->getAnalyzerResult();
 
     $this->analyzeBody($message, $result);
   }
diff --git a/src/Plugin/inmail/Analyzer/EntityTypeAnalyzer.php b/src/Plugin/inmail/Analyzer/EntityTypeAnalyzer.php
index 37184fa..4a68fef 100644
--- a/src/Plugin/inmail/Analyzer/EntityTypeAnalyzer.php
+++ b/src/Plugin/inmail/Analyzer/EntityTypeAnalyzer.php
@@ -34,7 +34,7 @@ class EntityTypeAnalyzer extends AnalyzerBase {
    * {@inheritdoc}
    */
   public function analyze(MessageInterface $message, ProcessorResultInterface $processor_result) {
-    $result = $processor_result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+    $result = $processor_result->getAnalyzerResult();
 
     $this->findEntityType($message, $result);
   }
diff --git a/src/Plugin/inmail/Analyzer/FooterAnalyzer.php b/src/Plugin/inmail/Analyzer/FooterAnalyzer.php
index 119e5b3..bdac766 100644
--- a/src/Plugin/inmail/Analyzer/FooterAnalyzer.php
+++ b/src/Plugin/inmail/Analyzer/FooterAnalyzer.php
@@ -31,7 +31,7 @@ class FooterAnalyzer extends AnalyzerBase {
    * {@inheritdoc}
    */
   public function analyze(MessageInterface $message, ProcessorResultInterface $processor_result) {
-    $result = $processor_result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+    $result = $processor_result->getAnalyzerResult();
 
     $this->findFooter($message, $result);
   }
diff --git a/src/Plugin/inmail/Analyzer/PGPAnalyzer.php b/src/Plugin/inmail/Analyzer/PGPAnalyzer.php
index efb453a..7351872 100644
--- a/src/Plugin/inmail/Analyzer/PGPAnalyzer.php
+++ b/src/Plugin/inmail/Analyzer/PGPAnalyzer.php
@@ -35,7 +35,7 @@ class PGPAnalyzer extends AnalyzerBase {
    * {@inheritdoc}
    */
   public function analyze(MessageInterface $message, ProcessorResultInterface $processor_result) {
-    $result = $processor_result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+    $result = $processor_result->getAnalyzerResult();
 
     $context = [];
     // Check if we are dealing with PGP-signed message.
diff --git a/src/Plugin/inmail/Analyzer/SenderAnalyzer.php b/src/Plugin/inmail/Analyzer/SenderAnalyzer.php
index 7a54ca4..910e243 100644
--- a/src/Plugin/inmail/Analyzer/SenderAnalyzer.php
+++ b/src/Plugin/inmail/Analyzer/SenderAnalyzer.php
@@ -27,7 +27,7 @@ class SenderAnalyzer extends AnalyzerBase {
    * {@inheritdoc}
    */
   public function analyze(MessageInterface $message, ProcessorResultInterface $processor_result) {
-    $result = $processor_result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+    $result = $processor_result->getAnalyzerResult();
 
     $this->findSender($message, $result);
   }
diff --git a/src/Plugin/inmail/Handler/MailhandlerNode.php b/src/Plugin/inmail/Handler/MailhandlerNode.php
index df9d951..48f3c0a 100644
--- a/src/Plugin/inmail/Handler/MailhandlerNode.php
+++ b/src/Plugin/inmail/Handler/MailhandlerNode.php
@@ -76,7 +76,7 @@ class MailhandlerNode extends HandlerBase implements ContainerFactoryPluginInter
    */
   public function invoke(MessageInterface $message, ProcessorResultInterface $processor_result) {
     try {
-      $result = $processor_result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+      $result = $processor_result->getAnalyzerResult();
 
       if (!$result->hasContext('entity_type') || $result->getContext('entity_type')->getContextValue()['entity_type'] != 'node') {
         // Do not run this handler in case
diff --git a/tests/src/Kernel/BodyAnalyzerKernelTest.php b/tests/src/Kernel/BodyAnalyzerKernelTest.php
index 38642fd..b078dcf 100644
--- a/tests/src/Kernel/BodyAnalyzerKernelTest.php
+++ b/tests/src/Kernel/BodyAnalyzerKernelTest.php
@@ -29,14 +29,13 @@ class BodyAnalyzerKernelTest extends AnalyzerTestBase {
     $message = $this->parser->parseMessage($raw_message);
 
     $result = new ProcessorResult();
-    $result->ensureAnalyzerResult(DefaultAnalyzerResult::TOPIC, DefaultAnalyzerResult::createFactory());
     $body_analyzer = AnalyzerConfig::load('body');
 
     /** @var \Drupal\mailhandler\Plugin\inmail\Analyzer\BodyAnalyzer $analyzer */
     $analyzer = $this->analyzerManager->createInstance($body_analyzer->getPluginId(), $body_analyzer->getConfiguration());
     $analyzer->analyze($message, $result);
 
-    $result = $result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+    $result = $result->getAnalyzerResult();
     $expected_processed_body = <<<EOF
 Hello, Drupal!<br />
 <br />
diff --git a/tests/src/Kernel/EntityTypeAnalyzerKernelTest.php b/tests/src/Kernel/EntityTypeAnalyzerKernelTest.php
index 02fbca1..913dbe7 100644
--- a/tests/src/Kernel/EntityTypeAnalyzerKernelTest.php
+++ b/tests/src/Kernel/EntityTypeAnalyzerKernelTest.php
@@ -30,13 +30,12 @@ class EntityTypeAnalyzerKernelTest extends AnalyzerTestBase {
     $message = $this->parser->parseMessage($raw_message);
 
     $result = new ProcessorResult();
-    $result->ensureAnalyzerResult(DefaultAnalyzerResult::TOPIC, DefaultAnalyzerResult::createFactory());
     $entity_type_analyzer = AnalyzerConfig::load('entity_type');
 
     /** @var \Drupal\mailhandler\Plugin\inmail\Analyzer\EntityTypeAnalyzer $analyzer */
     $analyzer = $this->analyzerManager->createInstance($entity_type_analyzer->getPluginId(), $entity_type_analyzer->getConfiguration());
     $analyzer->analyze($message, $result);
-    $result = $result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+    $result = $result->getAnalyzerResult();
 
     $this->assertEquals('Google Summer of Code 2016', $result->getSubject());
     $this->assertEquals('node', $result->getContext('entity_type')->getContextValue()['entity_type']);
@@ -51,9 +50,8 @@ class EntityTypeAnalyzerKernelTest extends AnalyzerTestBase {
     $page->save();
 
     $result = new ProcessorResult();
-    $result->ensureAnalyzerResult(DefaultAnalyzerResult::TOPIC, DefaultAnalyzerResult::createFactory());
     $analyzer->analyze($message, $result);
-    $result = $result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+    $result = $result->getAnalyzerResult();
 
     $this->assertEquals('page', $result->getContext('entity_type')->getContextValue()['bundle']);
 
@@ -62,9 +60,8 @@ class EntityTypeAnalyzerKernelTest extends AnalyzerTestBase {
     /** @var \Drupal\inmail\MIME\MessageInterface $message */
     $message = $this->parser->parseMessage($raw_message);
     $result = new ProcessorResult();
-    $result->ensureAnalyzerResult(DefaultAnalyzerResult::TOPIC, DefaultAnalyzerResult::createFactory());
     $analyzer->analyze($message, $result);
-    $result = $result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+    $result = $result->getAnalyzerResult();
     $this->assertEquals('user', $result->getContext('entity_type')->getContextValue()['entity_type']);
     $this->assertEquals(NULL, $result->getContext('entity_type')->getContextValue()['bundle']);
     $this->assertEquals('[#id] Google Summer of Code 2016', $result->getSubject());
diff --git a/tests/src/Kernel/FooterAnalyzerKernelTest.php b/tests/src/Kernel/FooterAnalyzerKernelTest.php
index bc68128..575a20f 100644
--- a/tests/src/Kernel/FooterAnalyzerKernelTest.php
+++ b/tests/src/Kernel/FooterAnalyzerKernelTest.php
@@ -29,13 +29,12 @@ class FooterAnalyzerKernelTest extends AnalyzerTestBase {
     $message = $this->parser->parseMessage($raw_message);
 
     $result = new ProcessorResult();
-    $result->ensureAnalyzerResult(DefaultAnalyzerResult::TOPIC, DefaultAnalyzerResult::createFactory());
     $footer_analyzer = AnalyzerConfig::load('footer');
 
     /** @var \Drupal\mailhandler\Plugin\inmail\Analyzer\FooterAnalyzer $analyzer */
     $analyzer = $this->analyzerManager->createInstance($footer_analyzer->getPluginId(), $footer_analyzer->getConfiguration());
     $analyzer->analyze($message, $result);
-    $result = $result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+    $result = $result->getAnalyzerResult();
 
     $expected_processed_body = 'Hello, Drupal!';
     $expected_footer = <<<EOF
@@ -50,10 +49,9 @@ EOF;
     $signed_mail = $this->getFileContent('eml/PGP_Signed_Inline.eml');
     $message = $this->parser->parseMessage($signed_mail);
     $result = new ProcessorResult();
-    $result->ensureAnalyzerResult(DefaultAnalyzerResult::TOPIC, DefaultAnalyzerResult::createFactory());
     $analyzer = $this->analyzerManager->createInstance($footer_analyzer->getPluginId(), $footer_analyzer->getConfiguration());
     $analyzer->analyze($message, $result);
-    $result = $result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+    $result = $result->getAnalyzerResult();
 
     $this->assertEquals(NULL, $result->getBody());
     $this->assertEquals(NULL, $result->getFooter());
diff --git a/tests/src/Kernel/PGPAnalyzerKernelTest.php b/tests/src/Kernel/PGPAnalyzerKernelTest.php
index 68666ca..0eda8bb 100644
--- a/tests/src/Kernel/PGPAnalyzerKernelTest.php
+++ b/tests/src/Kernel/PGPAnalyzerKernelTest.php
@@ -52,13 +52,12 @@ class PGPAnalyzerKernelTest extends AnalyzerTestBase {
     $user->save();
 
     $result = new ProcessorResult();
-    $result->ensureAnalyzerResult(DefaultAnalyzerResult::TOPIC, DefaultAnalyzerResult::createFactory());
     $pgp_analyzer = AnalyzerConfig::load('pgp');
 
     /** @var \Drupal\mailhandler\Plugin\inmail\Analyzer\PGPAnalyzer $analyzer */
     $analyzer = $this->analyzerManager->createInstance($pgp_analyzer->getPluginId(), $pgp_analyzer->getConfiguration());
     $analyzer->analyze($signed_mail, $result);
-    $result = $result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+    $result = $result->getAnalyzerResult();
 
     // @todo: Remove if condition after enabling GnuGP extension in tests.
     if (extension_loaded('gnupg')) {
diff --git a/tests/src/Kernel/SenderAnalyzerKernelTest.php b/tests/src/Kernel/SenderAnalyzerKernelTest.php
index 864797d..c3482b4 100644
--- a/tests/src/Kernel/SenderAnalyzerKernelTest.php
+++ b/tests/src/Kernel/SenderAnalyzerKernelTest.php
@@ -30,13 +30,12 @@ class SenderAnalyzerKernelTest extends AnalyzerTestBase {
     $message = $this->parser->parseMessage($raw_message);
 
     $result = new ProcessorResult();
-    $result->ensureAnalyzerResult(DefaultAnalyzerResult::TOPIC, DefaultAnalyzerResult::createFactory());
     $sender_analyzer = AnalyzerConfig::load('sender');
 
     /** @var \Drupal\mailhandler\Plugin\inmail\Analyzer\SenderAnalyzer $analyzer */
     $analyzer = $this->analyzerManager->createInstance($sender_analyzer->getPluginId(), $sender_analyzer->getConfiguration());
     $analyzer->analyze($message, $result);
-    $result = $result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+    $result = $result->getAnalyzerResult();
 
     $this->assertEquals('milos@example.com', $result->getSender());
     $this->assertFalse($result->isUserAuthenticated());
@@ -50,9 +49,8 @@ class SenderAnalyzerKernelTest extends AnalyzerTestBase {
     $user->save();
 
     $result = new ProcessorResult();
-    $result->ensureAnalyzerResult(DefaultAnalyzerResult::TOPIC, DefaultAnalyzerResult::createFactory());
     $analyzer->analyze($message, $result);
-    $result = $result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+    $result = $result->getAnalyzerResult();
 
     $this->assertEquals('milos@example.com', $result->getSender());
     $this->assertTrue($result->isUserAuthenticated());