diff --git a/includes/admin/health/class-site_health.php b/includes/admin/health/class-site_health.php
index 59c650d..2cff365 100644
--- a/includes/admin/health/class-site_health.php
+++ b/includes/admin/health/class-site_health.php
@@ -5,7 +5,7 @@
 if (!defined('ABSPATH')) exit;
 
 
-if (!class_exists('\OES\Admin\Health\Site_Health')) {
+if (!class_exists('\OES\Admin\Health\Site_Health', false)) {
 
     /**
      * The OES Site Health class responsible for populating OES debug information in WordPress Site Health.
diff --git a/includes/admin/operations/class-display_builder.php b/includes/admin/operations/class-display_builder.php
index 43cc3b1..214a997 100644
--- a/includes/admin/operations/class-display_builder.php
+++ b/includes/admin/operations/class-display_builder.php
@@ -6,7 +6,7 @@
     exit;
 }
 
-if (!class_exists('Display_Builder')) :
+if (!class_exists('Display_Builder', false)) :
 
     /**
      * Class Display_Builder
diff --git a/includes/admin/operations/class-executor.php b/includes/admin/operations/class-executor.php
index cb8f6e4..95d0f89 100644
--- a/includes/admin/operations/class-executor.php
+++ b/includes/admin/operations/class-executor.php
@@ -8,7 +8,7 @@
 
 use WP_Error;
 
-if (!class_exists('Executor')) :
+if (!class_exists('Executor', false)) :
 
     /**
      * Class Executor
diff --git a/includes/admin/operations/class-operation.php b/includes/admin/operations/class-operation.php
index 2d3502e..96ca625 100644
--- a/includes/admin/operations/class-operation.php
+++ b/includes/admin/operations/class-operation.php
@@ -6,7 +6,7 @@
     exit;
 }
 
-if (!class_exists('Operation')) :
+if (!class_exists('Operation', false)) :
 
     /**
      * Class Operation
diff --git a/includes/admin/operations/class-repository.php b/includes/admin/operations/class-repository.php
index ce42208..c76f3ee 100644
--- a/includes/admin/operations/class-repository.php
+++ b/includes/admin/operations/class-repository.php
@@ -6,7 +6,7 @@
     exit;
 }
 
-if (!class_exists('Repository')) :
+if (!class_exists('Repository', false)) :
 
     /**
      * Class Repository
diff --git a/includes/admin/pages/class-container.php b/includes/admin/pages/class-container.php
index 3644e31..b94e5df 100755
--- a/includes/admin/pages/class-container.php
+++ b/includes/admin/pages/class-container.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Page')) oes_include('admin/pages/class-page.php');
+if (!class_exists('Page', false)) oes_include('admin/pages/class-page.php');
 
-if (!class_exists('Container')) :
+if (!class_exists('Container', false)) :
 
     /**
      * Class Container
diff --git a/includes/admin/pages/class-module_page.php b/includes/admin/pages/class-module_page.php
index bcfeb97..853c926 100644
--- a/includes/admin/pages/class-module_page.php
+++ b/includes/admin/pages/class-module_page.php
@@ -9,7 +9,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Module_Page')) :
+if (!class_exists('Module_Page', false)) :
 
     /**
      * Class Module_Page
diff --git a/includes/admin/pages/class-page.php b/includes/admin/pages/class-page.php
index 257f7bf..41f900e 100755
--- a/includes/admin/pages/class-page.php
+++ b/includes/admin/pages/class-page.php
@@ -9,7 +9,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Page')) :
+if (!class_exists('Page', false)) :
 
     /**
      * Class Page
diff --git a/includes/admin/pages/class-subpage.php b/includes/admin/pages/class-subpage.php
index c157a50..c552951 100755
--- a/includes/admin/pages/class-subpage.php
+++ b/includes/admin/pages/class-subpage.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Page')) oes_include('admin/pages/class-page.php');
+if (!class_exists('Page', false)) oes_include('admin/pages/class-page.php');
 
-if (!class_exists('Subpage')) :
+if (!class_exists('Subpage', false)) :
 
     /**
      * Class Subpage
diff --git a/includes/admin/tools/class-factory_service.php b/includes/admin/tools/class-factory_service.php
index f289477..b604830 100644
--- a/includes/admin/tools/class-factory_service.php
+++ b/includes/admin/tools/class-factory_service.php
@@ -12,7 +12,7 @@
 use function OES\ACF\is_acf_generated_key;
 use function OES\Factory\get_factory_posts;
 
-if (class_exists('Factory_Service')) exit;
+if (class_exists('Factory_Service', false)) exit;
 
 /**
  * Class Service
diff --git a/includes/admin/tools/class-form_table.php b/includes/admin/tools/class-form_table.php
index b975e4b..1fc529e 100644
--- a/includes/admin/tools/class-form_table.php
+++ b/includes/admin/tools/class-form_table.php
@@ -7,7 +7,7 @@
 
 namespace OES\Admin\Tools;
 
-if (class_exists('Form_Table')) exit;
+if (class_exists('Form_Table', false)) exit;
 
 /**
  * Class Form_Table
diff --git a/includes/admin/tools/class-tool-batch.php b/includes/admin/tools/class-tool-batch.php
index e286a00..19acdbf 100644
--- a/includes/admin/tools/class-tool-batch.php
+++ b/includes/admin/tools/class-tool-batch.php
@@ -11,7 +11,7 @@
 
 use WP_Query;
 
-if (class_exists('Batch')) exit;
+if (class_exists('Batch', false)) exit;
 
 /**
  * Class Batch
diff --git a/includes/admin/tools/class-tool-export.php b/includes/admin/tools/class-tool-export.php
index b63b6bd..77c9c32 100644
--- a/includes/admin/tools/class-tool-export.php
+++ b/includes/admin/tools/class-tool-export.php
@@ -13,7 +13,7 @@
 use WP_Term;
 use WP_Post;
 
-if (class_exists('Export')) exit;
+if (class_exists('Export', false)) exit;
 
 /**
  * Class Export
diff --git a/includes/admin/tools/class-tool-factory.php b/includes/admin/tools/class-tool-factory.php
index c50ee13..4f34722 100644
--- a/includes/admin/tools/class-tool-factory.php
+++ b/includes/admin/tools/class-tool-factory.php
@@ -12,7 +12,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (class_exists('Factory')) exit;
+if (class_exists('Factory', false)) exit;
 
 /**
  * Class Factory
diff --git a/includes/admin/tools/class-tool-import.php b/includes/admin/tools/class-tool-import.php
index ad7aeae..0c67b3d 100644
--- a/includes/admin/tools/class-tool-import.php
+++ b/includes/admin/tools/class-tool-import.php
@@ -10,7 +10,7 @@
 use function OES\Admin\Operations\insert_operation;
 use function OES\Admin\Operations\get_max_temp;
 
-if (!class_exists('Import')) :
+if (!class_exists('Import', false)) :
 
     /**
      * Class Import
diff --git a/includes/admin/tools/class-tool-model.php b/includes/admin/tools/class-tool-model.php
index 0c68337..4ad1295 100644
--- a/includes/admin/tools/class-tool-model.php
+++ b/includes/admin/tools/class-tool-model.php
@@ -12,7 +12,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Model')) :
+if (!class_exists('Model', false)) :
 
     /**
      * Class Model
diff --git a/includes/admin/tools/class-tool-shortcode.php b/includes/admin/tools/class-tool-shortcode.php
index 683db63..266b927 100644
--- a/includes/admin/tools/class-tool-shortcode.php
+++ b/includes/admin/tools/class-tool-shortcode.php
@@ -4,9 +4,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('\OES\Admin\Tools\Config')) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('\OES\Admin\Tools\Config', false)) oes_include('admin/tools/config/class-config.php');
 
-if (!class_exists('Shortcode')) :
+if (!class_exists('Shortcode', false)) :
 
     /**
      * Class Shortcode
diff --git a/includes/admin/tools/class-tool.php b/includes/admin/tools/class-tool.php
index 993369e..c55b441 100644
--- a/includes/admin/tools/class-tool.php
+++ b/includes/admin/tools/class-tool.php
@@ -12,7 +12,7 @@
 use function OES\Admin\add_oes_notice_after_refresh;
 use function OES\Admin\get_admin_note_html;
 
-if (!class_exists('\OES\Admin\Tools\Tool')) {
+if (!class_exists('\OES\Admin\Tools\Tool', false)) {
 
     /**
      * Class Tool
diff --git a/includes/admin/tools/config/class-config-admin_columns.php b/includes/admin/tools/config/class-config-admin_columns.php
index c6876dc..f40d3ea 100644
--- a/includes/admin/tools/config/class-config-admin_columns.php
+++ b/includes/admin/tools/config/class-config-admin_columns.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
 
-if (class_exists('Admin_Columns')) exit;
+if (class_exists('Admin_Columns', false)) exit;
 
 /**
  * Class Admin Columns
diff --git a/includes/admin/tools/config/class-config-admin_container.php b/includes/admin/tools/config/class-config-admin_container.php
index bc75a70..3573a70 100644
--- a/includes/admin/tools/config/class-config-admin_container.php
+++ b/includes/admin/tools/config/class-config-admin_container.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
 
-if (class_exists('Admin_Container')) exit;
+if (class_exists('Admin_Container', false)) exit;
 
 /**
  * Class Admin_Container
diff --git a/includes/admin/tools/config/class-config-application.php b/includes/admin/tools/config/class-config-application.php
index 053947f..beb957a 100644
--- a/includes/admin/tools/config/class-config-application.php
+++ b/includes/admin/tools/config/class-config-application.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
 
-if (class_exists('Application')) exit;
+if (class_exists('Application', false)) exit;
 
 /**
  * Class Application
diff --git a/includes/admin/tools/config/class-config-module.php b/includes/admin/tools/config/class-config-module.php
index fa3c401..d044910 100644
--- a/includes/admin/tools/config/class-config-module.php
+++ b/includes/admin/tools/config/class-config-module.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
 
-if (class_exists('Module')) exit;
+if (class_exists('Module', false)) exit;
 
 /**
  * Class Module
diff --git a/includes/admin/tools/config/class-config-schema.php b/includes/admin/tools/config/class-config-schema.php
index ae41a8a..48afc8a 100644
--- a/includes/admin/tools/config/class-config-schema.php
+++ b/includes/admin/tools/config/class-config-schema.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('\OES\Admin\Tools\Config')) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('\OES\Admin\Tools\Config', false)) oes_include('admin/tools/config/class-config.php');
 
-if (class_exists('Schema')) exit;
+if (class_exists('Schema', false)) exit;
 
 /**
  * Class Schema
diff --git a/includes/admin/tools/config/class-config-schema_oes.php b/includes/admin/tools/config/class-config-schema_oes.php
index 2ef8411..d562da7 100644
--- a/includes/admin/tools/config/class-config-schema_oes.php
+++ b/includes/admin/tools/config/class-config-schema_oes.php
@@ -9,10 +9,10 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
-if (!class_exists('Schema')) oes_include('admin/tools/config/class-config-schema.php');
+if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('Schema', false)) oes_include('admin/tools/config/class-config-schema.php');
 
-if (class_exists('Schema_OES')) exit;
+if (class_exists('Schema_OES', false)) exit;
 
 /**
  * Class Schema_OES
diff --git a/includes/admin/tools/config/class-config-schema_oes_archive.php b/includes/admin/tools/config/class-config-schema_oes_archive.php
index f18343b..c6381f3 100644
--- a/includes/admin/tools/config/class-config-schema_oes_archive.php
+++ b/includes/admin/tools/config/class-config-schema_oes_archive.php
@@ -9,10 +9,10 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
-if (!class_exists('Schema')) oes_include('admin/tools/config/class-config-schema.php');
+if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('Schema', false)) oes_include('admin/tools/config/class-config-schema.php');
 
-if (class_exists('Schema_OES_Archive')) exit;
+if (class_exists('Schema_OES_Archive', false)) exit;
 
 /**
  * Class Schema_OES_Archive
diff --git a/includes/admin/tools/config/class-config-schema_oes_single.php b/includes/admin/tools/config/class-config-schema_oes_single.php
index 2611e35..056b583 100644
--- a/includes/admin/tools/config/class-config-schema_oes_single.php
+++ b/includes/admin/tools/config/class-config-schema_oes_single.php
@@ -9,10 +9,10 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
-if (!class_exists('Schema')) oes_include('admin/tools/config/class-config-schema.php');
+if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('Schema', false)) oes_include('admin/tools/config/class-config-schema.php');
 
-if (class_exists('Schema_OES_Single')) exit;
+if (class_exists('Schema_OES_Single', false)) exit;
 
 /**
  * Class Schema_OES_Single
diff --git a/includes/admin/tools/config/class-config-theme_colors.php b/includes/admin/tools/config/class-config-theme_colors.php
index 3648c0f..a5f3ca1 100644
--- a/includes/admin/tools/config/class-config-theme_colors.php
+++ b/includes/admin/tools/config/class-config-theme_colors.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
 
-if (class_exists('Theme_Colors')) exit;
+if (class_exists('Theme_Colors', false)) exit;
 
 /**
  * Class Theme_Colors
diff --git a/includes/admin/tools/config/class-config-theme_date.php b/includes/admin/tools/config/class-config-theme_date.php
index 887d201..27f32d3 100644
--- a/includes/admin/tools/config/class-config-theme_date.php
+++ b/includes/admin/tools/config/class-config-theme_date.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
 
-if (class_exists('Theme_Date')) exit;
+if (class_exists('Theme_Date', false)) exit;
 
 /**
  * Class Theme_Date
diff --git a/includes/admin/tools/config/class-config-theme_index_pages.php b/includes/admin/tools/config/class-config-theme_index_pages.php
index 546770d..dfd9462 100644
--- a/includes/admin/tools/config/class-config-theme_index_pages.php
+++ b/includes/admin/tools/config/class-config-theme_index_pages.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
 
-if (class_exists('Theme_Index_Pages')) exit;
+if (class_exists('Theme_Index_Pages', false)) exit;
 
 /**
  * Class Theme_Index_Pages
diff --git a/includes/admin/tools/config/class-config-theme_labels.php b/includes/admin/tools/config/class-config-theme_labels.php
index 95fe548..9302037 100644
--- a/includes/admin/tools/config/class-config-theme_labels.php
+++ b/includes/admin/tools/config/class-config-theme_labels.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
 
-if (class_exists('Theme_Labels')) exit;
+if (class_exists('Theme_Labels', false)) exit;
 
 /**
  * Class Theme_Labels
diff --git a/includes/admin/tools/config/class-config-theme_labels_general.php b/includes/admin/tools/config/class-config-theme_labels_general.php
index 2022cc4..0ad9632 100644
--- a/includes/admin/tools/config/class-config-theme_labels_general.php
+++ b/includes/admin/tools/config/class-config-theme_labels_general.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Theme_Labels')) oes_include('admin/tools/config/class-config-theme_labels.php');
+if (!class_exists('Theme_Labels', false)) oes_include('admin/tools/config/class-config-theme_labels.php');
 
-if (class_exists('Theme_Labels_General')) exit;
+if (class_exists('Theme_Labels_General', false)) exit;
 
 /**
  * Class Theme_Labels_General
diff --git a/includes/admin/tools/config/class-config-theme_labels_media.php b/includes/admin/tools/config/class-config-theme_labels_media.php
index df07575..e75c2f0 100644
--- a/includes/admin/tools/config/class-config-theme_labels_media.php
+++ b/includes/admin/tools/config/class-config-theme_labels_media.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Theme_Labels')) oes_include('admin/tools/config/class-config-theme_labels.php');
+if (!class_exists('Theme_Labels', false)) oes_include('admin/tools/config/class-config-theme_labels.php');
 
-if (class_exists('Theme_Labels_Media')) exit;
+if (class_exists('Theme_Labels_Media', false)) exit;
 
 /**
  * Class Theme_Labels_Media
diff --git a/includes/admin/tools/config/class-config-theme_labels_objects.php b/includes/admin/tools/config/class-config-theme_labels_objects.php
index 5dd8a83..8ea9c17 100644
--- a/includes/admin/tools/config/class-config-theme_labels_objects.php
+++ b/includes/admin/tools/config/class-config-theme_labels_objects.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Theme_Labels')) oes_include('admin/tools/config/class-config-theme_labels.php');
+if (!class_exists('Theme_Labels', false)) oes_include('admin/tools/config/class-config-theme_labels.php');
 
-if (class_exists('Theme_Labels_Objects')) exit;
+if (class_exists('Theme_Labels_Objects', false)) exit;
 
 /**
  * Class Theme_Labels_Objects
diff --git a/includes/admin/tools/config/class-config-theme_languages.php b/includes/admin/tools/config/class-config-theme_languages.php
index 5391bdc..3a5f6cf 100644
--- a/includes/admin/tools/config/class-config-theme_languages.php
+++ b/includes/admin/tools/config/class-config-theme_languages.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
 
-if (class_exists('Theme_Languages')) exit;
+if (class_exists('Theme_Languages', false)) exit;
 
 /**
  * Class Theme_Languages
diff --git a/includes/admin/tools/config/class-config-theme_logos.php b/includes/admin/tools/config/class-config-theme_logos.php
index dd4190f..27fb22f 100644
--- a/includes/admin/tools/config/class-config-theme_logos.php
+++ b/includes/admin/tools/config/class-config-theme_logos.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
 
-if (class_exists('Theme_Logos')) exit;
+if (class_exists('Theme_Logos', false)) exit;
 
 /**
  * Class Theme_Logos
diff --git a/includes/admin/tools/config/class-config-theme_media.php b/includes/admin/tools/config/class-config-theme_media.php
index 54dc8e3..d9b98ec 100644
--- a/includes/admin/tools/config/class-config-theme_media.php
+++ b/includes/admin/tools/config/class-config-theme_media.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
 
-if (class_exists('Theme_Media')) exit;
+if (class_exists('Theme_Media', false)) exit;
 
 /**
  * Class Theme_Media
diff --git a/includes/admin/tools/config/class-config-theme_search.php b/includes/admin/tools/config/class-config-theme_search.php
index 3b85bd6..e7f5cca 100644
--- a/includes/admin/tools/config/class-config-theme_search.php
+++ b/includes/admin/tools/config/class-config-theme_search.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
 
-if (class_exists('Theme_Search')) exit;
+if (class_exists('Theme_Search', false)) exit;
 
 /**
  * Class Theme_Search
diff --git a/includes/admin/tools/config/class-config.php b/includes/admin/tools/config/class-config.php
index 6c96b71..22d3b58 100644
--- a/includes/admin/tools/config/class-config.php
+++ b/includes/admin/tools/config/class-config.php
@@ -11,9 +11,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Tools')) oes_include('admin/tools/class-tool.php');
+if (!class_exists('Tools', false)) oes_include('admin/tools/class-tool.php');
 
-if (class_exists('Config')) exit;
+if (class_exists('Config', false)) exit;
 
 /**
  * Class Config
diff --git a/includes/lod/class-api_interface.php b/includes/lod/class-api_interface.php
index 7d9e504..4b52477 100644
--- a/includes/lod/class-api_interface.php
+++ b/includes/lod/class-api_interface.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists(__NAMESPACE__ . 'API_Interface')) {
+if (!class_exists(__NAMESPACE__ . 'API_Interface', false)) {
 
     /**
      * API Interface
diff --git a/includes/lod/class-display_helper.php b/includes/lod/class-display_helper.php
index 81eb1a8..94c0926 100644
--- a/includes/lod/class-display_helper.php
+++ b/includes/lod/class-display_helper.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('\OES\API\Display_Helper')) {
+if (!class_exists('\OES\API\Display_Helper', false)) {
 
     /**
      * API Interface
diff --git a/includes/lod/class-lod_config.php b/includes/lod/class-lod_config.php
index 63d1bd1..d81e95a 100644
--- a/includes/lod/class-lod_config.php
+++ b/includes/lod/class-lod_config.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
+if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
 
-if (!class_exists('LOD')) {
+if (!class_exists('LOD', false)) {
 
     /**
      * Class LOD
diff --git a/includes/lod/class-lod_schema.php b/includes/lod/class-lod_schema.php
index 9cb7a2b..5cc349d 100644
--- a/includes/lod/class-lod_schema.php
+++ b/includes/lod/class-lod_schema.php
@@ -4,9 +4,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Schema')) oes_include('admin/tools/config/class-config-schema.php');
+if (!class_exists('Schema', false)) oes_include('admin/tools/config/class-config-schema.php');
 
-if (!class_exists('LOD_Schema')) {
+if (!class_exists('LOD_Schema', false)) {
 
     /**
      * Class LOD_Schema
diff --git a/includes/lod/class-rest_api.php b/includes/lod/class-rest_api.php
index 4b93150..f6dfd98 100644
--- a/includes/lod/class-rest_api.php
+++ b/includes/lod/class-rest_api.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Rest_API')) {
+if (!class_exists('Rest_API', false)) {
 
     /**
      * Rest API
diff --git a/includes/lod/geonames/class-geonames.php b/includes/lod/geonames/class-geonames.php
index 0648749..0dc9bb6 100644
--- a/includes/lod/geonames/class-geonames.php
+++ b/includes/lod/geonames/class-geonames.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('LOD')) oes_include('lod/class-lod_config.php');
+if (!class_exists('LOD', false)) oes_include('lod/class-lod_config.php');
 
-if (!class_exists('Geonames')) {
+if (!class_exists('Geonames', false)) {
 
     /**
      * Class Geonames
diff --git a/includes/lod/geonames/class-geonames_api.php b/includes/lod/geonames/class-geonames_api.php
index bda18d3..69b3fdf 100644
--- a/includes/lod/geonames/class-geonames_api.php
+++ b/includes/lod/geonames/class-geonames_api.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Geonames_API')) {
+if (!class_exists('Geonames_API', false)) {
 
     /**
      * Class Geonames_API
diff --git a/includes/lod/geonames/class-geonames_interface.php b/includes/lod/geonames/class-geonames_interface.php
index efdfe3b..d412c67 100644
--- a/includes/lod/geonames/class-geonames_interface.php
+++ b/includes/lod/geonames/class-geonames_interface.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('Geonames_Interface')) {
+if (!class_exists('Geonames_Interface', false)) {
 
     /**
      * Geonames Interface.
diff --git a/includes/lod/gnd/class-gnd.php b/includes/lod/gnd/class-gnd.php
index 0515a56..bbcdead 100644
--- a/includes/lod/gnd/class-gnd.php
+++ b/includes/lod/gnd/class-gnd.php
@@ -4,9 +4,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('LOD')) oes_include('lod/class-lod_config.php');
+if (!class_exists('LOD', false)) oes_include('lod/class-lod_config.php');
 
-if (!class_exists('GND')) {
+if (!class_exists('GND', false)) {
 
     /**
      * Class GND
diff --git a/includes/lod/gnd/class-gnd_api.php b/includes/lod/gnd/class-gnd_api.php
index de515a6..11fc57e 100644
--- a/includes/lod/gnd/class-gnd_api.php
+++ b/includes/lod/gnd/class-gnd_api.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('GND_API')) {
+if (!class_exists('GND_API', false)) {
 
     /**
      * Class GND_API
diff --git a/includes/lod/gnd/class-gnd_display_helper.php b/includes/lod/gnd/class-gnd_display_helper.php
index d92eba1..b948d85 100644
--- a/includes/lod/gnd/class-gnd_display_helper.php
+++ b/includes/lod/gnd/class-gnd_display_helper.php
@@ -2,7 +2,7 @@
 
 namespace OES\API;
 
-if (!class_exists('\OES\API\GND_Display_Helper')) {
+if (!class_exists('\OES\API\GND_Display_Helper', false)) {
     class GND_Display_Helper extends Display_Helper
     {
 
diff --git a/includes/lod/gnd/class-gnd_interface.php b/includes/lod/gnd/class-gnd_interface.php
index 02893c8..fb51a47 100644
--- a/includes/lod/gnd/class-gnd_interface.php
+++ b/includes/lod/gnd/class-gnd_interface.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('GND_Interface')) {
+if (!class_exists('GND_Interface', false)) {
 
     /**
      * GND Interface
diff --git a/includes/lod/hmml/class-hmml.php b/includes/lod/hmml/class-hmml.php
index cab073d..d257894 100644
--- a/includes/lod/hmml/class-hmml.php
+++ b/includes/lod/hmml/class-hmml.php
@@ -4,9 +4,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('LOD')) oes_include('lod/class-lod_config.php');
+if (!class_exists('LOD', false)) oes_include('lod/class-lod_config.php');
 
-if (!class_exists('HMML')) {
+if (!class_exists('HMML', false)) {
 
     /**
      * Class HMML
diff --git a/includes/lod/hmml/class-hmml_api.php b/includes/lod/hmml/class-hmml_api.php
index 93ac0a4..10f2079 100644
--- a/includes/lod/hmml/class-hmml_api.php
+++ b/includes/lod/hmml/class-hmml_api.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('HMML_API')) {
+if (!class_exists('HMML_API', false)) {
 
     /**
      * HMML API integration
diff --git a/includes/lod/hmml/class-hmml_interface.php b/includes/lod/hmml/class-hmml_interface.php
index 7f9cb17..2750f62 100644
--- a/includes/lod/hmml/class-hmml_interface.php
+++ b/includes/lod/hmml/class-hmml_interface.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('HMML_Interface')) {
+if (!class_exists('HMML_Interface', false)) {
 
     /**
      * HMML Interface
diff --git a/includes/lod/loc/class-loc.php b/includes/lod/loc/class-loc.php
index e252068..85d0526 100644
--- a/includes/lod/loc/class-loc.php
+++ b/includes/lod/loc/class-loc.php
@@ -9,9 +9,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('LOD')) oes_include('lod/class-lod_config.php');
+if (!class_exists('LOD', false)) oes_include('lod/class-lod_config.php');
 
-if (!class_exists('LoC')) {
+if (!class_exists('LoC', false)) {
 
     /**
      * Class LoC
diff --git a/includes/lod/loc/class-loc_api.php b/includes/lod/loc/class-loc_api.php
index 368175b..cefcf8d 100644
--- a/includes/lod/loc/class-loc_api.php
+++ b/includes/lod/loc/class-loc_api.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('LOC_API')) {
+if (!class_exists('LOC_API', false)) {
 
     /**
      * Class LOC_API
diff --git a/includes/lod/loc/class-loc_interface.php b/includes/lod/loc/class-loc_interface.php
index a953ea1..8292b80 100644
--- a/includes/lod/loc/class-loc_interface.php
+++ b/includes/lod/loc/class-loc_interface.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('LOC_Interface')) {
+if (!class_exists('LOC_Interface', false)) {
 
     /**
      * LOC Interface
diff --git a/includes/lod/orcid/class-orcid.php b/includes/lod/orcid/class-orcid.php
index 35718e8..2c96af9 100644
--- a/includes/lod/orcid/class-orcid.php
+++ b/includes/lod/orcid/class-orcid.php
@@ -4,9 +4,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('LOD')) oes_include('lod/class-lod_config.php');
+if (!class_exists('LOD', false)) oes_include('lod/class-lod_config.php');
 
-if (!class_exists('ORCID')) {
+if (!class_exists('ORCID', false)) {
 
     /**
      * Class ORCID
diff --git a/includes/lod/orcid/class-orcid_api.php b/includes/lod/orcid/class-orcid_api.php
index 532ea88..464be56 100644
--- a/includes/lod/orcid/class-orcid_api.php
+++ b/includes/lod/orcid/class-orcid_api.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('ORCID_API')) {
+if (!class_exists('ORCID_API', false)) {
 
     /**
      * ORCID API integration
diff --git a/includes/lod/orcid/class-orcid_interface.php b/includes/lod/orcid/class-orcid_interface.php
index deb25e7..c4ef612 100644
--- a/includes/lod/orcid/class-orcid_interface.php
+++ b/includes/lod/orcid/class-orcid_interface.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('ORCID_Interface')) {
+if (!class_exists('ORCID_Interface', false)) {
 
     /**
      * ORCID Interface
diff --git a/includes/lod/ror/class-ror.php b/includes/lod/ror/class-ror.php
index 4339a12..2fd24b3 100644
--- a/includes/lod/ror/class-ror.php
+++ b/includes/lod/ror/class-ror.php
@@ -4,9 +4,9 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('LOD')) oes_include('lod/class-lod_config.php');
+if (!class_exists('LOD', false)) oes_include('lod/class-lod_config.php');
 
-if (!class_exists('ROR')) {
+if (!class_exists('ROR', false)) {
 
     /**
      * Class ROR
diff --git a/includes/lod/ror/class-ror_api.php b/includes/lod/ror/class-ror_api.php
index e266e16..24d89db 100644
--- a/includes/lod/ror/class-ror_api.php
+++ b/includes/lod/ror/class-ror_api.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('ROR_API')) {
+if (!class_exists('ROR_API', false)) {
 
     /**
      * ROR API integration
diff --git a/includes/lod/ror/class-ror_interface.php b/includes/lod/ror/class-ror_interface.php
index e7a7658..9a2d6a1 100644
--- a/includes/lod/ror/class-ror_interface.php
+++ b/includes/lod/ror/class-ror_interface.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('ROR_Interface')) {
+if (!class_exists('ROR_Interface', false)) {
 
     /**
      * ROR Interface
diff --git a/includes/rest/class-export.php b/includes/rest/class-export.php
index c90518a..268f370 100644
--- a/includes/rest/class-export.php
+++ b/includes/rest/class-export.php
@@ -6,7 +6,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('\OES\Export\Export')) {
+if (!class_exists('\OES\Export\Export', false)) {
 
 
     /**
diff --git a/includes/rest/class-json_export.php b/includes/rest/class-json_export.php
index eeeded7..80fcab7 100644
--- a/includes/rest/class-json_export.php
+++ b/includes/rest/class-json_export.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('\OES\Export\JSON_Export') && class_exists('\OES\Export\Export')) {
+if (!class_exists('\OES\Export\JSON_Export', false) && class_exists('\OES\Export\Export', false)) {
 
 
     /**
diff --git a/includes/rest/class-oes_export.php b/includes/rest/class-oes_export.php
index 1d48a4f..8dc344e 100644
--- a/includes/rest/class-oes_export.php
+++ b/includes/rest/class-oes_export.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('\OES\Export\OES_Export') && class_exists('\OES\Export\Export')) {
+if (!class_exists('\OES\Export\OES_Export', false) && class_exists('\OES\Export\Export', false)) {
 
 
     /**
diff --git a/includes/rest/class-tei_export.php b/includes/rest/class-tei_export.php
index b69baad..f534f0f 100644
--- a/includes/rest/class-tei_export.php
+++ b/includes/rest/class-tei_export.php
@@ -4,7 +4,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('\OES\Export\TEI_Export') && class_exists('\OES\Export\Export')) {
+if (!class_exists('\OES\Export\TEI_Export', false) && class_exists('\OES\Export\Export', false)) {
 
 
     /**
diff --git a/includes/theme/data/class-archive.php b/includes/theme/data/class-archive.php
index a586b61..8367374 100644
--- a/includes/theme/data/class-archive.php
+++ b/includes/theme/data/class-archive.php
@@ -4,7 +4,7 @@
 
 use OES\Versioning as Versioning;
 
-if (!class_exists('OES_Archive')) {
+if (!class_exists('OES_Archive', false)) {
 
 
     /**
diff --git a/includes/theme/data/class-attachment.php b/includes/theme/data/class-attachment.php
index 8a0cfd3..6dd1c02 100644
--- a/includes/theme/data/class-attachment.php
+++ b/includes/theme/data/class-attachment.php
@@ -2,7 +2,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('OES_Attachment')) {
+if (!class_exists('OES_Attachment', false)) {
 
     /**
      * Class OES_Attachment
diff --git a/includes/theme/data/class-index_archive.php b/includes/theme/data/class-index_archive.php
index 87e1807..09dc3e1 100644
--- a/includes/theme/data/class-index_archive.php
+++ b/includes/theme/data/class-index_archive.php
@@ -2,7 +2,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('OES_Index_Archive') && class_exists('OES_Archive')) {
+if (!class_exists('OES_Index_Archive', false) && class_exists('OES_Archive', false)) {
 
 
     /**
diff --git a/includes/theme/data/class-object.php b/includes/theme/data/class-object.php
index e8d08e4..027c093 100644
--- a/includes/theme/data/class-object.php
+++ b/includes/theme/data/class-object.php
@@ -4,7 +4,7 @@
 
 use function OES\Versioning\get_version_field;
 
-if (!class_exists('OES_Object')) {
+if (!class_exists('OES_Object', false)) {
 
     /**
      * Class OES_Object
diff --git a/includes/theme/data/class-page.php b/includes/theme/data/class-page.php
index 3d46dce..b980669 100644
--- a/includes/theme/data/class-page.php
+++ b/includes/theme/data/class-page.php
@@ -2,7 +2,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('OES_Page')) {
+if (!class_exists('OES_Page', false)) {
 
     /**
      * Class OES_Page
diff --git a/includes/theme/data/class-post.php b/includes/theme/data/class-post.php
index d7d1b18..7690dc7 100644
--- a/includes/theme/data/class-post.php
+++ b/includes/theme/data/class-post.php
@@ -7,7 +7,7 @@
 use function OES\Versioning\get_all_version_ids;
 use function OES\Versioning\get_current_version_id;
 
-if (!class_exists('OES_Post')) {
+if (!class_exists('OES_Post', false)) {
 
     /**
      * Class OES_Post
diff --git a/includes/theme/data/class-post_archive.php b/includes/theme/data/class-post_archive.php
index e1d891e..3dccd49 100644
--- a/includes/theme/data/class-post_archive.php
+++ b/includes/theme/data/class-post_archive.php
@@ -2,7 +2,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('OES_Post_Archive') && class_exists('OES_Archive')) {
+if (!class_exists('OES_Post_Archive', false) && class_exists('OES_Archive', false)) {
 
 
     /**
diff --git a/includes/theme/data/class-taxonomy.php b/includes/theme/data/class-taxonomy.php
index f5d898d..e24dbf1 100644
--- a/includes/theme/data/class-taxonomy.php
+++ b/includes/theme/data/class-taxonomy.php
@@ -7,7 +7,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('OES_Taxonomy')) {
+if (!class_exists('OES_Taxonomy', false)) {
 
     /**
      * Class OES_Taxonomy
diff --git a/includes/theme/data/class-taxonomy_archive.php b/includes/theme/data/class-taxonomy_archive.php
index da46ac1..f9cc1cd 100644
--- a/includes/theme/data/class-taxonomy_archive.php
+++ b/includes/theme/data/class-taxonomy_archive.php
@@ -2,7 +2,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('OES_Taxonomy_Archive') && class_exists('OES_Archive')) {
+if (!class_exists('OES_Taxonomy_Archive', false) && class_exists('OES_Archive', false)) {
 
 
     /**
diff --git a/includes/theme/data/class-template_redirect.php b/includes/theme/data/class-template_redirect.php
index ee9aa9f..c689aaa 100644
--- a/includes/theme/data/class-template_redirect.php
+++ b/includes/theme/data/class-template_redirect.php
@@ -7,7 +7,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('OES_Template_Redirect')):
+if (!class_exists('OES_Template_Redirect', false)):
 
     /**
      * Handles data preparation and customization of the template redirect phase in WordPress.
diff --git a/includes/theme/data/class-term.php b/includes/theme/data/class-term.php
index 8f9c531..7184894 100644
--- a/includes/theme/data/class-term.php
+++ b/includes/theme/data/class-term.php
@@ -2,7 +2,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('OES_Term')) {
+if (!class_exists('OES_Term', false)) {
 
     /**
      * Class OES_Term
diff --git a/includes/theme/figures/class-gallery_panel.php b/includes/theme/figures/class-gallery_panel.php
index 7343533..99b66a2 100644
--- a/includes/theme/figures/class-gallery_panel.php
+++ b/includes/theme/figures/class-gallery_panel.php
@@ -7,7 +7,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('OES_Gallery_Panel')) {
+if (!class_exists('OES_Gallery_Panel', false)) {
 
     /**
      * Class OES_Gallery_Panel
diff --git a/includes/theme/figures/class-image_panel.php b/includes/theme/figures/class-image_panel.php
index 269b6ed..0dc243f 100644
--- a/includes/theme/figures/class-image_panel.php
+++ b/includes/theme/figures/class-image_panel.php
@@ -7,7 +7,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('OES_Image_Panel')) {
+if (!class_exists('OES_Image_Panel', false)) {
 
     /**
      * Class OES_Image_Panel
diff --git a/includes/theme/figures/class-panel.php b/includes/theme/figures/class-panel.php
index b3e83b5..017b84e 100644
--- a/includes/theme/figures/class-panel.php
+++ b/includes/theme/figures/class-panel.php
@@ -7,7 +7,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('OES_Panel')) {
+if (!class_exists('OES_Panel', false)) {
 
     /**
      * Class OES_Panel
diff --git a/includes/theme/filter/class-filter_renderer.php b/includes/theme/filter/class-filter_renderer.php
index d0022e0..589b185 100644
--- a/includes/theme/filter/class-filter_renderer.php
+++ b/includes/theme/filter/class-filter_renderer.php
@@ -7,7 +7,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('OES_Filter_Renderer')) {
+if (!class_exists('OES_Filter_Renderer', false)) {
 
     /**
      * Class OES_Filter_Renderer
diff --git a/includes/theme/icons/class-icon_manager.php b/includes/theme/icons/class-icon_manager.php
index c914fff..534e0d5 100644
--- a/includes/theme/icons/class-icon_manager.php
+++ b/includes/theme/icons/class-icon_manager.php
@@ -10,7 +10,7 @@
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 
-if (!class_exists('\OES\Icon\Manager')) {
+if (!class_exists('\OES\Icon\Manager', false)) {
 
     /**
      * Abstract base class for managing inline SVG icons.
diff --git a/includes/theme/icons/class-icons.php b/includes/theme/icons/class-icons.php
index 9d68581..6ec8cf1 100644
--- a/includes/theme/icons/class-icons.php
+++ b/includes/theme/icons/class-icons.php
@@ -10,7 +10,7 @@
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 
-if (!class_exists('\OES\Icon\Icons')) {
+if (!class_exists('\OES\Icon\Icons', false)) {
 
     /**
      * Concrete icon set for use in the theme or plugin.
diff --git a/includes/theme/navigation/class-language_switch.php b/includes/theme/navigation/class-language_switch.php
index 5440c4f..24997ff 100644
--- a/includes/theme/navigation/class-language_switch.php
+++ b/includes/theme/navigation/class-language_switch.php
@@ -5,7 +5,7 @@
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 
-if (!class_exists('Language_Switch')) {
+if (!class_exists('Language_Switch', false)) {
 
     /**
      * Class Language_Switch
diff --git a/includes/theme/search/class-search.php b/includes/theme/search/class-search.php
index b6c74fe..8f5cf41 100644
--- a/includes/theme/search/class-search.php
+++ b/includes/theme/search/class-search.php
@@ -4,7 +4,7 @@
 
 use function OES\Versioning\get_parent_id;
 
-if (!class_exists('OES_Search') && class_exists('OES_Archive')) {
+if (!class_exists('OES_Search', false) && class_exists('OES_Archive', false)) {
 
     /**
      * Class OES_Search
diff --git a/includes/theme/search/class-search_query.php b/includes/theme/search/class-search_query.php
index 5723e49..6b0c404 100644
--- a/includes/theme/search/class-search_query.php
+++ b/includes/theme/search/class-search_query.php
@@ -7,7 +7,7 @@
 
 if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (!class_exists('OES_Search_Query')) {
+if (!class_exists('OES_Search_Query', false)) {
 
     /**
      * Class OES_Search_Query
diff --git a/includes/theme/search/class-search_results.php b/includes/theme/search/class-search_results.php
index 1008d47..78882cd 100644
--- a/includes/theme/search/class-search_results.php
+++ b/includes/theme/search/class-search_results.php
@@ -10,7 +10,7 @@
 use function \OES\Versioning\get_parent_id;
 use function \OES\Versioning\get_version_field;
 
-if (!class_exists('OES_Search_Results')) {
+if (!class_exists('OES_Search_Results', false)) {
 
     /**
      * Class OES_Search_Results