diff --git a/docroot/modules/contrib/jsonb/src/Plugin/Field/FieldFormatter/JsonbDefaultFormatter.php b/docroot/modules/contrib/jsonb/src/Plugin/Field/FieldFormatter/JsonbDefaultFormatter.php
index 7f15523..a530df9 100644
--- a/docroot/modules/contrib/jsonb/src/Plugin/Field/FieldFormatter/JsonbDefaultFormatter.php
+++ b/docroot/modules/contrib/jsonb/src/Plugin/Field/FieldFormatter/JsonbDefaultFormatter.php
@@ -27,7 +27,7 @@ class JsonbDefaultFormatter extends FormatterBase {
   /**
    * {@inheritdoc}
    */
-  public function viewElements(FieldItemListInterface $items) {
+  public function viewElements(FieldItemListInterface $items, $langcode) {
     $elements = array();
 
     foreach ($items as $delta => $item) {
diff --git a/docroot/modules/contrib/jsonb/src/Plugin/Field/FieldType/JsonItem.php b/docroot/modules/contrib/jsonb/src/Plugin/Field/FieldType/JsonItem.php
index eaebb36..a8c9b49 100644
--- a/docroot/modules/contrib/jsonb/src/Plugin/Field/FieldType/JsonItem.php
+++ b/docroot/modules/contrib/jsonb/src/Plugin/Field/FieldType/JsonItem.php
@@ -8,7 +8,6 @@
 namespace Drupal\jsonb\Plugin\Field\FieldType;
 
 use Drupal\Core\Field\FieldItemBase;
-use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\TypedData\DataDefinition;
 
@@ -25,6 +24,7 @@
  * )
  */
 class JsonItem extends FieldItemBase {
+
   /**
    * {@inheritdoc}
    */
@@ -33,6 +33,8 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
       'columns' => array(
         'value' => array(
           'type' => 'json',
+          'pgsql_type' => 'json',
+          'mysql_type' => 'json',
           'not null' => FALSE,
         ),
       ),
@@ -56,4 +58,5 @@ public static function propertyDefinitions(FieldStorageDefinitionInterface $fiel
 
     return $properties;
   }
+
 }
diff --git a/docroot/modules/contrib/jsonb/src/Plugin/Field/FieldType/JsonbItem.php b/docroot/modules/contrib/jsonb/src/Plugin/Field/FieldType/JsonbItem.php
index 2e252c7..5261eb4 100644
--- a/docroot/modules/contrib/jsonb/src/Plugin/Field/FieldType/JsonbItem.php
+++ b/docroot/modules/contrib/jsonb/src/Plugin/Field/FieldType/JsonbItem.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\jsonb\Plugin\Field\FieldType;
 
-use Drupal\Core\Field\FieldItemBase;
-use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\TypedData\DataDefinition;
 
@@ -24,7 +22,8 @@
  *   default_formatter = "jsonb_default"
  * )
  */
-class JsonbItem extends FieldItemBase {
+class JsonbItem extends JsonItem {
+
   /**
    * {@inheritdoc}
    */
@@ -32,7 +31,9 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
     return array(
       'columns' => array(
         'value' => array(
-          'type' => 'jsonb',
+          'type' => 'text',
+          'pgsql_type' => 'jsonb',
+          'mysql_type' => 'json',
           'not null' => FALSE,
         ),
       ),
@@ -42,18 +43,11 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
   /**
    * {@inheritdoc}
    */
-  public function isEmpty() {
-    $value = $this->get('value')->getValue();
-    return $value === NULL || $value === '';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     $properties['value'] = DataDefinition::create('string')
       ->setLabel(t('JSONB value'));
 
     return $properties;
   }
+
 }