diff --git a/modules/addons/ispapidomainimport/ispapidomainimport.php b/modules/addons/ispapidomainimport/ispapidomainimport.php
index 5955bb3..b4c8648 100644
--- a/modules/addons/ispapidomainimport/ispapidomainimport.php
+++ b/modules/addons/ispapidomainimport/ispapidomainimport.php
@@ -13,13 +13,9 @@
 $module_version = "2.0.12";
 
 use WHMCS\Module\Addon\IspapiDomainImport\Admin\AdminDispatcher;
-if (!class_exists("ISPAPI\\LoadRegistrars")) {
-    require_once(implode(DIRECTORY_SEPARATOR, array(ROOTDIR,"modules","registrars","ispapi","lib","LoadRegistrars.class.php")));
-}
-if (!class_exists("ISPAPI\\Helper")) {
-    require_once(implode(DIRECTORY_SEPARATOR, array(ROOTDIR,"modules","registrars","ispapi","lib","Helper.class.php")));
-}
-use ISPAPI\LoadRegistrars;
+
+use WHMCS\Module\Registrar\Ispapi\Ispapi;
+use WHMCS\Module\Registrar\Ispapi\LoadRegistrars;
 
 /**
  * Define addon module configuration parameters.
diff --git a/modules/addons/ispapidomainimport/lib/Admin/Controller.php b/modules/addons/ispapidomainimport/lib/Admin/Controller.php
index ace8811..e303b0e 100644
--- a/modules/addons/ispapidomainimport/lib/Admin/Controller.php
+++ b/modules/addons/ispapidomainimport/lib/Admin/Controller.php
@@ -2,7 +2,8 @@
 
 namespace WHMCS\Module\Addon\IspapiDomainImport\Admin;
 
-use ISPAPI\Helper;
+use WHMCS\Module\Registrar\Ispapi\Ispapi;
+use WHMCS\Module\Registrar\Ispapi\Helper;
 
 /**
  * Admin Area Controller
@@ -49,7 +50,7 @@ public function pull()
         header('Content-type: application/json; charset=utf-8');
 
         // fetch list of domains from API
-        $r = Helper::APICall($_REQUEST['registrar'], array(
+        $r = Ispapi::call(array(
             "COMMAND" => "QueryDomainList",
             "USERDEPTH" => "SELF",
             "ORDERBY" => "DOMAIN",