diff --git a/src/Extensions/CWPPageExtension.php b/src/Extensions/CWPPageExtension.php
index 9a7e1e9..097da1b 100644
--- a/src/Extensions/CWPPageExtension.php
+++ b/src/Extensions/CWPPageExtension.php
@@ -2,13 +2,13 @@
 
 namespace CWP\AgencyExtensions\Extensions;
 
+use PageController;
+use SilverStripe\CMS\Controllers\ContentController;
 use SilverStripe\Core\Extension;
 use SilverStripe\SiteConfig\SiteConfig;
 
 /**
- * Class CWPPageExtension
- *
- * @property Page_Controller $owner
+ * @extends Extension<PageController>
  */
 class CWPPageExtension extends Extension
 {
diff --git a/src/Extensions/CWPSiteConfigExtension.php b/src/Extensions/CWPSiteConfigExtension.php
index dd186c7..71f5f48 100644
--- a/src/Extensions/CWPSiteConfigExtension.php
+++ b/src/Extensions/CWPSiteConfigExtension.php
@@ -12,11 +12,11 @@
 use SilverStripe\Forms\FileHandleField;
 use SilverStripe\Forms\TextField;
 use SilverStripe\ORM\DataExtension;
+use SilverStripe\SiteConfig\SiteConfig;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\View\Requirements;
 
 /**
- * Class CWPCleanupSiteConfigExtension
  * @method File AppleTouchIcon114()
  * @method File AppleTouchIcon144()
  * @method File AppleTouchIcon57()
@@ -27,6 +27,8 @@
  * @method Image FooterLogoSecondary()
  * @method Image Logo()
  * @method Image LogoRetina()
+ *
+ * @extends DataExtension<SiteConfig>
  */
 class CWPSiteConfigExtension extends DataExtension
 {
diff --git a/src/Extensions/CarouselPageExtension.php b/src/Extensions/CarouselPageExtension.php
index e264233..4b913ff 100644
--- a/src/Extensions/CarouselPageExtension.php
+++ b/src/Extensions/CarouselPageExtension.php
@@ -3,6 +3,7 @@
 namespace CWP\AgencyExtensions\Extensions;
 
 use CWP\AgencyExtensions\Model\CarouselItem;
+use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Forms\TextField;
 use SilverStripe\ORM\DataExtension;
 use SilverStripe\Forms\FieldList;
@@ -19,6 +20,8 @@
 
 /**
  * @method SilverStripe\ORM\HasManyList<CarouselItem> CarouselItems()
+ *
+ * @extends DataExtension<SiteTree>
  */
 class CarouselPageExtension extends DataExtension
 {
@@ -35,7 +38,7 @@ class CarouselPageExtension extends DataExtension
     ];
 
     /**
-     * @return DataList
+     * @return DataList<CarouselItem>
      */
     public function getCarouselItems()
     {