diff --git a/src/Utility.php b/src/Utility.php
index ee2efba..e278773 100644
--- a/src/Utility.php
+++ b/src/Utility.php
@@ -1,7 +1,7 @@
 Block<?php
 namespace Drupal\microformats;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\HtmlEscapedText;
 use Drupal\Component\Utility\Html;
 
 /**
@@ -18,18 +18,18 @@ class Utility {
     // print_r($mf_config->get('type')); die;
     // Build $variables from scratch.
     $variables['#type'] = $mf_config->get('type');
-    $variables['#given_name'] = SafeMarkup::checkPlain($mf_config->get('given-name'))->__toString();
-    $variables['#family_name'] = SafeMarkup::checkPlain($mf_config->get('family-name'))->__toString();
-    $variables['#org'] = $mf_config->get('use_site_name') ? SafeMarkup::checkPlain($drupalConfig->get('name'))->__toString() : SafeMarkup::checkPlain($mf_config->get('org'))->__toString();
-    $variables['#street_address'] = SafeMarkup::checkPlain($mf_config->get('street-address'))->__toString();
-    $variables['#extended_address'] = SafeMarkup::checkPlain($mf_config->get('extended-address'))->__toString();
-    $variables['#locality'] = SafeMarkup::checkPlain($mf_config->get('locality'))->__toString();
-    $variables['#region'] = SafeMarkup::checkPlain($mf_config->get('region'))->__toString();
-    $variables['#postal_code'] = SafeMarkup::checkPlain($mf_config->get('postal-code'))->__toString();
-    $variables['#country'] = SafeMarkup::checkPlain($mf_config->get('country-name'))->__toString();
-    $variables['#longitude'] = SafeMarkup::checkPlain($mf_config->get('longitude'))->__toString();
-    $variables['#latitude'] = SafeMarkup::checkPlain($mf_config->get('latitude'))->__toString();
-    $variables['#tagline'] = $mf_config->get('use_site_slogan') ? SafeMarkup::checkPlain($drupalConfig->get('slogan'))->__toString() : SafeMarkup::checkPlain($mf_config->get('tagline'))->__toString();
+    $variables['#given_name'] = (new HtmlEscapedText($mf_config->get('given-name')))->__toString();
+    $variables['#family_name'] = (new HtmlEscapedText($mf_config->get('family-name')))->__toString();
+    $variables['#org'] = $mf_config->get('use_site_name') ? (new HtmlEscapedText($drupalConfig->get('name')))->__toString() : (new HtmlEscapedText($mf_config->get('org')))->__toString();
+    $variables['#street_address'] = (new HtmlEscapedText($mf_config->get('street-address')))->__toString();
+    $variables['#extended_address'] = (new HtmlEscapedText($mf_config->get('extended-address')))->__toString();
+    $variables['#locality'] = (new HtmlEscapedText($mf_config->get('locality')))->__toString();
+    $variables['#region'] = (new HtmlEscapedText($mf_config->get('region')))->__toString();
+    $variables['#postal_code'] = (new HtmlEscapedText($mf_config->get('postal-code')))->__toString();
+    $variables['#country'] = (new HtmlEscapedText($mf_config->get('country-name')))->__toString();
+    $variables['#longitude'] = (new HtmlEscapedText($mf_config->get('longitude')))->__toString();
+    $variables['#latitude'] = (new HtmlEscapedText($mf_config->get('latitude')))->__toString();
+    $variables['#tagline'] = $mf_config->get('use_site_slogan') ? (new HtmlEscapedText($drupalConfig->get('slogan')))->__toString() : (new HtmlEscapedText($mf_config->get('tagline')))->__toString();
     $variables['#use_site_name'] = $mf_config->get('use_site_name');
     $variables['#use_site_slogan'] = $mf_config->get('use_site_slogan');
     // Generate formatted longitude and latitude.
@@ -38,21 +38,21 @@ class Utility {
 
     // Generates the output for the 'phones' variable.
     if ($mf_config->get('voice')) {
-      $phone_text = SafeMarkup::checkPlain($mf_config->get('voice'))->__toString();
+      $phone_text = (new HtmlEscapedText($mf_config->get('voice')))->__toString();
       $phones = explode(',', $phone_text);
       $variables['#phones'] = array_map('trim', $phones);
     }
 
     // Generates the output for the 'faxes' variable.
     if ($mf_config->get('fax')) {
-      $fax_text = SafeMarkup::checkPlain($mf_config->get('fax'))->__toString();
+      $fax_text = (new HtmlEscapedText($mf_config->get('fax')))->__toString();
       $faxes = explode(',', $fax_text);
       $variables['#faxes'] = array_map('trim', $faxes);
     }
 
     // Generate the output for the 'email' variable.
     if ($mf_config->get('email')) {
-      $email = SafeMarkup::checkPlain($mf_config->get('email'))->__toString();
+      $email = (new HtmlEscapedText($mf_config->get('email')))->__toString();
       // Use obfuscation provided by invisimail module.
       if (function_exists('invisimail_encode_html')) {
         $variables['#email'] = invisimail_encode_html($email);
@@ -67,11 +67,11 @@ class Utility {
     // Generate ID.
     $id = 'microformats_contactinfo';
     if ($mf_config->get('type') == 'personal') {
-      $id .= !empty($mf_config->get('given-name')) ? '-' . SafeMarkup::checkPlain($mf_config->get('given-name'))->__toString() : '';
-      $id .= !empty($mf_config->get('family-name')) ? '-' . SafeMarkup::checkPlain($mf_config->get('family-name'))->__toString() : '';
+      $id .= !empty($mf_config->get('given-name')) ? '-' . (new HtmlEscapedText($mf_config->get('given-name')))->__toString() : '';
+      $id .= !empty($mf_config->get('family-name')) ? '-' . (new HtmlEscapedText($mf_config->get('family-name')))->__toString() : '';
     }
     else {
-      $id .= !empty($mf_config->get('org')) ? '-' . SafeMarkup::checkPlain($mf_config->get('org'))->__toString() : '';
+      $id .= !empty($mf_config->get('org')) ? '-' . (new HtmlEscapedText($mf_config->get('org')))->__toString() : '';
     }
     $variables['#id'] = Html::getUniqueId($id);
     return $variables;
