diff --git a/composer.json b/composer.json
index 77acc5b..0197de0 100755
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,8 @@
     }
   ],
   "require": {
-    "php": "^7.2"
+    "php": "^7.2",
+    "ext-json": "*"
   },
   "require-dev": {
     "phpunit/phpunit": "^8.0",
diff --git a/phpunit.xml b/phpunit.xml
index 37d6408..3ee773e 100755
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -15,4 +15,9 @@
         <directory>./tests</directory>
     </testsuite>
 </testsuites>
+<filter>
+    <whitelist>
+        <directory suffix=".php">./src</directory>
+    </whitelist>
+</filter>
 </phpunit>
\ No newline at end of file
diff --git a/src/ContextTypes/AbstractContext.php b/src/ContextTypes/AbstractContext.php
index 108a7d5..920ab33 100644
--- a/src/ContextTypes/AbstractContext.php
+++ b/src/ContextTypes/AbstractContext.php
@@ -28,23 +28,9 @@ abstract class AbstractContext implements ContextTypeInterface
      * @var array
      */
     protected $structure = [
-        'name' => '',
+        'name' => null,
     ];
 
-    /**
-     * Property structure
-     *
-     * @var array
-     */
-    protected $extendStructure = [];
-
-    /**
-     * Property structure, will be merged up for objects extending Thing
-     *
-     * @var array
-     */
-    private $extendedStructure = [];
-
     /**
      * Create a new context type instance
      *
@@ -56,6 +42,11 @@ public function __construct(array $attributes = [])
         $path = explode('\\', get_class($this));
         $this->type = end($path);
 
+        $class = get_called_class();
+        while ($class = get_parent_class($class)) {
+            $this->structure += get_class_vars($class)['structure'];
+        }
+
         // Set attributes
         $this->fill($attributes);
     }
@@ -89,12 +80,12 @@ public function fill(array $attributes)
             '@context' => 'http://schema.org',
             '@type' => $this->type,
             'sameAs' => null
-        ], $this->structure, $this->extendStructure);
+        ], $this->structure);
 
         // Set properties from attributes
         foreach ($properties as $key => $property) {
-            $this->setProperty(
-                $key, $property, $this->getArrValue($attributes, $key, '')
+            $this->properties[$key] = $this->makeProperty(
+                $key, $property, $this->getArrValue($attributes, $key,'')
             );
         }
 
@@ -148,41 +139,50 @@ public function getProperty(string $key, $default = null)
      *
      * @return mixed
      */
-    protected function setProperty(string $key, $property, $value = null)
+    protected function makeProperty(string $key, $property, $value = null)
     {
         // Can't be changed
         if ($key[0] === '@') {
-            return $this->properties[$key] = $property;
+            return $property;
         }
 
         // If the attribute has a get mutator, we will call that
         // then return what it returns as the value.
         if ($this->hasGetMutator($key)) {
-            return $this->properties[$key] = $this->mutateAttribute($key, $value);
+            return $this->mutateAttribute($key, $value);
         }
 
         // Format date and time to UTC
         if ($value instanceof DateTime) {
-            return $this->properties[$key] = $value->format('Y-m-d\TH:i:s');
+            return $value->format('Y-m-d\TH:i:s');
         }
 
         // Set nested context
         if ($value instanceof Context) {
-            return $this->properties[$key] = $this->filterNestedContext($value->getProperties());
+            return $this->filterNestedContext($value->getProperties());
         }
 
-        // Set nested context from class
-        if ($property && class_exists($property)) {
-            return $this->properties[$key] = $this->getNestedContext($property, $value);
+        if (is_array($value) && $this->hasValidContext($value, $property)) {
+            return $this->makeContext($value);
         }
 
-        // Map properties to object
-        if ($property !== null && is_array($property) && is_array($value)) {
-            return $this->properties[$key] = $this->mapProperty($property, $value);
+        // Set nested context from class
+        if (is_array($value) && is_string($property) && class_exists($property)) {
+            // Check if it is an array with one dimension
+            if (is_array(reset($value)) === false) {
+                $nested_context = $this->getNestedContext($property, $value);
+            } else {
+                // Process multi dimensional array
+                $nested_context = array_map(function ($item) use ($property) {
+                    return $this->getNestedContext($property, $item);
+                }, $value);
+            }
+
+            return $nested_context;
         }
 
         // Set value
-        return $this->properties[$key] = $value;
+        return $value;
     }
 
     /**
@@ -343,4 +343,34 @@ protected function getArrValue(array $array, string $key, $default = null)
             ? $array[$key]
             : $default;
     }
+
+    /**
+     * Check if the values array has a key '@type' and if that contains an existing context
+     *
+     * @param array $value
+     * @param string|array $property
+     *
+     * @retrun bool
+     */
+    protected function hasValidContext(array $value, $property)
+    {
+        if (array_key_exists('@type', $value)) {
+            $class_name = __NAMESPACE__ .'\\'. $value['@type'];
+
+            if (!is_array($property)) {
+                $property = [$property];
+            }
+
+            return (in_array($class_name, $property) && class_exists($class_name));
+        }
+
+        return false;
+    }
+
+    protected function makeContext(array $value)
+    {
+        $property = __NAMESPACE__ .'\\'. $value['@type'];
+
+        return $this->getNestedContext($property, $value);
+    }
 }
diff --git a/src/ContextTypes/AggregateOffer.php b/src/ContextTypes/AggregateOffer.php
new file mode 100644
index 0000000..4c54b42
--- /dev/null
+++ b/src/ContextTypes/AggregateOffer.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace JsonLd\ContextTypes;
+
+class AggregateOffer extends Offer
+{
+    /**
+     * Property structure
+     *
+     * @var array
+     */
+    protected $structure = [
+        'highPrice' => null,
+        'lowPrice' => null,
+        'offerCount' => null,
+    ];
+
+}
diff --git a/src/ContextTypes/AggregateRating.php b/src/ContextTypes/AggregateRating.php
index f40ffdc..cabce07 100644
--- a/src/ContextTypes/AggregateRating.php
+++ b/src/ContextTypes/AggregateRating.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class AggregateRating extends AbstractContext
+/**
+ * https://schema.org/AggregateRating
+ */
+class AggregateRating extends Rating
 {
     /**
      * Property structure
@@ -11,9 +14,6 @@ class AggregateRating extends AbstractContext
      */
     protected $structure = [
         'reviewCount' => null,
-        'ratingValue' => null,
-        'bestRating' => null,
-        'worstRating' => null,
         'ratingCount' => null,
         'itemReviewed' => Thing::class,
     ];
diff --git a/src/ContextTypes/Article.php b/src/ContextTypes/Article.php
index fc04d55..3d46487 100644
--- a/src/ContextTypes/Article.php
+++ b/src/ContextTypes/Article.php
@@ -12,27 +12,15 @@ class Article extends CreativeWork
      *
      * @var array
      */
-    private $extendedStructure = [
+    protected $structure = [
         'articleBody' => null,
         'articleSection' => null,
         'pageEnd' => null,
         'pageStart' => null,
         'pagination' => null,
         'wordCount' => null,
-        'mainEntityOfPage' => WebPage::class,
     ];
 
-    /**
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct(
-            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
-        );
-    }
-
     /**
      * {@inheritDoc}
      */
diff --git a/src/ContextTypes/AudioObject.php b/src/ContextTypes/AudioObject.php
new file mode 100644
index 0000000..84089f7
--- /dev/null
+++ b/src/ContextTypes/AudioObject.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace JsonLd\ContextTypes;
+
+/**
+ * https://schema.org/AudioObject
+ */
+class AudioObject extends MediaObject
+{
+    /**
+     * Property structure
+     *
+     * @var array
+     */
+    protected $structure = [
+        'caption' => MediaObject::class,
+        'transcript' => null,
+    ];
+
+}
\ No newline at end of file
diff --git a/src/ContextTypes/Audiobook.php b/src/ContextTypes/Audiobook.php
index 0337410..b0d0624 100644
--- a/src/ContextTypes/Audiobook.php
+++ b/src/ContextTypes/Audiobook.php
@@ -3,30 +3,18 @@
 namespace JsonLd\ContextTypes;
 
 /**
- * https://schema.org/BookFormatType
+ * https://schema.org/Audiobook
  */
-class Audiobook extends Book
+class Audiobook extends AudioObject
 {
     /**
      * Property structure
      *
      * @var array
      */
-    protected $extendedStructure = [
-        'caption' => MediaObject::class,
-        'transcript' => null,
+    protected $structure = [
         'duration' => Duration::class,
         'readBy' => Person::class,
     ];
 
-    /**
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct(
-            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
-        );
-    }
 }
\ No newline at end of file
diff --git a/src/ContextTypes/Beach.php b/src/ContextTypes/Beach.php
index 81d1ecb..21ba6bc 100644
--- a/src/ContextTypes/Beach.php
+++ b/src/ContextTypes/Beach.php
@@ -2,22 +2,15 @@
 
 namespace JsonLd\ContextTypes;
 
-class Beach extends AbstractContext
+/**
+ * https://schema.org/Beach
+ */
+class Beach extends CivicStructure
 {
     /**
      * Property structure
      *
      * @var array
      */
-    protected $structure = [
-        'name' => null,
-        'openingHours' => null,
-        'description' => null,
-        'image' => null,
-        'url' => null,
-        'address' => PostalAddress::class,
-        'geo' => GeoCoordinates::class,
-        'review' => Review::class,
-        'aggregateRating' => AggregateRating::class,
-    ];
+    protected $structure = [];
 }
diff --git a/src/ContextTypes/BlogPosting.php b/src/ContextTypes/BlogPosting.php
index 2413586..519aab3 100644
--- a/src/ContextTypes/BlogPosting.php
+++ b/src/ContextTypes/BlogPosting.php
@@ -2,14 +2,15 @@
 
 namespace JsonLd\ContextTypes;
 
-class BlogPosting extends Article
+/**
+ * https://schema.org/BlogPosting
+ */
+class BlogPosting extends SocialMediaPosting
 {
     /**
      * Property structure
      *
      * @var array
      */
-    protected $extendStructure = [
-        'sharedContent' => CreativeWork::class,
-    ];
+    protected $structure = [];
 }
\ No newline at end of file
diff --git a/src/ContextTypes/Book.php b/src/ContextTypes/Book.php
index 19d4d7b..356075b 100644
--- a/src/ContextTypes/Book.php
+++ b/src/ContextTypes/Book.php
@@ -15,7 +15,7 @@ class Book extends CreativeWork
      *
      * @var array
      */
-    protected $extendedStructure = [
+    protected $structure = [
         'abridged' => null,
         'bookEdition' => null,
         'bookFormat' => BookFormatType::class,
@@ -24,14 +24,4 @@ class Book extends CreativeWork
         'numberOfPages' => null,
     ];
 
-    /**
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct(
-            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
-        );
-    }
 }
\ No newline at end of file
diff --git a/src/ContextTypes/BookFormatType.php b/src/ContextTypes/BookFormatType.php
index 7e2c957..5a653d7 100644
--- a/src/ContextTypes/BookFormatType.php
+++ b/src/ContextTypes/BookFormatType.php
@@ -52,16 +52,5 @@ class BookFormatType extends Enumeration
      *
      * @var array
      */
-    protected $extendedStructure = [];
-
-    /**
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct(
-            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
-        );
-    }
+    protected $structure = [];
 }
\ No newline at end of file
diff --git a/src/ContextTypes/BreadcrumbList.php b/src/ContextTypes/BreadcrumbList.php
index 59c1cc8..e4f5cab 100644
--- a/src/ContextTypes/BreadcrumbList.php
+++ b/src/ContextTypes/BreadcrumbList.php
@@ -2,33 +2,16 @@
 
 namespace JsonLd\ContextTypes;
 
-class BreadcrumbList extends AbstractContext
+/**
+ * https://schema.org/BreadcrumbList
+ */
+class BreadcrumbList extends ItemList
 {
     /**
      * Property structure
      *
      * @var array
      */
-    protected $structure = [
-        'itemListElement' => null,
-    ];
+    protected $structure = [];
 
-    /**
-     * Set the canonical URL of the article page.
-     *
-     * @param array $items
-     *
-     * @return array
-     */
-    protected function setItemListElementAttribute(array $items): array
-    {
-        foreach ($items as $pos => $item) {
-            $items[$pos] = $this->getNestedContext(ListItem::class, [
-                'position' => $pos + 1,
-                'item' => $item
-            ]);
-        }
-
-        return $items;
-    }
 }
\ No newline at end of file
diff --git a/src/ContextTypes/CivicStructure.php b/src/ContextTypes/CivicStructure.php
new file mode 100644
index 0000000..78e5b8c
--- /dev/null
+++ b/src/ContextTypes/CivicStructure.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace JsonLd\ContextTypes;
+
+/**
+ * https://schema.org/CivicStructure
+ */
+class CivicStructure extends Place
+{
+    /**
+     * Property structure
+     *
+     * @var array
+     */
+    protected $structure = [
+        'openingHours' => null,
+    ];
+}
diff --git a/src/ContextTypes/Comment.php b/src/ContextTypes/Comment.php
index 0c3a32e..0a7703c 100644
--- a/src/ContextTypes/Comment.php
+++ b/src/ContextTypes/Comment.php
@@ -12,19 +12,9 @@ class Comment extends CreativeWork
      *
      * @var array
      */
-    private $extendedStructure = [
+    protected $structure = [
         'downvoteCount' => null,
         'upvoteCount' => null,
     ];
 
-    /**
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct(
-            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
-        );
-    }
 }
diff --git a/src/ContextTypes/ContactPoint.php b/src/ContextTypes/ContactPoint.php
index bf6274e..3706193 100644
--- a/src/ContextTypes/ContactPoint.php
+++ b/src/ContextTypes/ContactPoint.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class ContactPoint extends AbstractContext
+/**
+ * https://schema.org/ContactPoint
+ */
+class ContactPoint extends Thing
 {
     /**
      * Property structure
diff --git a/src/ContextTypes/Corporation.php b/src/ContextTypes/Corporation.php
index 98ec2f4..1919f40 100755
--- a/src/ContextTypes/Corporation.php
+++ b/src/ContextTypes/Corporation.php
@@ -2,6 +2,9 @@
 
 namespace JsonLd\ContextTypes;
 
+/**
+ * https://schema.org/Corporation
+ */
 class Corporation extends Organization
 {
     /**
@@ -9,20 +12,8 @@ class Corporation extends Organization
      *
      * @var array
      */
-    private $extendedStructure = [
+    protected $structure = [
         'tickerSymbol' => null,
     ];
 
-    /**
-     * Corporation constructor. Merges extendedStructure up
-     *
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct(
-            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
-        );
-    }
 }
\ No newline at end of file
diff --git a/src/ContextTypes/CreativeWork.php b/src/ContextTypes/CreativeWork.php
index 5cdda45..840c2f9 100644
--- a/src/ContextTypes/CreativeWork.php
+++ b/src/ContextTypes/CreativeWork.php
@@ -12,7 +12,7 @@ class CreativeWork extends Thing
      *
      * @var array
      */
-    private $extendedStructure = [
+    protected $structure = [
         'about' => Thing::class,
         'aggregateRating' => AggregateRating::class,
         'alternativeHeadline' => null,
@@ -35,17 +35,6 @@ class CreativeWork extends Thing
         'video' => VideoObject::class,
     ];
 
-    /**
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct(
-            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
-        );
-    }
-
     /**
      * Set the article body attribute.
      *
@@ -58,57 +47,4 @@ protected function setTextAttribute(string $text): string
         return $this->truncate($text, 260);
     }
 
-    /**
-     * Set the authors
-     *
-     * @param mixed $items
-     *
-     * @return array
-     */
-    protected function setAuthorAttribute($items)
-    {
-        if (is_array($items) === false) {
-            return $items;
-        }
-
-        return array_map(function ($item) {
-            return $this->getNestedContext(Person::class, $item);
-        }, $items);
-    }
-
-    /**
-     * Set the comments
-     *
-     * @param mixed $items
-     *
-     * @return array
-     */
-    protected function setCommentAttribute($items)
-    {
-        if (is_array($items) === false) {
-            return $items;
-        }
-
-        return array_map(function ($item) {
-            return $this->getNestedContext(Comment::class, $item);
-        }, $items);
-    }
-
-    /**
-     * Set the reviews
-     *
-     * @param mixed $items
-     *
-     * @return array
-     */
-    protected function setReviewAttribute($items)
-    {
-        if (is_array($items) === false) {
-            return $items;
-        }
-
-        return array_map(function ($item) {
-            return $this->getNestedContext(Review::class, $item);
-        }, $items);
-    }
 }
diff --git a/src/ContextTypes/Duration.php b/src/ContextTypes/Duration.php
index b63cab6..7695873 100644
--- a/src/ContextTypes/Duration.php
+++ b/src/ContextTypes/Duration.php
@@ -2,16 +2,15 @@
 
 namespace JsonLd\ContextTypes;
 
-class Duration extends AbstractContext
+/**
+ * https://schema.org/Duration
+ */
+class Duration extends Thing
 {
     /**
      * Property structure
      *
      * @var array
      */
-    protected $structure = [
-        'additionalType' => null,
-        'name' => null,
-        'image' => null,
-    ];
+    protected $structure = [];
 }
\ No newline at end of file
diff --git a/src/ContextTypes/Enumeration.php b/src/ContextTypes/Enumeration.php
index 695528b..e8cfa85 100644
--- a/src/ContextTypes/Enumeration.php
+++ b/src/ContextTypes/Enumeration.php
@@ -14,18 +14,8 @@ class Enumeration extends Thing
      *
      * @var array
      */
-    protected $extendedStructure = [
+    protected $structure = [
         'supersededBy' => Enumeration::class,
     ];
 
-    /**
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct(
-            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
-        );
-    }
 }
\ No newline at end of file
diff --git a/src/ContextTypes/Event.php b/src/ContextTypes/Event.php
index a9f2790..21497ef 100644
--- a/src/ContextTypes/Event.php
+++ b/src/ContextTypes/Event.php
@@ -2,6 +2,9 @@
 
 namespace JsonLd\ContextTypes;
 
+/**
+ * https://schema.org/Event
+ */
 class Event extends Thing
 {
     /**
@@ -9,47 +12,11 @@ class Event extends Thing
      *
      * @var array
      */
-    protected $extendedStructure = [
-        'name' => null,
+    protected $structure = [
         'startDate' => null,
         'endDate' => null,
-        'url' => null,
-        'offers' => [],
+        'offers' => Offer::class,
         'location' => Place::class,
     ];
 
-    /**
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct(
-            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
-        );
-    }
-
-    /**
-     * Set offers attributes.
-     *
-     * @param mixed $items
-     *
-     * @return array
-     */
-    protected function setOffersAttribute($items)
-    {
-        if (is_array($items) === false) {
-            return $items;
-        }
-
-        // Check if it is an array with one dimension
-        if (is_array(reset($items)) === false) {
-            return $this->getNestedContext(Offer::class, $items);
-        }
-
-        // Process multi dimensional array
-        return array_map(function ($item) {
-            return $this->getNestedContext(Offer::class, $item);
-        }, $items);
-    }
 }
diff --git a/src/ContextTypes/GeoCoordinates.php b/src/ContextTypes/GeoCoordinates.php
index 6b0c301..c1936d7 100644
--- a/src/ContextTypes/GeoCoordinates.php
+++ b/src/ContextTypes/GeoCoordinates.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class GeoCoordinates extends AbstractContext
+/**
+ * https://schema.org/GeoCoordinates
+ */
+class GeoCoordinates extends Thing
 {
     /**
      * Property structure
diff --git a/src/ContextTypes/HowTo.php b/src/ContextTypes/HowTo.php
new file mode 100644
index 0000000..d0fec9a
--- /dev/null
+++ b/src/ContextTypes/HowTo.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace JsonLd\ContextTypes;
+
+/**
+ * https://schema.org/HowTo
+ */
+class HowTo extends CreativeWork
+{
+    /**
+     * Property structure
+     *
+     * @var array
+     */
+    protected $structure = [
+        'prepTime' => null,
+        'totalTime' => null,
+    ];
+
+}
diff --git a/src/ContextTypes/ImageObject.php b/src/ContextTypes/ImageObject.php
index dac4fa3..c0d3877 100644
--- a/src/ContextTypes/ImageObject.php
+++ b/src/ContextTypes/ImageObject.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class ImageObject extends AbstractContext
+/**
+ * https://schema.org/ImageObject
+ */
+class ImageObject extends MediaObject
 {
     /**
      * Property structure
@@ -10,9 +13,6 @@ class ImageObject extends AbstractContext
      * @var array
      */
     protected $structure = [
-        'url' => null,
-        'height' => null,
-        'width' => null,
         'caption' => null,
         'thumbnail' => ImageObject::class,
     ];
diff --git a/src/ContextTypes/Invoice.php b/src/ContextTypes/Invoice.php
index 65ddce3..97d1dd7 100644
--- a/src/ContextTypes/Invoice.php
+++ b/src/ContextTypes/Invoice.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class Invoice extends AbstractContext
+/**
+ * https://schema.org/Invoice
+ */
+class Invoice extends Thing
 {
     /**
      * Property structure
@@ -14,7 +17,6 @@ class Invoice extends AbstractContext
         'provider' => Organization::class,
         'paymentDueDate' => null,
         'paymentStatus' => null,
-        'url' => null,
         'referencesOrder' => Order::class
     ];
 }
diff --git a/src/ContextTypes/ItemList.php b/src/ContextTypes/ItemList.php
new file mode 100644
index 0000000..3d35478
--- /dev/null
+++ b/src/ContextTypes/ItemList.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace JsonLd\ContextTypes;
+
+/**
+ * https://schema.org/ItemList
+ */
+class ItemList extends Thing
+{
+    /**
+     * Property structure
+     *
+     * @var array
+     */
+    protected $structure = [
+        'itemListElement' => null,
+    ];
+
+    /**
+     * Set the canonical URL of the article page.
+     *
+     * @param array $items
+     *
+     * @return array
+     */
+    protected function setItemListElementAttribute(array $items): array
+    {
+        foreach ($items as $pos => $item) {
+            $items[$pos] = $this->getNestedContext(ListItem::class, [
+                'position' => $pos + 1,
+                'item' => $item
+            ]);
+        }
+
+        return $items;
+    }
+}
\ No newline at end of file
diff --git a/src/ContextTypes/ListItem.php b/src/ContextTypes/ListItem.php
index a611601..38004dc 100644
--- a/src/ContextTypes/ListItem.php
+++ b/src/ContextTypes/ListItem.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class ListItem extends AbstractContext
+/**
+ * https://schema.org/ListItem
+ */
+class ListItem extends Thing
 {
     /**
      * Property structure
diff --git a/src/ContextTypes/LocalBusiness.php b/src/ContextTypes/LocalBusiness.php
index 07c573d..b7743ff 100644
--- a/src/ContextTypes/LocalBusiness.php
+++ b/src/ContextTypes/LocalBusiness.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class LocalBusiness extends AbstractContext
+/**
+ * https://schema.org/LocalBusiness
+ */
+class LocalBusiness extends Organization
 {
     /**
      * Property structure
@@ -10,20 +13,10 @@ class LocalBusiness extends AbstractContext
      * @var array
      */
     protected $structure = [
-        'name' => null,
-        'description' => null,
-        'image' => null,
-        'telephone' => null,
-        'email' => null,
         'openingHours' => null,
-        'address' => PostalAddress::class,
-        'geo' => GeoCoordinates::class,
-        'review' => Review::class,
-        'aggregateRating' => AggregateRating::class,
-        'url' => null,
         'priceRange' => null,
-        'areaServed' => null,
-        'hasMap' => null,
+        'geo' => GeoCoordinates::class, //Property of Place
+        'hasMap' => null, //Property of Place
     ];
 
     /**
diff --git a/src/ContextTypes/MediaObject.php b/src/ContextTypes/MediaObject.php
index 9320dca..762e69b 100644
--- a/src/ContextTypes/MediaObject.php
+++ b/src/ContextTypes/MediaObject.php
@@ -20,7 +20,7 @@ class MediaObject extends CreativeWork
      *
      * @var array
      */
-    protected $extendedStructure = [
+    protected $structure = [
         'associatedArticle' => NewsArticle::class,
         'bitrate' => null,
         'contentSize' => null,
@@ -36,18 +36,9 @@ class MediaObject extends CreativeWork
         'regionsAllowed' => Place::class,
         'requiresSubscription' => null,
         'startTime' => DateTime::class,
+        'thumbnailUrl' => null,
         'uploadDate' => DateTime::class,
         'width' => QuantitativeValue::class,
     ];
 
-    /**
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct(
-            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
-        );
-    }
 }
\ No newline at end of file
diff --git a/src/ContextTypes/MusicAbstractContext.php b/src/ContextTypes/MusicAbstractContext.php
index 8e22cfc..4436e09 100644
--- a/src/ContextTypes/MusicAbstractContext.php
+++ b/src/ContextTypes/MusicAbstractContext.php
@@ -4,6 +4,17 @@
 
 abstract class MusicAbstractContext extends AbstractContext
 {
+    /**
+     * Property structure
+     *
+     * @var array
+     */
+    protected $structure = [
+        '@id' => null,
+        'url' => null,
+        'name' => null,
+    ];
+
     /**
      * Set the canonical URL of the article page.
      *
@@ -35,61 +46,4 @@ protected function setGenreAttribute($items)
         return implode(', ', $items);
     }
 
-    /**
-     * Set artist attribute
-     *
-     * @param mixed $items
-     *
-     * @return array
-     */
-    protected function setByArtistAttribute($items)
-    {
-        if (is_array($items) === false) {
-            return $items;
-        }
-
-        //Check if not multidimensional array (for backward compatibility)
-        if ((count($items) == count($items, COUNT_RECURSIVE))) {
-            return $this->getNestedContext(MusicGroup::class, $items);
-        }
-
-        //multiple artists
-        return array_map(function ($item) {
-            return $this->getNestedContext(MusicGroup::class, $item);
-        }, $items);
-    }
-
-    /**
-     * Set the tracks for a music group
-     *
-     * @param mixed $items
-     *
-     * @return array
-     */
-    protected function setTrackAttribute($items)
-    {
-        if (is_array($items) === false) {
-            return $items;
-        }
-
-        return array_map(function ($item) {
-            return $this->getNestedContext(MusicRecording::class, $item);
-        }, $items);
-    }
-
-    /**
-     * Set image attribute
-     *
-     * @param mixed $item
-     *
-     * @return array
-     */
-    protected function setImageAttribute($item)
-    {
-        if (is_array($item) === false) {
-            return $item;
-        }
-
-        return $this->getNestedContext(ImageObject::class, $item);
-    }
 }
diff --git a/src/ContextTypes/MusicAlbum.php b/src/ContextTypes/MusicAlbum.php
index 7b5f6c0..dacedf8 100644
--- a/src/ContextTypes/MusicAlbum.php
+++ b/src/ContextTypes/MusicAlbum.php
@@ -2,6 +2,9 @@
 
 namespace JsonLd\ContextTypes;
 
+/**
+ * https://schema.org/MusicAlbum
+ */
 class MusicAlbum extends MusicAbstractContext
 {
     /**
@@ -10,14 +13,11 @@ class MusicAlbum extends MusicAbstractContext
      * @var array
      */
     protected $structure = [
-        '@id' => null,
-        'url' => null,
-        'name' => null,
         'description' => null,
         'numTracks' => null,
-        'byArtist' => null,
+        'byArtist' => MusicGroup::class,
         'genre' => null,
-        'track' => null,
-        'image' => null,
+        'track' => MusicRecording::class,
+        'image' => ImageObject::class,
     ];
 }
diff --git a/src/ContextTypes/MusicGroup.php b/src/ContextTypes/MusicGroup.php
index eb2047c..144b2e4 100644
--- a/src/ContextTypes/MusicGroup.php
+++ b/src/ContextTypes/MusicGroup.php
@@ -2,6 +2,9 @@
 
 namespace JsonLd\ContextTypes;
 
+/**
+ * https://schema.org/MusicGroup
+ */
 class MusicGroup extends MusicAbstractContext
 {
     /**
@@ -10,11 +13,8 @@ class MusicGroup extends MusicAbstractContext
      * @var array
      */
     protected $structure = [
-        '@id' => null,
-        'url' => null,
-        'name' => null,
         'description' => null,
-        'track' => null,
-        'image' => null,
+        'track' => MusicRecording::class,
+        'image' => ImageObject::class,
     ];
 }
diff --git a/src/ContextTypes/MusicPlaylist.php b/src/ContextTypes/MusicPlaylist.php
index cf28d25..8433140 100644
--- a/src/ContextTypes/MusicPlaylist.php
+++ b/src/ContextTypes/MusicPlaylist.php
@@ -2,6 +2,9 @@
 
 namespace JsonLd\ContextTypes;
 
+/**
+ * https://schema.org/MusicPlaylist
+ */
 class MusicPlaylist extends MusicAbstractContext
 {
     /**
@@ -10,10 +13,7 @@ class MusicPlaylist extends MusicAbstractContext
      * @var array
      */
     protected $structure = [
-        '@id' => null,
-        'url' => null,
-        'name' => null,
         'numTracks' => null,
-        'track' => null,
+        'track' => MusicRecording::class,
     ];
 }
diff --git a/src/ContextTypes/MusicRecording.php b/src/ContextTypes/MusicRecording.php
index 2f66c21..6854eed 100644
--- a/src/ContextTypes/MusicRecording.php
+++ b/src/ContextTypes/MusicRecording.php
@@ -2,6 +2,9 @@
 
 namespace JsonLd\ContextTypes;
 
+/**
+ * https://schema.org/MusicRecording
+ */
 class MusicRecording extends MusicAbstractContext
 {
     /**
@@ -10,55 +13,13 @@ class MusicRecording extends MusicAbstractContext
      * @var array
      */
     protected $structure = [
-        '@id' => null,
-        'url' => null,
-        'name' => null,
         'duration' => null,
         'genre' => null,
         'description' => null,
-        'byArtist' => null,
-        'inAlbum' => null,
-        'inPlaylist' => null,
+        'byArtist' => MusicGroup::class,
+        'inAlbum' => MusicAlbum::class,
+        'inPlaylist' => MusicPlaylist::class,
         'isrcCode' => null,
     ];
 
-    /**
-     * Set in album attribute
-     *
-     * @param mixed $items
-     *
-     * @return array
-     */
-    protected function setInAlbumAttribute($items)
-    {
-        if (is_array($items) === false) {
-            return $items;
-        }
-
-        //Check if not multidimensional array (for backward compatibility)
-        if ((count($items) == count($items, COUNT_RECURSIVE))) {
-            return $this->getNestedContext(MusicAlbum::class, $items);
-        }
-
-        //multiple albums
-        return array_map(function ($item) {
-            return $this->getNestedContext(MusicAlbum::class, $item);
-        }, $items);
-    }
-
-    /**
-     * Set in playlist attribute
-     *
-     * @param mixed $item
-     *
-     * @return array
-     */
-    protected function setInPlaylistAttribute($item)
-    {
-        if (is_array($item) === false) {
-            return $item;
-        }
-
-        return $this->getNestedContext(MusicPlaylist::class, $item);
-    }
 }
diff --git a/src/ContextTypes/NewsArticle.php b/src/ContextTypes/NewsArticle.php
index dd5690b..4fbd6a9 100644
--- a/src/ContextTypes/NewsArticle.php
+++ b/src/ContextTypes/NewsArticle.php
@@ -2,27 +2,17 @@
 
 namespace JsonLd\ContextTypes;
 
-class NewsArticle extends AbstractContext
+/**
+ * https://schema.org/NewsArticle
+ */
+class NewsArticle extends Article
 {
     /**
      * Property structure
      *
      * @var array
      */
-    protected $structure = [
-        'headline' => null,
-        'description' => null,
-        'url' => null,
-        'mainEntityOfPage' => WebPage::class,
-        'image' => ImageObject::class,
-        'video' => VideoObject::class,
-        'dateCreated' => null,
-        'dateModified' => null,
-        'datePublished' => null,
-        'author' => Person::class,
-        'publisher' => Organization::class,
-        'articleBody' => null,
-    ];
+    protected $structure = [];
 
     /**
      * Set the description attribute.
diff --git a/src/ContextTypes/NutritionInformation.php b/src/ContextTypes/NutritionInformation.php
index bd21a37..b6b3bb9 100755
--- a/src/ContextTypes/NutritionInformation.php
+++ b/src/ContextTypes/NutritionInformation.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class NutritionInformation extends AbstractContext
+/**
+ * https://schema.org/NutritionInformation
+ */
+class NutritionInformation extends Thing
 {
     /**
      * Property structure
diff --git a/src/ContextTypes/Offer.php b/src/ContextTypes/Offer.php
index 38ea9c3..e42f120 100644
--- a/src/ContextTypes/Offer.php
+++ b/src/ContextTypes/Offer.php
@@ -2,6 +2,9 @@
 
 namespace JsonLd\ContextTypes;
 
+/**
+ * https://schema.org/Offer
+ */
 class Offer extends Thing
 {
     /**
@@ -10,14 +13,10 @@ class Offer extends Thing
      * @var array
      */
     protected $structure = [
-        'name' => '',
         'itemOffered' => Product::class,
         'price' => null,
-        'lowPrice' => null,
-        'highPrice' => null,
         'priceCurrency' => null,
         'priceValidUntil' => null,
-        'url' => null,
         'itemCondition' => null,
         'availability' => null,
         'eligibleQuantity' => QuantitativeValue::class,
@@ -25,4 +24,5 @@ class Offer extends Thing
         'validFrom' => null,
         'seller' => Organization::class,
     ];
+
 }
diff --git a/src/ContextTypes/Order.php b/src/ContextTypes/Order.php
index 98def4c..71647f0 100644
--- a/src/ContextTypes/Order.php
+++ b/src/ContextTypes/Order.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class Order extends AbstractContext
+/**
+ * https://schema.org/Order
+ */
+class Order extends Thing
 {
     /**
      * Property structure
@@ -10,13 +13,12 @@ class Order extends AbstractContext
      * @var array
      */
     protected $structure = [
-        'merchant' => Organization::class,
+        'merchant' => Organization::class, //Not an official attribute
         'orderNumber' => null,
         'orderStatus' => null,
-        'priceCurrency' => null,
-        'price' => null,
+        'priceCurrency' => null, //Not an official attribute
+        'price' => null, //Not an official attribute
         'acceptedOffer' => Offer::class,
-        'url' => null,
-        'priceSpecification.name' => null
+        'priceSpecification.name' => null //Not an official attribute
     ];
 }
diff --git a/src/ContextTypes/Organization.php b/src/ContextTypes/Organization.php
index b058f77..0b9786d 100644
--- a/src/ContextTypes/Organization.php
+++ b/src/ContextTypes/Organization.php
@@ -2,6 +2,9 @@
 
 namespace JsonLd\ContextTypes;
 
+/**
+ * https://schema.org/Organization
+ */
 class Organization extends Thing
 {
     /**
@@ -9,68 +12,16 @@ class Organization extends Thing
      *
      * @var array
      */
-    private $extendedStructure = [
+    protected $structure = [
         'address' => PostalAddress::class,
         'logo' => ImageObject::class,
         'contactPoint' => ContactPoint::class,
         'email' => null,
         'hasPOS' => Place::class,
+        'telephone' => null,
+        'review' => Review::class,
+        'aggregateRating' => AggregateRating::class,
+        'areaServed' => null,
     ];
 
-    /**
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct(
-            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
-        );
-    }
-
-    /**
-     * Set the contactPoints
-     *
-     * @param mixed $items
-     *
-     * @return array
-     */
-    protected function setContactPointAttribute($items)
-    {
-        if (is_array($items) === false) {
-            return $items;
-        }
-
-        // Check if it is an array with one dimension
-        if (is_array(reset($items)) === false) {
-            return $this->getNestedContext(ContactPoint::class, $items);
-        }
-
-        //Process multi dimensional array
-        return array_map(function ($item) {
-            return $this->getNestedContext(ContactPoint::class, $item);
-        }, $items);
-    }
-    /**
-     * Set the hasPOS
-     *
-     * @param array $items
-     * @return array
-     */
-    protected function setHasPOSAttribute($items)
-    {
-        if (is_array($items) === false) {
-            return $items;
-        }
-
-        // Check if it is an array with one dimension
-        if (is_array(reset($items)) === false) {
-            return $this->getNestedContext(Place::class, $items);
-        }
-
-        // Process multi dimensional array
-        return array_map(function ($item) {
-            return $this->getNestedContext(Place::class, $item);
-        }, $items);
-    }
 }
diff --git a/src/ContextTypes/Person.php b/src/ContextTypes/Person.php
index 0c5ce87..4cc2def 100644
--- a/src/ContextTypes/Person.php
+++ b/src/ContextTypes/Person.php
@@ -12,7 +12,7 @@ class Person extends Thing
      *
      * @var array
      */
-    protected $extendedStructure = [
+    protected $structure = [
         'additionalName' => null,
         'address' => null, // PostalAddress or Text
         'affiliation' => null,
@@ -39,15 +39,6 @@ class Person extends Thing
         'workLocation' => Place::class,
     ];
 
-    /**
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct($attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure));
-    }
-
     /**
      * Set the address
      *
diff --git a/src/ContextTypes/Place.php b/src/ContextTypes/Place.php
index 819f7fa..53a0fff 100644
--- a/src/ContextTypes/Place.php
+++ b/src/ContextTypes/Place.php
@@ -2,6 +2,9 @@
 
 namespace JsonLd\ContextTypes;
 
+/**
+ * https://schema.org/Place
+ */
 class Place extends Thing
 {
     /**
@@ -9,18 +12,11 @@ class Place extends Thing
      *
      * @var array
      */
-    protected $extendedStructure = [
+    protected $structure = [
         'address' => PostalAddress::class,
         'review' => Review::class,
         'aggregateRating' => AggregateRating::class,
+        'geo' => GeoCoordinates::class,
     ];
 
-    /**
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct($attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure));
-    }
 }
diff --git a/src/ContextTypes/PostalAddress.php b/src/ContextTypes/PostalAddress.php
index e9a53d4..0c47282 100644
--- a/src/ContextTypes/PostalAddress.php
+++ b/src/ContextTypes/PostalAddress.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class PostalAddress extends AbstractContext
+/**
+ * https://schema.org/PostalAddress
+ */
+class PostalAddress extends ContactPoint
 {
     /**
      * Property structure
diff --git a/src/ContextTypes/PriceSpecification.php b/src/ContextTypes/PriceSpecification.php
index 30f2ce3..a806774 100644
--- a/src/ContextTypes/PriceSpecification.php
+++ b/src/ContextTypes/PriceSpecification.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class PriceSpecification extends AbstractContext
+/**
+ * https://schema.org/PriceSpecification
+ */
+class PriceSpecification extends Thing
 {
     /**
      * Property structure
diff --git a/src/ContextTypes/Product.php b/src/ContextTypes/Product.php
index e0b3b3a..752bf39 100644
--- a/src/ContextTypes/Product.php
+++ b/src/ContextTypes/Product.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class Product extends AbstractContext
+/**
+ * https://schema.org/Product
+ */
+class Product extends Thing
 {
     /**
      * Property structure
@@ -10,16 +13,12 @@ class Product extends AbstractContext
      * @var array
      */
     protected $structure = [
-        'name' => null,
-        'description' => null,
         'brand' => null,
-        'image' => null,
         'sku' => null,
         'productID' => null,
-        'url' => null,
         'review' => Review::class,
         'aggregateRating' => AggregateRating::class,
-        'offers' => Offer::class,
+        'offers' => [Offer::class, AggregateOffer::class],
         'gtin8' => null,
         'gtin13' => null,
         'gtin14' => null,
@@ -32,29 +31,4 @@ class Product extends AbstractContext
         'weight' => QuantitativeValue::class,
     ];
 
-    /**
-     * Set isSimilarTo attributes.
-     *
-     * @param mixed $values
-     *
-     * @return mixed
-     */
-    protected function setIsSimilarToAttribute($values)
-    {
-        if (is_array($values)) {
-            foreach ($values as $key => $value) {
-                $product = new self($value);
-
-                $properties = $product->getProperties();
-
-                unset($properties['@context']);
-
-                $properties = array_filter($properties, 'strlen');
-
-                $values[$key] = $properties;
-            }
-        }
-
-        return $values;
-    }
 }
diff --git a/src/ContextTypes/QuantitativeValue.php b/src/ContextTypes/QuantitativeValue.php
index 06fb8ff..ba68fdb 100644
--- a/src/ContextTypes/QuantitativeValue.php
+++ b/src/ContextTypes/QuantitativeValue.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class QuantitativeValue extends AbstractContext
+/**
+ * https://schema.org/QuantitativeValue
+ */
+class QuantitativeValue extends Thing
 {
     /**
      * Property structure
diff --git a/src/ContextTypes/Rating.php b/src/ContextTypes/Rating.php
index 351418c..659600b 100644
--- a/src/ContextTypes/Rating.php
+++ b/src/ContextTypes/Rating.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class Rating extends AbstractContext
+/**
+ * https://schema.org/Rating
+ */
+class Rating extends Thing
 {
     /**
      * Property structure
diff --git a/src/ContextTypes/Recipe.php b/src/ContextTypes/Recipe.php
index 73c99c1..d112411 100755
--- a/src/ContextTypes/Recipe.php
+++ b/src/ContextTypes/Recipe.php
@@ -5,7 +5,7 @@
 /**
  * https://schema.org/Recipe
  */
-class Recipe extends AbstractContext
+class Recipe extends HowTo
 {
     /**
      * Property structure
@@ -13,39 +13,13 @@ class Recipe extends AbstractContext
      * @var array
      */
     protected $structure = [
-        'name' => null,
-        'prepTime' => null,
         'cookTime' => null,
-        'totalTime' => null,
-        'image' => null,
         'recipeCategory' => null,
-        'description' => null,
         'recipeIngredient' => null,
         'recipeInstructions' => null,
         'recipeYield' => null,
         'recipeCuisine' => null,
-        'author' => Person::class,
         'nutrition' => NutritionInformation::class,
-        'aggregateRating' => AggregateRating::class,
-        'review' => Review::class,
-        'video' => VideoObject::class,
     ];
 
-    /**
-     * Set the reviews
-     *
-     * @param mixed $items
-     *
-     * @return mixed
-     */
-    protected function setReviewAttribute($items)
-    {
-        if (is_array($items) === false) {
-            return $items;
-        }
-
-        return array_map(function ($item) {
-            return $this->getNestedContext(Review::class, $item);
-        }, $items);
-    }
 }
diff --git a/src/ContextTypes/Review.php b/src/ContextTypes/Review.php
index 5a3b272..76a8c36 100644
--- a/src/ContextTypes/Review.php
+++ b/src/ContextTypes/Review.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class Review extends AbstractContext
+/**
+ * https://schema.org/Review
+ */
+class Review extends CreativeWork
 {
     /**
      * Property structure
@@ -12,12 +15,7 @@ class Review extends AbstractContext
     protected $structure = [
         'itemReviewed' => Thing::class,
         'reviewRating' => Rating::class,
-        'aggregateRating' => AggregateRating::class,
-        'name' => null,
-        'author' => Person::class,
         'reviewBody' => null,
-        'publisher' => Organization::class,
-        'duration' => Duration::class,
-        'datePublished' => null,
+        'duration' => Duration::class, //Not an official attribute
     ];
 }
\ No newline at end of file
diff --git a/src/ContextTypes/Sculpture.php b/src/ContextTypes/Sculpture.php
index 21f8b0d..4c0cda1 100644
--- a/src/ContextTypes/Sculpture.php
+++ b/src/ContextTypes/Sculpture.php
@@ -2,6 +2,9 @@
 
 namespace JsonLd\ContextTypes;
 
+/**
+ * https://schema.org/Sculpture
+ */
 class Sculpture extends CreativeWork
 {
     /**
@@ -9,18 +12,6 @@ class Sculpture extends CreativeWork
      *
      * @var array
      */
-    private $extendedStructure = [];
+    protected $structure = [];
 
-    /**
-     * Constructor. Merges extendedStructure up
-     *
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct(
-            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
-        );
-    }
 }
diff --git a/src/ContextTypes/SearchBox.php b/src/ContextTypes/SearchBox.php
index 6dae63b..bf016a2 100644
--- a/src/ContextTypes/SearchBox.php
+++ b/src/ContextTypes/SearchBox.php
@@ -2,6 +2,9 @@
 
 namespace JsonLd\ContextTypes;
 
+/**
+ * Not an offical context according to schema.org
+ */
 class SearchBox extends AbstractContext
 {
     /**
diff --git a/src/ContextTypes/SocialMediaPosting.php b/src/ContextTypes/SocialMediaPosting.php
new file mode 100644
index 0000000..c6c68de
--- /dev/null
+++ b/src/ContextTypes/SocialMediaPosting.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace JsonLd\ContextTypes;
+
+/**
+ * https://schema.org/SocialMediaPosting
+ */
+class SocialMediaPosting extends Article
+{
+    /**
+     * Property structure
+     *
+     * @var array
+     */
+    protected $structure = [
+        'sharedContent' => CreativeWork::class,
+    ];
+}
\ No newline at end of file
diff --git a/src/ContextTypes/Thing.php b/src/ContextTypes/Thing.php
index 78eea3c..ac9827b 100644
--- a/src/ContextTypes/Thing.php
+++ b/src/ContextTypes/Thing.php
@@ -17,22 +17,10 @@ class Thing extends AbstractContext
         'description' => null,
         'image' => ImageObject::class,
         'mainEntityOfPage' => WebPage::class,
-        'name' => null,
         'sameAs' => null,
         'url' => null,
     ];
 
-    /**
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        $this->structure = array_merge($this->structure, $extendedStructure);
-
-        parent::__construct($attributes);
-    }
-
     /**
      * Set type attribute.
      *
diff --git a/src/ContextTypes/VideoObject.php b/src/ContextTypes/VideoObject.php
index f9fa118..714a28c 100644
--- a/src/ContextTypes/VideoObject.php
+++ b/src/ContextTypes/VideoObject.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class VideoObject extends AbstractContext
+/**
+ * https://schema.org/VideoObject
+ */
+class VideoObject extends MediaObject
 {
     /**
      * Property structure
@@ -12,20 +15,7 @@ class VideoObject extends AbstractContext
     protected $structure = [
         'actor' => Person::class,
         'director' => Person::class,
-        'associatedArticle' => NewsArticle::class,
-        'bitrate' => null,
-        'contentSize' => null,
-        'contentUrl' => null,
-        'duration' => null,
-        'embedUrl' => null,
-        'url' => null,
-        'height' => null,
-        'width' => null,
-        'uploadDate' => null,
         'caption' => null,
         'thumbnail' => ImageObject::class,
-        'description' => null,
-        'thumbnailUrl' => null,
-        'name' => null,
     ];
 }
diff --git a/src/ContextTypes/WebPage.php b/src/ContextTypes/WebPage.php
index 47f6484..11c824d 100644
--- a/src/ContextTypes/WebPage.php
+++ b/src/ContextTypes/WebPage.php
@@ -2,7 +2,10 @@
 
 namespace JsonLd\ContextTypes;
 
-class WebPage extends AbstractContext
+/**
+ * https://schema.org/WebPage
+ */
+class WebPage extends CreativeWork
 {
     /**
      * Property structure
@@ -10,8 +13,7 @@ class WebPage extends AbstractContext
      * @var array
      */
     protected $structure = [
-        '@id' => null,
-        'url' => null,
+        '@id' => null, //Not an official attribute
     ];
 
     /**
diff --git a/src/ContextTypes/WebSite.php b/src/ContextTypes/WebSite.php
index 64e05eb..68971e4 100644
--- a/src/ContextTypes/WebSite.php
+++ b/src/ContextTypes/WebSite.php
@@ -2,25 +2,15 @@
 
 namespace JsonLd\ContextTypes;
 
-class WebSite extends AbstractContext
+/**
+ * https://schema.org/WebSite
+ */
+class WebSite extends CreativeWork
 {
     /**
      * Property structure
      *
      * @var array
      */
-    protected $structure = [
-        'about' => null,
-        'headline' => null,
-        'image' => null,
-        'name' => null,
-        'url' => null,
-        'publisher' => Organization::class,
-        'keywords' => null,
-        'inLanguage' => null,
-        'dateCreated' => null,
-        'dateModified' => null,
-        'datePublished' => null,
-        'sameAs' => null,
-    ];
+    protected $structure = [];
 }
\ No newline at end of file
diff --git a/tests/ContextTypes/AggregateRatingTest.php b/tests/ContextTypes/AggregateRatingTest.php
index ce93264..3bfd144 100644
--- a/tests/ContextTypes/AggregateRatingTest.php
+++ b/tests/ContextTypes/AggregateRatingTest.php
@@ -31,6 +31,12 @@ public function shouldGetProperties()
         $this->assertEquals(array_merge([
             '@context' => 'http://schema.org',
             '@type' => 'AggregateRating',
+            'name' => '',
+            'alternateName' => '',
+            'description' => '',
+            'image' => '',
+            'mainEntityOfPage' => '',
+            'url' => '',
         ], $this->attributes), $context->getProperties());
     }
 }
diff --git a/tests/ContextTypes/ProductAggregateOfferTest.php b/tests/ContextTypes/ProductAggregateOfferTest.php
new file mode 100644
index 0000000..3e6f584
--- /dev/null
+++ b/tests/ContextTypes/ProductAggregateOfferTest.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace JsonLd\Test\ContextTypes;
+
+use JsonLd\Test\TestCase;
+
+class ProductAggregateOfferTest extends TestCase
+{
+    protected $class = \JsonLd\ContextTypes\Product::class;
+
+    protected $attributes = [
+        'name' => 'Executive Anvil',
+        'category' => 'Droppables / Anvils',
+        'model' => 'Acme Exec. Anvil',
+        'image' => 'http://www.example.com/anvil_executive.jpg',
+        'description' => 'Sleeker than ACME\u0027s Classic Anvil, the Executive Anvil is perfect for the business traveler looking for something to drop from a height.',
+        'sku' => '925872',
+        'brand' => 'Acme Inc.',
+        'aggregateRating' => [
+            'ratingValue' => '4.4',
+            'reviewCount' => '89',
+        ],
+        'offers' => [
+            '@type' => 'AggregateOffer',
+            'offerCount' => '3',
+            'lowPrice' => '109.99',
+            'highPrice' => '129.99',
+            'priceCurrency' => 'USD',
+            'priceValidUntil' => '2020-11-05',
+            'itemCondition' => 'http://schema.org/UsedCondition',
+            'availability' => 'http://schema.org/InStock',
+        ],
+        'isSimilarTo' => [
+            [
+                '@type' => 'Product',
+                'name' => 'Lorem ipsum dolor sit amet.',
+                'category' => 'Vestibulum / Duis',
+                'model' => 'Quisque at tortor',
+                'image' => 'http://www.example.com/lorem_ipsum.jpg',
+                'description' => 'Nulla vestibulum augue turpis, a vehicula diam ultrices vitae. Vivamus suscipit id neque ac venenatis. Interdum et malesuada fames ac ante ipsum primis in faucibus.',
+                'sku' => '925379',
+            ],
+            [
+                '@type' => 'Product',
+                'name' => 'Donec lorem metus, bibendum ut lacus et, bibendum luctus arcu.',
+                'category' => 'Maecenas / Maecenas',
+                'model' => 'Pellentesque mollis felis vitae porta dapibus.',
+                'image' => 'http://www.example.com/porta_ipsum.jpg',
+                'description' => 'Duis tempor velit dui, vel tempor velit posuere eu. Suspendisse rhoncus rhoncus nisl, eu bibendum nunc pharetra at. Quisque dictum diam a tellus ultrices, eu blandit mi auctor.',
+                'sku' => '185359',
+            ],
+        ]
+    ];
+
+    /**
+     * @test
+     */
+    public function shouldHaveOfferObject()
+    {
+        $context = $this->make();
+
+        $this->assertEquals([
+            '@type' => 'AggregateOffer',
+            'priceCurrency' => 'USD',
+            'offerCount' => '3',
+            'lowPrice' => '109.99',
+            'highPrice' => '129.99',
+            'priceValidUntil' => '2020-11-05',
+            'itemCondition' => 'http://schema.org/UsedCondition',
+            'availability' => 'http://schema.org/InStock'
+        ], $context->getProperty('offers'));
+    }
+
+}
diff --git a/tests/ContextTypes/ProductTest.php b/tests/ContextTypes/ProductTest.php
index d98f962..d196c76 100644
--- a/tests/ContextTypes/ProductTest.php
+++ b/tests/ContextTypes/ProductTest.php
@@ -21,6 +21,7 @@ class ProductTest extends TestCase
             'reviewCount' => '89',
         ],
         'offers' => [
+            '@type' => 'Offer',
             'price' => '119.99',
             'priceCurrency' => 'USD',
             'priceValidUntil' => '2020-11-05',
diff --git a/tests/ContextTypes/WebSiteTest.php b/tests/ContextTypes/WebSiteTest.php
index 37eca6a..0bbbcce 100644
--- a/tests/ContextTypes/WebSiteTest.php
+++ b/tests/ContextTypes/WebSiteTest.php
@@ -38,12 +38,29 @@ public function shouldGetProperties()
     {
         $context = $this->make();
 
-        $attributesPlus = $this->attributes;
-        $attributesPlus['@context'] = 'http://schema.org';
-        $attributesPlus["@type"] = 'WebSite';
+        $attributesPlus = array_merge([
+            '@context' => 'http://schema.org',
+            '@type' => 'WebSite',
+            'aggregateRating'    => '',
+            'alternativeHeadline' => '',
+            'author' => '',
+            'comment' => '',
+            'commentCount' => '',
+            'creator' => '',
+            'learningResourceType' => '',
+            'mainEntity' => '',
+            'review' => '',
+            'text' => '',
+            'thumbnailUrl' => '',
+            'video' => '',
+            'alternateName' => '',
+            'description' => '',
+            'mainEntityOfPage' => '',
+        ], $this->attributes);
+
         $attributesPlus["publisher"]["@type"] = 'Organization';
 
-        $this->assertEquals($context->getProperties(), $attributesPlus);
+        $this->assertEquals($attributesPlus, $context->getProperties());
     }
 
     /**