diff --git a/src/MemberReportExtension.php b/src/MemberReportExtension.php
index b9e48c9..d266f2d 100644
--- a/src/MemberReportExtension.php
+++ b/src/MemberReportExtension.php
@@ -6,11 +6,14 @@
 use SilverStripe\Security\Group;
 use SilverStripe\Security\Permission;
 use SilverStripe\Security\LoginAttempt;
+use SilverStripe\Security\Member;
 use SilverStripe\Subsites\Model\Subsite;
 
 /**
  * Extends the {@see Member} class with additional descriptions for elements.
  * See {@see UserSecurityReport} for usage.
+ *
+ * @extends DataExtension<Member>
  */
 class MemberReportExtension extends DataExtension
 {
@@ -63,7 +66,6 @@ public function getGroupsDescription()
             // Collect the group names
             $groupNames = array();
             foreach ($groups as $group) {
-                /** @var Group $group */
                 $groupNames[] = html_entity_decode($group->getTreeTitle() ?? '');
             }
             // return a csv string of the group names, sans-markup
diff --git a/src/Subsites/SubsiteMemberReportExtension.php b/src/Subsites/SubsiteMemberReportExtension.php
index e74166a..f491988 100644
--- a/src/Subsites/SubsiteMemberReportExtension.php
+++ b/src/Subsites/SubsiteMemberReportExtension.php
@@ -3,16 +3,19 @@
 namespace SilverStripe\SecurityReport\Subsites;
 
 use SilverStripe\ORM\DataExtension;
+use SilverStripe\Security\Member;
 use SilverStripe\Subsites\Model\Subsite;
 
 /**
  * Adds 'SubsiteDescription' for to show which subsites this Member has edit access to
  *
  * @author Damian Mooyman <damian@silverstripe.com>
+ *
+ * @extends DataExtension<Member>
  */
 class SubsiteMemberReportExtension extends DataExtension
 {
-    
+
     /**
      * Set cast of additional field
      *
@@ -22,7 +25,7 @@ class SubsiteMemberReportExtension extends DataExtension
     private static $casting = array(
         'SubsiteDescription' => 'Text'
     );
-    
+
     /**
      * Default permission to filter for
      *
@@ -30,7 +33,7 @@ class SubsiteMemberReportExtension extends DataExtension
      * @config
      */
     private static $subsite_description_permission = 'SITETREE_EDIT_ALL';
-    
+
     /**
      * Describes the subsites this user has SITETREE_EDIT_ALL access to
      *