diff --git a/src/Authenticator/LoginHandler.php b/src/Authenticator/LoginHandler.php
index 0922f675..7f764d7c 100644
--- a/src/Authenticator/LoginHandler.php
+++ b/src/Authenticator/LoginHandler.php
@@ -289,7 +289,6 @@ public function finishRegistration(HTTPRequest $request): HTTPResponse
         }
 
         // If we've completed registration and the member is not already logged in then we need to log them in
-        /** @var EnforcementManager $enforcementManager */
         $enforcementManager = EnforcementManager::create();
         $mustLogin = $request->getSession()->get(static::SESSION_KEY . '.mustLogin');
 
@@ -457,7 +456,6 @@ public function redirectAfterSuccessfulLogin(): HTTPResponse
         }
 
         $request = $this->getRequest();
-        /** @var EnforcementManager $enforcementManager */
         $enforcementManager = EnforcementManager::create();
 
         // Assert that the member has a valid registration.
@@ -469,7 +467,6 @@ public function redirectAfterSuccessfulLogin(): HTTPResponse
             && !$enforcementManager->hasCompletedRegistration($member)
         ) {
             // Log them out again
-            /** @var IdentityStore $identityStore */
             $identityStore = Injector::inst()->get(IdentityStore::class);
             $identityStore->logOut($request);
 
diff --git a/src/BackupCode/RegisterHandler.php b/src/BackupCode/RegisterHandler.php
index 7d81a55c..7f2563a5 100644
--- a/src/BackupCode/RegisterHandler.php
+++ b/src/BackupCode/RegisterHandler.php
@@ -54,10 +54,8 @@ public function start(StoreInterface $store): array
         // Create or update the RegisteredMethod on the member. This breaks the normal flow as it's created on "start"
         // instead of after receiving a response from the user
 
-        /** @var MethodInterface $method */
         $method = Injector::inst()->get(Method::class);
 
-        /** @var BackupCodeGeneratorInterface $generator */
         $generator = Injector::inst()->get(BackupCodeGeneratorInterface::class);
         $codes = $generator->generate();
 
diff --git a/src/Extension/AccountReset/MFAResetExtension.php b/src/Extension/AccountReset/MFAResetExtension.php
index 18cee54b..bc5c655b 100644
--- a/src/Extension/AccountReset/MFAResetExtension.php
+++ b/src/Extension/AccountReset/MFAResetExtension.php
@@ -13,7 +13,7 @@
  * resets the 'MFA Skipped' flag on the member so that they are prompted to
  * set up MFA again when they next log in.
  *
- * @package SilverStripe\MFA\Extension\AccountReset
+ * @extends Extension<SecurityExtension>
  */
 class MFAResetExtension extends Extension
 {
diff --git a/src/Extension/AccountReset/MemberExtension.php b/src/Extension/AccountReset/MemberExtension.php
index d73838ae..1ef3cc34 100644
--- a/src/Extension/AccountReset/MemberExtension.php
+++ b/src/Extension/AccountReset/MemberExtension.php
@@ -14,10 +14,10 @@
 /**
  * Provides DB columns / methods for account resets on Members
  *
- * @package SilverStripe\MFA\Extension
- * @property Member&MemberExtension $owner
  * @property string $AccountResetHash
  * @property DBDatetime $AccountResetExpired
+ *
+ * @extends DataExtension<Member&static>
  */
 class MemberExtension extends DataExtension
 {
diff --git a/src/Extension/AccountReset/SecurityAdminExtension.php b/src/Extension/AccountReset/SecurityAdminExtension.php
index f4bc79d6..513bba0c 100644
--- a/src/Extension/AccountReset/SecurityAdminExtension.php
+++ b/src/Extension/AccountReset/SecurityAdminExtension.php
@@ -23,8 +23,7 @@
  * This extension is applied to SecurityAdmin to provide an additional endpoint
  * for sending account reset requests.
  *
- * @package SilverStripe\MFA\Extension
- * @property SecurityAdmin $owner
+ * @extends Extension<SecurityAdmin>
  */
 class SecurityAdminExtension extends Extension
 {
@@ -84,7 +83,6 @@ public function reset(HTTPRequest $request): HTTPResponse
             );
         }
 
-        /** @var Member $memberToReset */
         $memberToReset = Member::get()->byID($request->param('ID'));
 
         if ($memberToReset === null) {
diff --git a/src/Extension/AccountReset/SecurityExtension.php b/src/Extension/AccountReset/SecurityExtension.php
index d967f42b..144cdcd6 100644
--- a/src/Extension/AccountReset/SecurityExtension.php
+++ b/src/Extension/AccountReset/SecurityExtension.php
@@ -25,8 +25,7 @@
  * itself be extended to add procedures to the reset action (such as removing
  * additional authentication factors, sending alerts, etc.)
  *
- * @package SilverStripe\MFA\Extension
- * @property Security $owner
+ * @extends Extension<Security>
  */
 class SecurityExtension extends Extension
 {
diff --git a/src/Extension/MemberExtension.php b/src/Extension/MemberExtension.php
index 06c5b562..bc072337 100644
--- a/src/Extension/MemberExtension.php
+++ b/src/Extension/MemberExtension.php
@@ -24,8 +24,9 @@
  * @property MethodInterface $DefaultRegisteredMethod
  * @property string $DefaultRegisteredMethodID
  * @property bool $HasSkippedMFARegistration
- * @property Member|MemberExtension $owner
  * @method HasManyList<RegisteredMethod> RegisteredMFAMethods()
+ *
+ * @extends DataExtension<Member&static>
  */
 class MemberExtension extends DataExtension implements PermissionProvider
 {
diff --git a/src/Extension/RequirementsExtension.php b/src/Extension/RequirementsExtension.php
index d8f8a108..10963245 100644
--- a/src/Extension/RequirementsExtension.php
+++ b/src/Extension/RequirementsExtension.php
@@ -6,6 +6,9 @@
 use SilverStripe\Core\Extension;
 use SilverStripe\MFA\RequestHandler\BaseHandlerTrait;
 
+/**
+ * @extends Extension<LeftAndMain>
+ */
 class RequirementsExtension extends Extension
 {
     use BaseHandlerTrait;
diff --git a/src/Extension/SiteConfigExtension.php b/src/Extension/SiteConfigExtension.php
index 186cd38f..2487d4f0 100644
--- a/src/Extension/SiteConfigExtension.php
+++ b/src/Extension/SiteConfigExtension.php
@@ -9,6 +9,7 @@
 use SilverStripe\Forms\OptionsetField;
 use SilverStripe\ORM\DataExtension;
 use SilverStripe\ORM\FieldType\DBField;
+use SilverStripe\SiteConfig\SiteConfig;
 use SilverStripe\View\Requirements;
 
 /**
@@ -16,6 +17,8 @@
  *
  * @property bool $MFARequired
  * @property string $MFAGracePeriodExpires
+ *
+ * @extends DataExtension<SiteConfig>
  */
 class SiteConfigExtension extends DataExtension
 {
diff --git a/src/FormField/RegisteredMFAMethodListField.php b/src/FormField/RegisteredMFAMethodListField.php
index 4c0e0c95..a2cacf2d 100644
--- a/src/FormField/RegisteredMFAMethodListField.php
+++ b/src/FormField/RegisteredMFAMethodListField.php
@@ -46,7 +46,6 @@ public function getSchemaDataDefaults()
         if (!$this->value && $this->getForm() && $this->getForm()->getRecord() instanceof Member) {
             $member = $this->getForm()->getRecord();
         } else {
-            /** @var Member $member */
             $member = DataObject::get_by_id(Member::class, $this->value);
         }
 
diff --git a/src/Report/EnabledMembers.php b/src/Report/EnabledMembers.php
index bc6e6c94..828fc36f 100644
--- a/src/Report/EnabledMembers.php
+++ b/src/Report/EnabledMembers.php
@@ -31,7 +31,7 @@ class EnabledMembers extends Report
      * Cached registered methods fetched for the current list of members. This should only be populated at render time
      * as methods will be fetched for the current "records" on the report
      *
-     * @var DataList|null
+     * @var DataList<RegisteredMethod>|ArrayList<RegisteredMethod>|null
      */
     private $registeredMethods = null;
 
@@ -49,7 +49,7 @@ public function description(): string
      * Supplies the list displayed in the report
      *
      * @param array $params
-     * @return DataList
+     * @return DataList<Member>
      */
     public function sourceRecords($params): DataList
     {
@@ -161,7 +161,7 @@ protected function getMethodClassToTitleMapping(): array
     }
 
     /**
-     * @return ArrayList
+     * @return ArrayList<RegisteredMethod>
      */
     protected function getRegisteredMethodsForRecords(): ArrayList
     {
diff --git a/src/Service/RegisteredMethodManager.php b/src/Service/RegisteredMethodManager.php
index 75b8e16c..71dadf97 100644
--- a/src/Service/RegisteredMethodManager.php
+++ b/src/Service/RegisteredMethodManager.php
@@ -161,7 +161,6 @@ public function deleteFromMember(Member $member, MethodInterface $method): bool
         $remainingMethods = $member->RegisteredMFAMethods()->count();
         if ($remainingMethods === 2) {
             // If there is only one other method (other than backup codes) then set that as the default method
-            /** @var RegisteredMethod|null $remainingMethodExceptBackup */
             $remainingMethodExceptBackup = $member->RegisteredMFAMethods()
                 ->filter('MethodClassName:Not', $backupMethod)
                 ->first();