diff --git a/docs/development.md b/docs/development.md
index e001318..9f9b196 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -67,7 +67,7 @@ Edit the `sfdx-project.json` file to specify the namespace:
   ],
   "namespace": "<namespace>",
   "sfdcLoginUrl": "https://login.salesforce.com",
-  "sourceApiVersion": "60.0"
+  "sourceApiVersion": "62.0"
 }
 ```
 Replace `<namespace>` with your actual namespace.
diff --git a/force-app/main/default/lwc/orgcheckApp/api/orgcheck-api.js b/force-app/main/default/lwc/orgcheckApp/api/orgcheck-api.js
index 8408803..831cddd 100644
--- a/force-app/main/default/lwc/orgcheckApp/api/orgcheck-api.js
+++ b/force-app/main/default/lwc/orgcheckApp/api/orgcheck-api.js
@@ -62,6 +62,11 @@ export class OrgCheckAPI {
      */
     #logger;
 
+    /**
+     * @property {Boolean} Is the current user accepted the terms to use Org Check in this org?
+     */
+    #usageTermsAccepted;
+
     /**
      * Org Check constructor
      * 
@@ -76,6 +81,7 @@ export class OrgCheckAPI {
         this.#sfdcManager = new OrgCheckSalesforceManager(jsConnectionFactory, accessToken, userId, this.#logger);
         this.#datasetManager = new OrgCheckDatasetManager(this.#sfdcManager, jsCompression, this.#logger);
         this.#recipeManager = new OrgCheckRecipeManager(this.#datasetManager, this.#logger);
+        this.#usageTermsAccepted = false;
     }
     
     /**
@@ -142,6 +148,26 @@ export class OrgCheckAPI {
         return this.#recipeManager.run(RECIPE_ORGANIZATION_ALIAS);
     }
 
+    /**
+     * Check if we can use the current org according to the terms (specially if this is a production org)
+     * 
+     * @returns true 
+     * @throws Exception if the org is a Production and terms are not accepted
+     */
+    async checkUsageTerms() {
+        const orgInfo = await this.#recipeManager.run(RECIPE_ORGANIZATION_ALIAS);
+        if (orgInfo.isProduction === true) {
+            if (this.#usageTermsAccepted === false) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    acceptUsageTerms() {
+        this.#usageTermsAccepted = true;
+    }
+
     /**
      * Check if the current user can run the application
      * 
diff --git a/force-app/main/default/lwc/orgcheckApp/orgcheckApp.html b/force-app/main/default/lwc/orgcheckApp/orgcheckApp.html
index 69d7c27..7aa45ce 100644
--- a/force-app/main/default/lwc/orgcheckApp/orgcheckApp.html
+++ b/force-app/main/default/lwc/orgcheckApp/orgcheckApp.html
@@ -106,741 +106,763 @@ <h1><span class="slds-page-header__title slds-truncate">Welcome in Org Check ({o
                             </lightning-card>
                         </lightning-layout-item>
                         <lightning-layout-item size="4">
-                            <c-orgcheck-cache-manager onload={handleSubTabContentLoaded} onremovecache={handleRemoveCache} cache-manager-data={cacheManagerData}></c-orgcheck-cache-manager>
+                            <template if:true={useOrgCheckInThisOrgConfirmed}>
+                                <c-orgcheck-cache-manager onload={handleSubTabContentLoaded} onremovecache={handleRemoveCache} cache-manager-data={cacheManagerData}></c-orgcheck-cache-manager>
+                            </template>
+                            <template if:true={useOrgCheckInThisOrgNeedConfirmation}>
+                                <lightning-card icon-name="utility:signature" title="Usage acceptance">
+                                    <div class="slds-var-p-horizontal_small" style="background-color: lightgoldenrodyellow;">
+                                        Using <b>Org Check</b> will increase the <b>Daily API Request governor limits</b> on this Salesforce organization. 
+                                            Fortunately, the application has an internal system to <b>warn</b> when the limit starts reaching <b>70%</b> of
+                                            the maximum, and, to <b>stop</b> when the limit starts reaching <b>90%</b> of the maximum.<br />
+                                        <br />
+                                        That being written, we encourage you to use Org Check in a <b>Sandbox</b> that is not crucial for your dev lifecycle,
+                                            where if that Daily API Request governor limit hits its maximum, you will have very few impact. We discourage you 
+                                            from using the application in your <b>Production</b> organization. Even if we put in place this check, we remind 
+                                            you that Salesforce Labs applications like Org Check have no warranty of any sort (as described in our AppExchange 
+                                            listing).<br />
+                                        <br />
+                                        <lightning-input type="toggle" label="Yes, I accept to use Org Check in this Salesforce environment." onclick={handleClickUsageAcceptance}></lightning-input>
+                                    </div>
+                                </lightning-card>
+                            </template>
                         </lightning-layout-item>
                     </lightning-layout>
                 </lightning-tab>
             </lightning-tabset>
         </lightning-tab>
-        <lightning-tab label="⚽ Objects" onactive={handleTabActivation}>
-            <lightning-layout>
-                <lightning-layout-item>
-                    <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="object-information,objects-owd"></lightning-button>
-                </lightning-layout-item>
-            </lightning-layout>
-            <lightning-tabset>
-                <lightning-tab value="object-information" label="Object Documentation" onactive={handleSubTabActivation}>                    
-                    <template if:false={objectInformationData}>
-                        There is no specific object set in the global filter above. <br />
-                        <br />
-                        Please set the <b>SObject</b> value in the global filter and hit <b>'Apply'</b> button to see something here.<br />
-                        <br />
-                        Thank you!
-                    </template>
-                    <template if:true={objectInformationData}>
-                        <lightning-layout>
-                            <lightning-layout-item>
-                                <h1 class="slds-text-heading_large">{objectInformationData.label} ({objectInformationData.apiname})</h1>
-                            </lightning-layout-item>
-                            <lightning-layout-item alignment-bump="left">
-                                <c-orgcheck-export-button source={objectInformationExportSource} basename={objectInformationExportBasename}></c-orgcheck-export-button>
-                            </lightning-layout-item>
-                        </lightning-layout>
-                        <br /><br />
-                
-                        <!-- GENERAL SECTION -->
-                        <h1 class="slds-text-heading_medium">General information</h1>
-                        <div class="slds-grid slds-gutters">
-                            <div class="slds-col">
-                                <div class="slds-has-divider--bottom"><lightning-input type="text" label="API Name" value={objectInformationData.apiname} read-only></lightning-input></div>
-                                <div class="slds-has-divider--bottom"><lightning-input type="text" label="Object Type" value={objectInformationData.typeRef.label} read-only></lightning-input></div>
-                                <div class="slds-has-divider--bottom"><lightning-input type="text" label="Package" value={objectInformationData.package} read-only></lightning-input></div>
-                            </div>
-                            <div class="slds-col">
-                                <div class="slds-has-divider--bottom"><lightning-input type="text" label="Singular Label" value={objectInformationData.label} read-only></lightning-input></div>
-                                <div class="slds-has-divider--bottom"><lightning-input type="text" label="Plural Label" value={objectInformationData.labelPlural} read-only></lightning-input></div>
-                                <div class="slds-has-divider--bottom"><lightning-input type="text" label="Description" value={objectInformationData.description} read-only></lightning-input></div>
-                            </div>
-                            <div class="slds-col">
-                                <div class="slds-has-divider--bottom"><lightning-input type="text" label="Key Prefix" value={objectInformationData.keyPrefix} read-only></lightning-input></div>
-                                <div class="slds-has-divider--bottom"><lightning-input type="number" label="Record Count (including deleted ones)" value={objectInformationData.recordCount} read-only></lightning-input></div>
-                            </div>
-                            <div class="slds-col">
-                                <div class="slds-has-divider--bottom"><lightning-input type="toggle" label="Is Custom?" value={objectInformationData.isCustom} disabled></lightning-input></div>
-                                <div class="slds-has-divider--bottom"><lightning-input type="toggle" label="Feed Enable?" value={objectInformationData.isFeedEnabled} disabled></lightning-input></div>
-                                <div class="slds-has-divider--bottom"><lightning-input type="toggle" label="Most Recent Enabled?" value={objectInformationData.isMostRecentEnabled} disabled></lightning-input></div>
-                                <div class="slds-has-divider--bottom"><lightning-input type="toggle" label="Global Search Enabled?" value={objectInformationData.isSearchable} disabled></lightning-input></div>
-                            </div>
-                            <div class="slds-col">
-                                <div class="slds-has-divider--bottom"><lightning-input type="text" label="Internal Sharing" value={objectInformationData.internalSharingModel} read-only></lightning-input></div>
-                                <div class="slds-has-divider--bottom"><lightning-input type="text" label="External Sharing" value={objectInformationData.externalSharingModel} read-only></lightning-input></div>
-                            </div>
-                        </div>
-                        <br /><br />
-                
-                        <!-- APEX TRIGGER SECTION -->
-                        <template lwc:if={objectInformationData.apexTriggerRefs.length}>
-                            <h1 class="slds-text-heading_medium">Apex Triggers</h1>
-                            <c-orgcheck-extended-datatable
-                                show-row-number-column
-                                dont-use-all-space
-                                onviewscore={handleViewScore}
-                                show-search
-                                show-statistics
-                                is-infinite-scrolling
-                                infinite-scrolling-initial-nb-rows=25
-                                infinite-scrolling-additional-nb-rows=100
-                                columns={apexTriggersInObjectTableColumns}
-                                rows={objectInformationData.apexTriggerRefs}></c-orgcheck-extended-datatable>
-                            <br /><br />
-                        </template>
-                        
-                        <!-- FIELD SETS SECTION -->
-                        <template lwc:if={objectInformationData.fieldSets.length}>
-                            <h1 class="slds-text-heading_medium">Field Sets</h1>
-                            <c-orgcheck-extended-datatable
-                                show-row-number-column
-                                dont-use-all-space
-                                onviewscore={handleViewScore}
-                                show-search
-                                show-statistics
-                                is-infinite-scrolling
-                                infinite-scrolling-initial-nb-rows=25
-                                infinite-scrolling-additional-nb-rows=100
-                                columns={fieldSetsColumns}
-                                rows={objectInformationData.fieldSets}></c-orgcheck-extended-datatable>
-                            <br /><br />
-                        </template>
-                
-                        <!-- LAYOUTS SECTION -->
-                        <template lwc:if={objectInformationData.layouts.length}>
-                            <h1 class="slds-text-heading_medium">Page Layouts</h1>
-                            <c-orgcheck-extended-datatable
-                                show-row-number-column
-                                dont-use-all-space
-                                onviewscore={handleViewScore}
-                                show-search
-                                show-statistics
-                                is-infinite-scrolling
-                                infinite-scrolling-initial-nb-rows=25
-                                infinite-scrolling-additional-nb-rows=100
-                                columns={layoutsColumns}
-                                rows={objectInformationData.layouts}></c-orgcheck-extended-datatable>
-                            <br /><br />
-                        </template>
-                
-                        <!-- LIMITS SECTION -->
-                        <template lwc:if={objectInformationData.limits.length}>
-                            <h1 class="slds-text-heading_medium">Limits</h1>
-                            <c-orgcheck-extended-datatable
-                                show-row-number-column
-                                dont-use-all-space
-                                onviewscore={handleViewScore}
-                                show-search
-                                show-statistics
-                                is-infinite-scrolling
-                                infinite-scrolling-initial-nb-rows=25
-                                infinite-scrolling-additional-nb-rows=100
-                                columns={limitsColumns}
-                                rows={objectInformationData.limits}></c-orgcheck-extended-datatable>
-                            <br /><br />
-                        </template>
-                        
-                        <!-- VALIDATION RULES SECTION -->
-                        <template lwc:if={objectInformationData.validationRules.length}>
-                            <h1 class="slds-text-heading_medium">Validation Rules</h1>
-                            <c-orgcheck-extended-datatable
-                                show-row-number-column
-                                dont-use-all-space
-                                onviewscore={handleViewScore}
-                                show-search
-                                show-statistics
-                                is-infinite-scrolling
-                                infinite-scrolling-initial-nb-rows=25
-                                infinite-scrolling-additional-nb-rows=100
-                                columns={validationRulesColumns}
-                                rows={objectInformationData.validationRules}></c-orgcheck-extended-datatable>
-                            <br /><br />
-                        </template>
-                        
-                        <!-- WEB LINKS SECTION -->
-                        <template lwc:if={objectInformationData.webLinks.length}>
-                            <h1 class="slds-text-heading_medium">Web Links</h1>
-                            <c-orgcheck-extended-datatable
-                                show-row-number-column
-                                dont-use-all-space
-                                onviewscore={handleViewScore}
-                                show-search
-                                show-statistics
-                                is-infinite-scrolling
-                                infinite-scrolling-initial-nb-rows=25
-                                infinite-scrolling-additional-nb-rows=100
-                                columns={webLinksColumns}
-                                rows={objectInformationData.webLinks}></c-orgcheck-extended-datatable>
-                            <br /><br />
+        <template if:true={useOrgCheckInThisOrgConfirmed}>
+
+            <lightning-tab label="⚽ Objects" onactive={handleTabActivation}>
+                <lightning-layout>
+                    <lightning-layout-item>
+                        <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="object-information,objects-owd"></lightning-button>
+                    </lightning-layout-item>
+                </lightning-layout>
+                <lightning-tabset>
+                    <lightning-tab value="object-information" label="Object Documentation" onactive={handleSubTabActivation}>                    
+                        <template if:false={objectInformationData}>
+                            There is no specific object set in the global filter above. <br />
+                            <br />
+                            Please set the <b>SObject</b> value in the global filter and hit <b>'Apply'</b> button to see something here.<br />
+                            <br />
+                            Thank you!
                         </template>
-                        
-                        <!-- CUSTOM FIELDS SECTION -->
-                        <template lwc:if={objectInformationData.customFieldRefs.length}>
-                            <h1 class="slds-text-heading_medium">Custom Fields</h1>
-                            <c-orgcheck-extended-datatable
-                                show-row-number-column
-                                dont-use-all-space
-                                onviewscore={handleViewScore}
-                                show-search
-                                show-statistics
-                                is-infinite-scrolling
-                                infinite-scrolling-initial-nb-rows=25
-                                infinite-scrolling-additional-nb-rows=100
-                                columns={customFieldsInObjectTableColumns}
-                                rows={objectInformationData.customFieldRefs}></c-orgcheck-extended-datatable>
+                        <template if:true={objectInformationData}>
+                            <lightning-layout>
+                                <lightning-layout-item>
+                                    <h1 class="slds-text-heading_large">{objectInformationData.label} ({objectInformationData.apiname})</h1>
+                                </lightning-layout-item>
+                                <lightning-layout-item alignment-bump="left">
+                                    <c-orgcheck-export-button source={objectInformationExportSource} basename={objectInformationExportBasename}></c-orgcheck-export-button>
+                                </lightning-layout-item>
+                            </lightning-layout>
                             <br /><br />
-                        </template>
-                        
-                        <!-- STANDARD FIELDS SECTION -->
-                        <template lwc:if={objectInformationData.standardFields.length}>
-                            <h1 class="slds-text-heading_medium">Standard Fields</h1>
-                            <c-orgcheck-extended-datatable
-                                show-row-number-column
-                                dont-use-all-space
-                                onviewscore={handleViewScore}
-                                show-search
-                                show-statistics
-                                is-infinite-scrolling
-                                infinite-scrolling-initial-nb-rows=25
-                                infinite-scrolling-additional-nb-rows=100
-                                columns={standardFieldsInObjectTableColumns}
-                                rows={objectInformationData.standardFields}></c-orgcheck-extended-datatable>
+                    
+                            <!-- GENERAL SECTION -->
+                            <h1 class="slds-text-heading_medium">General information</h1>
+                            <div class="slds-grid slds-gutters">
+                                <div class="slds-col">
+                                    <div class="slds-has-divider_bottom"><lightning-input type="text" label="API Name" value={objectInformationData.apiname} read-only></lightning-input></div>
+                                    <div class="slds-has-divider_bottom"><lightning-input type="text" label="Object Type" value={objectInformationData.typeRef.label} read-only></lightning-input></div>
+                                    <div class="slds-has-divider_bottom"><lightning-input type="text" label="Package" value={objectInformationData.package} read-only></lightning-input></div>
+                                </div>
+                                <div class="slds-col">
+                                    <div class="slds-has-divider_bottom"><lightning-input type="text" label="Singular Label" value={objectInformationData.label} read-only></lightning-input></div>
+                                    <div class="slds-has-divider_bottom"><lightning-input type="text" label="Plural Label" value={objectInformationData.labelPlural} read-only></lightning-input></div>
+                                    <div class="slds-has-divider_bottom"><lightning-input type="text" label="Description" value={objectInformationData.description} read-only></lightning-input></div>
+                                </div>
+                                <div class="slds-col">
+                                    <div class="slds-has-divider_bottom"><lightning-input type="text" label="Key Prefix" value={objectInformationData.keyPrefix} read-only></lightning-input></div>
+                                    <div class="slds-has-divider_bottom"><lightning-input type="number" label="Record Count (including deleted ones)" value={objectInformationData.recordCount} read-only></lightning-input></div>
+                                </div>
+                                <div class="slds-col">
+                                    <div class="slds-has-divider_bottom"><lightning-input type="toggle" label="Is Custom?" value={objectInformationData.isCustom} disabled></lightning-input></div>
+                                    <div class="slds-has-divider_bottom"><lightning-input type="toggle" label="Feed Enable?" value={objectInformationData.isFeedEnabled} disabled></lightning-input></div>
+                                    <div class="slds-has-divider_bottom"><lightning-input type="toggle" label="Most Recent Enabled?" value={objectInformationData.isMostRecentEnabled} disabled></lightning-input></div>
+                                    <div class="slds-has-divider_bottom"><lightning-input type="toggle" label="Global Search Enabled?" value={objectInformationData.isSearchable} disabled></lightning-input></div>
+                                </div>
+                                <div class="slds-col">
+                                    <div class="slds-has-divider_bottom"><lightning-input type="text" label="Internal Sharing" value={objectInformationData.internalSharingModel} read-only></lightning-input></div>
+                                    <div class="slds-has-divider_bottom"><lightning-input type="text" label="External Sharing" value={objectInformationData.externalSharingModel} read-only></lightning-input></div>
+                                </div>
+                            </div>
                             <br /><br />
-                        </template>
+                    
+                            <!-- APEX TRIGGER SECTION -->
+                            <template lwc:if={objectInformationData.apexTriggerRefs.length}>
+                                <h1 class="slds-text-heading_medium">Apex Triggers</h1>
+                                <c-orgcheck-extended-datatable
+                                    show-row-number-column
+                                    dont-use-all-space
+                                    onviewscore={handleViewScore}
+                                    show-search
+                                    show-statistics
+                                    is-infinite-scrolling
+                                    infinite-scrolling-initial-nb-rows=25
+                                    infinite-scrolling-additional-nb-rows=100
+                                    columns={apexTriggersInObjectTableColumns}
+                                    rows={objectInformationData.apexTriggerRefs}></c-orgcheck-extended-datatable>
+                                <br /><br />
+                            </template>
+                            
+                            <!-- FIELD SETS SECTION -->
+                            <template lwc:if={objectInformationData.fieldSets.length}>
+                                <h1 class="slds-text-heading_medium">Field Sets</h1>
+                                <c-orgcheck-extended-datatable
+                                    show-row-number-column
+                                    dont-use-all-space
+                                    onviewscore={handleViewScore}
+                                    show-search
+                                    show-statistics
+                                    is-infinite-scrolling
+                                    infinite-scrolling-initial-nb-rows=25
+                                    infinite-scrolling-additional-nb-rows=100
+                                    columns={fieldSetsColumns}
+                                    rows={objectInformationData.fieldSets}></c-orgcheck-extended-datatable>
+                                <br /><br />
+                            </template>
+                    
+                            <!-- LAYOUTS SECTION -->
+                            <template lwc:if={objectInformationData.layouts.length}>
+                                <h1 class="slds-text-heading_medium">Page Layouts</h1>
+                                <c-orgcheck-extended-datatable
+                                    show-row-number-column
+                                    dont-use-all-space
+                                    onviewscore={handleViewScore}
+                                    show-search
+                                    show-statistics
+                                    is-infinite-scrolling
+                                    infinite-scrolling-initial-nb-rows=25
+                                    infinite-scrolling-additional-nb-rows=100
+                                    columns={layoutsColumns}
+                                    rows={objectInformationData.layouts}></c-orgcheck-extended-datatable>
+                                <br /><br />
+                            </template>
+                    
+                            <!-- LIMITS SECTION -->
+                            <template lwc:if={objectInformationData.limits.length}>
+                                <h1 class="slds-text-heading_medium">Limits</h1>
+                                <c-orgcheck-extended-datatable
+                                    show-row-number-column
+                                    dont-use-all-space
+                                    onviewscore={handleViewScore}
+                                    show-search
+                                    show-statistics
+                                    is-infinite-scrolling
+                                    infinite-scrolling-initial-nb-rows=25
+                                    infinite-scrolling-additional-nb-rows=100
+                                    columns={limitsColumns}
+                                    rows={objectInformationData.limits}></c-orgcheck-extended-datatable>
+                                <br /><br />
+                            </template>
+                            
+                            <!-- VALIDATION RULES SECTION -->
+                            <template lwc:if={objectInformationData.validationRules.length}>
+                                <h1 class="slds-text-heading_medium">Validation Rules</h1>
+                                <c-orgcheck-extended-datatable
+                                    show-row-number-column
+                                    dont-use-all-space
+                                    onviewscore={handleViewScore}
+                                    show-search
+                                    show-statistics
+                                    is-infinite-scrolling
+                                    infinite-scrolling-initial-nb-rows=25
+                                    infinite-scrolling-additional-nb-rows=100
+                                    columns={validationRulesColumns}
+                                    rows={objectInformationData.validationRules}></c-orgcheck-extended-datatable>
+                                <br /><br />
+                            </template>
+                            
+                            <!-- WEB LINKS SECTION -->
+                            <template lwc:if={objectInformationData.webLinks.length}>
+                                <h1 class="slds-text-heading_medium">Web Links</h1>
+                                <c-orgcheck-extended-datatable
+                                    show-row-number-column
+                                    dont-use-all-space
+                                    onviewscore={handleViewScore}
+                                    show-search
+                                    show-statistics
+                                    is-infinite-scrolling
+                                    infinite-scrolling-initial-nb-rows=25
+                                    infinite-scrolling-additional-nb-rows=100
+                                    columns={webLinksColumns}
+                                    rows={objectInformationData.webLinks}></c-orgcheck-extended-datatable>
+                                <br /><br />
+                            </template>
+                            
+                            <!-- CUSTOM FIELDS SECTION -->
+                            <template lwc:if={objectInformationData.customFieldRefs.length}>
+                                <h1 class="slds-text-heading_medium">Custom Fields</h1>
+                                <c-orgcheck-extended-datatable
+                                    show-row-number-column
+                                    dont-use-all-space
+                                    onviewscore={handleViewScore}
+                                    show-search
+                                    show-statistics
+                                    is-infinite-scrolling
+                                    infinite-scrolling-initial-nb-rows=25
+                                    infinite-scrolling-additional-nb-rows=100
+                                    columns={customFieldsInObjectTableColumns}
+                                    rows={objectInformationData.customFieldRefs}></c-orgcheck-extended-datatable>
+                                <br /><br />
+                            </template>
+                            
+                            <!-- STANDARD FIELDS SECTION -->
+                            <template lwc:if={objectInformationData.standardFields.length}>
+                                <h1 class="slds-text-heading_medium">Standard Fields</h1>
+                                <c-orgcheck-extended-datatable
+                                    show-row-number-column
+                                    dont-use-all-space
+                                    onviewscore={handleViewScore}
+                                    show-search
+                                    show-statistics
+                                    is-infinite-scrolling
+                                    infinite-scrolling-initial-nb-rows=25
+                                    infinite-scrolling-additional-nb-rows=100
+                                    columns={standardFieldsInObjectTableColumns}
+                                    rows={objectInformationData.standardFields}></c-orgcheck-extended-datatable>
+                                <br /><br />
+                            </template>
 
-                        <!-- RECORD TYPES SECTION -->
-                        <template lwc:if={objectInformationData.recordTypes.length}>
-                            <h1 class="slds-text-heading_medium">Record Types</h1>
-                            <c-orgcheck-extended-datatable
-                                show-row-number-column
-                                dont-use-all-space
-                                onviewscore={handleViewScore}
-                                show-search
-                                show-statistics
-                                is-infinite-scrolling
-                                infinite-scrolling-initial-nb-rows=25
-                                infinite-scrolling-additional-nb-rows=100
-                                columns={recordTypesColumns}
-                                rows={objectInformationData.recordTypes}></c-orgcheck-extended-datatable>
-                            <br /><br />
-                        </template>
-                        
-                        <!-- RELEATIONSHIPS SECTION -->
-                        <template lwc:if={objectInformationData.relationships.length}>
-                            <h1 class="slds-text-heading_medium">Relationships</h1>
-                            <c-orgcheck-extended-datatable
-                                show-row-number-column
-                                dont-use-all-space
-                                onviewscore={handleViewScore}
-                                show-search
-                                show-statistics
-                                is-infinite-scrolling
-                                infinite-scrolling-initial-nb-rows=25
-                                infinite-scrolling-additional-nb-rows=100
-                                columns={relationshipsColumns}
-                                rows={objectInformationData.relationships}></c-orgcheck-extended-datatable>
-                            <br /><br />
+                            <!-- RECORD TYPES SECTION -->
+                            <template lwc:if={objectInformationData.recordTypes.length}>
+                                <h1 class="slds-text-heading_medium">Record Types</h1>
+                                <c-orgcheck-extended-datatable
+                                    show-row-number-column
+                                    dont-use-all-space
+                                    onviewscore={handleViewScore}
+                                    show-search
+                                    show-statistics
+                                    is-infinite-scrolling
+                                    infinite-scrolling-initial-nb-rows=25
+                                    infinite-scrolling-additional-nb-rows=100
+                                    columns={recordTypesColumns}
+                                    rows={objectInformationData.recordTypes}></c-orgcheck-extended-datatable>
+                                <br /><br />
+                            </template>
+                            
+                            <!-- RELEATIONSHIPS SECTION -->
+                            <template lwc:if={objectInformationData.relationships.length}>
+                                <h1 class="slds-text-heading_medium">Relationships</h1>
+                                <c-orgcheck-extended-datatable
+                                    show-row-number-column
+                                    dont-use-all-space
+                                    onviewscore={handleViewScore}
+                                    show-search
+                                    show-statistics
+                                    is-infinite-scrolling
+                                    infinite-scrolling-initial-nb-rows=25
+                                    infinite-scrolling-additional-nb-rows=100
+                                    columns={relationshipsColumns}
+                                    rows={objectInformationData.relationships}></c-orgcheck-extended-datatable>
+                                <br /><br />
+                            </template>
                         </template>
+                    </lightning-tab>
+                    <lightning-tab value="objects-owd" label="Org Wide Default" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no org wide default to show."
+                            show-search
+                            show-statistics
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={objectsOWDTableColumns}
+                            rows={objectsOWDTableData}
+                            show-export-button
+                            export-basename="OrgWideDefault"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                </lightning-tabset>
+            </lightning-tab>
+            <lightning-tab label="🥕 Custom Fields" onactive={handleTabActivation}>
+                <lightning-layout>
+                    <lightning-layout-item>
+                        <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="custom-fields"></lightning-button>
+                    </lightning-layout-item>
+                </lightning-layout>
+                <lightning-tabset>
+                    <lightning-tab value="custom-fields" label="Custom Fields" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no custom field to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={customFieldsTableColumns}
+                            rows={customFieldsTableData}
+                            show-export-button
+                            export-basename="CustomFields"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                </lightning-tabset>
+            </lightning-tab>
+            <lightning-tab label="🧔 Users" onactive={handleTabActivation}>
+                <lightning-layout>
+                    <lightning-layout-item>
+                        <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="users"></lightning-button>
+                    </lightning-layout-item>
+                </lightning-layout>
+                <lightning-tabset>
+                    <lightning-tab value="users" label="Active Internal Users" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no active internal user to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={usersTableColumns}
+                            rows={usersTableData}
+                            show-export-button
+                            export-basename="Users"></c-orgcheck-extended-datatable>            
+                    </lightning-tab>
+                </lightning-tabset>
+            </lightning-tab>
+            <lightning-tab label="👮 Profiles and Permission Sets" onactive={handleTabActivation}>
+                <lightning-layout>
+                    <lightning-layout-item>
+                        <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="profiles,permission-sets,profile-restrictions,profile-password-policies,object-permissions,app-permissions"></lightning-button>
+                    </lightning-layout-item>
+                </lightning-layout>
+                <lightning-tabset>
+                    <lightning-tab value="profiles" label="Profiles" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no profile to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={profilesTableColumns}
+                            rows={profilesTableData}
+                            show-export-button
+                            export-basename="Profiles"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                    <lightning-tab value="permission-sets" label="Permission Sets" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no permission to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={permissionSetsTableColumns}
+                            rows={permissionSetsTableData}
+                            show-export-button
+                            export-basename="PermissionSets"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                    <lightning-tab value="profile-restrictions" label="Profile Restrictions" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no profile restriction to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={profileRestrictionsTableColumns}
+                            rows={profileRestrictionsTableData}
+                            show-export-button
+                            export-basename="ProfileRestrictions"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                    <lightning-tab value="profile-password-policies" label="Profile Password Policies" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no profile password policy to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={profilePasswordPoliciesTableColumns}
+                            rows={profilePasswordPoliciesTableData}
+                            show-export-button
+                            export-basename="ProfilePasswordPolicies"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                    <lightning-tab value="object-permissions" label="Object Permissions" onactive={handleSubTabActivation}>
+                        <div style="text-align: right;">
+                            <b>Legend:</b> C means <i>Create</i>, R means <i>Read</i>, U means <i>Update/Modify</i>, D means <i>Delete</i>, v means <i>View All</i> and m means <i>Modify All</i>.
+                        </div>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no object permission to show."
+                            show-search
+                            show-statistics
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={objectPermissionsTableColumns}
+                            rows={objectPermissionsTableData}
+                            show-export-button
+                            export-basename="ObjectPermissions"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                    <lightning-tab value="app-permissions" label="Application Permissions" onactive={handleSubTabActivation}>
+                        <div style="text-align: right;">
+                            <b>Legend:</b> A means <i>Accessible</i> and V means <i>Visible</i>.
+                        </div>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no application permission to show."
+                            show-search
+                            show-statistics
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={appPermissionsTableColumns}
+                            rows={appPermissionsTableData}
+                            show-export-button
+                            export-basename="AppPermissions"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                </lightning-tabset>
+            </lightning-tab>
+            <lightning-tab label="🐇 Roles" onactive={handleTabActivation}>
+                <lightning-layout>
+                    <lightning-layout-item>
+                        <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="roles-explorer,roles-listing"></lightning-button>
+                    </lightning-layout-item>
+                </lightning-layout>
+                <lightning-tabset>
+                    <lightning-tab value="roles-explorer" label="Role Explorer" onactive={handleSubTabActivation}>
+                        <c-orgcheck-graphics 
+                            name="Role Hierarchy" 
+                            box-color-decorator={roleBoxColorsDecorator}
+                            box-inner-html-decorator={roleBoxInnerHtmlDecorator}
+                            box-on-click-decorator={roleBoxOnClickDecorator}
+                            show-level
+                            source={rolesTree}></c-orgcheck-graphics>
+                    </lightning-tab>
+                    <lightning-tab value="roles-listing" label="Role Listing" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no role to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={rolesTableColumns}
+                            rows={rolesTableData}
+                            show-export-button
+                            export-basename="Roles"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                </lightning-tabset>
+            </lightning-tab>
+            <lightning-tab label="🌶️ Public Groups and Queues" onactive={handleTabActivation}>
+                <lightning-layout>
+                    <lightning-layout-item>
+                        <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="public-groups,queues"></lightning-button>
+                    </lightning-layout-item>
+                </lightning-layout>
+                <lightning-tabset>
+                    <lightning-tab value="public-groups" label="Public Groups" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no public group to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={publicGroupsTableColumns}
+                            rows={publicGroupsTableData}
+                            show-export-button
+                            export-basename="PublicGroups"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                    <lightning-tab value="queues" label="Queues" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no queue to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={queuesTableColumns}
+                            rows={queuesTableData}
+                            show-export-button
+                            export-basename="Queues"></c-orgcheck-extended-datatable>            
+                    </lightning-tab>
+                </lightning-tabset>
+            </lightning-tab>
+            <lightning-tab label="🤖 Automations" onactive={handleTabActivation}>
+                <lightning-layout>
+                    <lightning-layout-item>
+                        <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="flows,process-builders,workflows"></lightning-button>
+                    </lightning-layout-item>
+                </lightning-layout>
+                <lightning-tabset>
+                    <lightning-tab value="flows" label="Flows" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no flow to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={flowsTableColumns}
+                            rows={flowsTableData}
+                            show-export-button
+                            export-basename="Flows"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                    <lightning-tab value="process-builders" label="Process Builders" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no process builder to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={processBuildersTableColumns}
+                            rows={processBuildersTableData}
+                            show-export-button
+                            export-basename="ProcessBuilders"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                    <lightning-tab value="workflows" label="Workflows" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no workflow to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={workflowsTableColumns}
+                            rows={workflowsTableData}
+                            show-export-button
+                            export-basename="Workflows"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                </lightning-tabset>
+            </lightning-tab>
+            <lightning-tab label="🎁 Custom Labels" onactive={handleTabActivation}>
+                <lightning-layout>
+                    <lightning-layout-item>
+                        <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="custom-labels"></lightning-button>
+                    </lightning-layout-item>
+                </lightning-layout>
+                <lightning-tabset>
+                    <lightning-tab value="custom-labels" label="Custom Labels" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no custom label to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={customLabelsTableColumns}
+                            rows={customLabelsTableData}
+                            show-export-button
+                            export-basename="CustomLabels"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                </lightning-tabset>
+            </lightning-tab>
+            <lightning-tab label="🥐 Visual Components" onactive={handleTabActivation}>
+                <lightning-layout>
+                    <lightning-layout-item>
+                        <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="visual-force-pages,visual-force-components,lightning-pages,lightning-aura-components,lightning-web-components"></lightning-button>
+                    </lightning-layout-item>
+                </lightning-layout>
+                <lightning-tabset>
+                    <lightning-tab value="visual-force-pages" label="Visual Force Pages" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no visual force page to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={visualForcePagesTableColumns}
+                            rows={visualForcePagesTableData}
+                            show-export-button
+                            export-basename="VisualForcePages"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                    <lightning-tab value="visual-force-components" label="Visual Force Components" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no visual force component to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={visualForceComponentsTableColumns}
+                            rows={visualForceComponentsTableData}
+                            show-export-button
+                            export-basename="VisualForceComponents"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                    <lightning-tab value="lightning-pages" label="Lightning Pages" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no Lightning Page to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={lightningPagesTableColumns}
+                            rows={lightningPagesTableData}
+                            show-export-button
+                            export-basename="LightningPages"></c-orgcheck-extended-datatable>
+                    </lightning-tab>
+                    <lightning-tab value="lightning-aura-components" label="Lightning Aura Components" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no Lightning Aura Component to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={auraComponentsTableColumns}
+                            rows={auraComponentsTableData}
+                            show-export-button
+                            export-basename="LightningAuraComponents"></c-orgcheck-extended-datatable>            
+                    </lightning-tab>
+                    <lightning-tab value="lightning-web-components" label="Lightning Web Components" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no Lightning Web Component to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={lightningWebComponentsTableColumns}
+                            rows={lightningWebComponentsTableData}
+                            show-export-button
+                            export-basename="LightningWebComponents"></c-orgcheck-extended-datatable>            
+                    </lightning-tab>
+                </lightning-tabset>
+            </lightning-tab>
+            <lightning-tab label="🔥 Apex" onactive={handleTabActivation}>
+                <lightning-layout>
+                    <lightning-layout-item>
+                        <lightning-button label="Run All Tests" title="Run All Tests" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:apex" onclick={handleClickRunAllTests}></lightning-button>
+                    </lightning-layout-item>
+                    <template if:true={apexUncompiledTableData}>
+                        <lightning-layout-item>
+                            <lightning-button label="You have uncompiled classes, ask for recompilation!" title="You have uncompiled classes, ask for recompilation!" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRecompile}></lightning-button>
+                        </lightning-layout-item>
                     </template>
-                </lightning-tab>
-                <lightning-tab value="objects-owd" label="Org Wide Default" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no org wide default to show."
-                        show-search
-                        show-statistics
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={objectsOWDTableColumns}
-                        rows={objectsOWDTableData}
-                        show-export-button
-                        export-basename="OrgWideDefault"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-            </lightning-tabset>
-        </lightning-tab>
-        <lightning-tab label="🥕 Custom Fields" onactive={handleTabActivation}>
-            <lightning-layout>
-                <lightning-layout-item>
-                    <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="custom-fields"></lightning-button>
-                </lightning-layout-item>
-            </lightning-layout>
-            <lightning-tabset>
-                <lightning-tab value="custom-fields" label="Custom Fields" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no custom field to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={customFieldsTableColumns}
-                        rows={customFieldsTableData}
-                        show-export-button
-                        export-basename="CustomFields"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-            </lightning-tabset>
-        </lightning-tab>
-        <lightning-tab label="🧔 Users" onactive={handleTabActivation}>
-            <lightning-layout>
-                <lightning-layout-item>
-                    <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="users"></lightning-button>
-                </lightning-layout-item>
-            </lightning-layout>
-            <lightning-tabset>
-                <lightning-tab value="users" label="Active Internal Users" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no active internal user to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={usersTableColumns}
-                        rows={usersTableData}
-                        show-export-button
-                        export-basename="Users"></c-orgcheck-extended-datatable>            
-                </lightning-tab>
-            </lightning-tabset>
-        </lightning-tab>
-        <lightning-tab label="👮 Profiles and Permission Sets" onactive={handleTabActivation}>
-            <lightning-layout>
-                <lightning-layout-item>
-                    <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="profiles,permission-sets,profile-restrictions,profile-password-policies,object-permissions,app-permissions"></lightning-button>
-                </lightning-layout-item>
-            </lightning-layout>
-            <lightning-tabset>
-                <lightning-tab value="profiles" label="Profiles" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no profile to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={profilesTableColumns}
-                        rows={profilesTableData}
-                        show-export-button
-                        export-basename="Profiles"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-                <lightning-tab value="permission-sets" label="Permission Sets" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no permission to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={permissionSetsTableColumns}
-                        rows={permissionSetsTableData}
-                        show-export-button
-                        export-basename="PermissionSets"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-                <lightning-tab value="profile-restrictions" label="Profile Restrictions" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no profile restriction to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={profileRestrictionsTableColumns}
-                        rows={profileRestrictionsTableData}
-                        show-export-button
-                        export-basename="ProfileRestrictions"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-                <lightning-tab value="profile-password-policies" label="Profile Password Policies" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no profile password policy to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={profilePasswordPoliciesTableColumns}
-                        rows={profilePasswordPoliciesTableData}
-                        show-export-button
-                        export-basename="ProfilePasswordPolicies"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-                <lightning-tab value="object-permissions" label="Object Permissions" onactive={handleSubTabActivation}>
-                    <div style="text-align: right;">
-                        <b>Legend:</b> C means <i>Create</i>, R means <i>Read</i>, U means <i>Update/Modify</i>, D means <i>Delete</i>, v means <i>View All</i> and m means <i>Modify All</i>.
-                    </div>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no object permission to show."
-                        show-search
-                        show-statistics
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={objectPermissionsTableColumns}
-                        rows={objectPermissionsTableData}
-                        show-export-button
-                        export-basename="ObjectPermissions"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-                <lightning-tab value="app-permissions" label="Application Permissions" onactive={handleSubTabActivation}>
-                    <div style="text-align: right;">
-                        <b>Legend:</b> A means <i>Accessible</i> and V means <i>Visible</i>.
-                    </div>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no application permission to show."
-                        show-search
-                        show-statistics
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={appPermissionsTableColumns}
-                        rows={appPermissionsTableData}
-                        show-export-button
-                        export-basename="AppPermissions"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-            </lightning-tabset>
-        </lightning-tab>
-        <lightning-tab label="🐇 Roles" onactive={handleTabActivation}>
-            <lightning-layout>
-                <lightning-layout-item>
-                    <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="roles-explorer,roles-listing"></lightning-button>
-                </lightning-layout-item>
-            </lightning-layout>
-            <lightning-tabset>
-                <lightning-tab value="roles-explorer" label="Role Explorer" onactive={handleSubTabActivation}>
-                    <c-orgcheck-graphics 
-                        name="Role Hierarchy" 
-                        box-color-decorator={roleBoxColorsDecorator}
-                        box-inner-html-decorator={roleBoxInnerHtmlDecorator}
-                        box-on-click-decorator={roleBoxOnClickDecorator}
-                        show-level
-                        source={rolesTree}></c-orgcheck-graphics>
-                </lightning-tab>
-                <lightning-tab value="roles-listing" label="Role Listing" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no role to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={rolesTableColumns}
-                        rows={rolesTableData}
-                        show-export-button
-                        export-basename="Roles"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-            </lightning-tabset>
-        </lightning-tab>
-        <lightning-tab label="🌶️ Public Groups and Queues" onactive={handleTabActivation}>
-            <lightning-layout>
-                <lightning-layout-item>
-                    <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="public-groups,queues"></lightning-button>
-                </lightning-layout-item>
-            </lightning-layout>
-            <lightning-tabset>
-                <lightning-tab value="public-groups" label="Public Groups" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no public group to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={publicGroupsTableColumns}
-                        rows={publicGroupsTableData}
-                        show-export-button
-                        export-basename="PublicGroups"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-                <lightning-tab value="queues" label="Queues" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no queue to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={queuesTableColumns}
-                        rows={queuesTableData}
-                        show-export-button
-                        export-basename="Queues"></c-orgcheck-extended-datatable>            
-                </lightning-tab>
-            </lightning-tabset>
-        </lightning-tab>
-        <lightning-tab label="🤖 Automations" onactive={handleTabActivation}>
-            <lightning-layout>
-                <lightning-layout-item>
-                    <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="flows,process-builders,workflows"></lightning-button>
-                </lightning-layout-item>
-            </lightning-layout>
-            <lightning-tabset>
-                <lightning-tab value="flows" label="Flows" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no flow to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={flowsTableColumns}
-                        rows={flowsTableData}
-                        show-export-button
-                        export-basename="Flows"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-                <lightning-tab value="process-builders" label="Process Builders" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no process builder to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={processBuildersTableColumns}
-                        rows={processBuildersTableData}
-                        show-export-button
-                        export-basename="ProcessBuilders"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-                <lightning-tab value="workflows" label="Workflows" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no workflow to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={workflowsTableColumns}
-                        rows={workflowsTableData}
-                        show-export-button
-                        export-basename="Workflows"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-            </lightning-tabset>
-        </lightning-tab>
-        <lightning-tab label="🎁 Custom Labels" onactive={handleTabActivation}>
-            <lightning-layout>
-                <lightning-layout-item>
-                    <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="custom-labels"></lightning-button>
-                </lightning-layout-item>
-            </lightning-layout>
-            <lightning-tabset>
-                <lightning-tab value="custom-labels" label="Custom Labels" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no custom label to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={customLabelsTableColumns}
-                        rows={customLabelsTableData}
-                        show-export-button
-                        export-basename="CustomLabels"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-            </lightning-tabset>
-        </lightning-tab>
-        <lightning-tab label="🥐 Visual Components" onactive={handleTabActivation}>
-            <lightning-layout>
-                <lightning-layout-item>
-                    <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="visual-force-pages,visual-force-components,lightning-pages,lightning-aura-components,lightning-web-components"></lightning-button>
-                </lightning-layout-item>
-            </lightning-layout>
-            <lightning-tabset>
-                <lightning-tab value="visual-force-pages" label="Visual Force Pages" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no visual force page to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={visualForcePagesTableColumns}
-                        rows={visualForcePagesTableData}
-                        show-export-button
-                        export-basename="VisualForcePages"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-                <lightning-tab value="visual-force-components" label="Visual Force Components" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no visual force component to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={visualForceComponentsTableColumns}
-                        rows={visualForceComponentsTableData}
-                        show-export-button
-                        export-basename="VisualForceComponents"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-                <lightning-tab value="lightning-pages" label="Lightning Pages" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no Lightning Page to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={lightningPagesTableColumns}
-                        rows={lightningPagesTableData}
-                        show-export-button
-                        export-basename="LightningPages"></c-orgcheck-extended-datatable>
-                </lightning-tab>
-                <lightning-tab value="lightning-aura-components" label="Lightning Aura Components" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no Lightning Aura Component to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={auraComponentsTableColumns}
-                        rows={auraComponentsTableData}
-                        show-export-button
-                        export-basename="LightningAuraComponents"></c-orgcheck-extended-datatable>            
-                </lightning-tab>
-                <lightning-tab value="lightning-web-components" label="Lightning Web Components" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no Lightning Web Component to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={lightningWebComponentsTableColumns}
-                        rows={lightningWebComponentsTableData}
-                        show-export-button
-                        export-basename="LightningWebComponents"></c-orgcheck-extended-datatable>            
-                </lightning-tab>
-            </lightning-tabset>
-        </lightning-tab>
-        <lightning-tab label="🔥 Apex" onactive={handleTabActivation}>
-            <lightning-layout>
-                <lightning-layout-item>
-                    <lightning-button label="Run All Tests" title="Run All Tests" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:apex" onclick={handleClickRunAllTests}></lightning-button>
-                </lightning-layout-item>
-                <template if:true={apexUncompiledTableData}>
                     <lightning-layout-item>
-                        <lightning-button label="You have uncompiled classes, ask for recompilation!" title="You have uncompiled classes, ask for recompilation!" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRecompile}></lightning-button>
+                        <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="apex-classes,apex-recompilation-needed,apex-triggers,apex-unit-tests"></lightning-button>
                     </lightning-layout-item>
-                </template>
-                <lightning-layout-item>
-                    <lightning-button label="Refresh" title="Refresh" variant="brand-outline" class="slds-var-m-left_x-small" icon-name="utility:refresh" onclick={handleClickRefresh} data-tabs="apex-classes,apex-recompilation-needed,apex-triggers,apex-unit-tests"></lightning-button>
-                </lightning-layout-item>
-            </lightning-layout>
-            <lightning-tabset>
-                <lightning-tab value="apex-classes" label="Apex Classes" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no Apex Class to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={apexClassesTableColumns}
-                        rows={apexClassesTableData}
-                        show-export-button
-                        export-basename="ApexClasses"></c-orgcheck-extended-datatable>            
-                </lightning-tab>
-                <lightning-tab value="apex-recompilation-needed" label="Apex Classes That Need Recompilation" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no Apex Uncompiled Class to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={apexUncompiledTableColumns}
-                        rows={apexUncompiledTableData}
-                        show-export-button
-                        export-basename="ApexClassesNeedCompilation"></c-orgcheck-extended-datatable>            
-                </lightning-tab>
-                <lightning-tab value="apex-triggers" label="Apex Triggers" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no Apex Trigger to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={apexTriggersTableColumns}
-                        rows={apexTriggersTableData}
-                        show-export-button
-                        export-basename="ApexTriggers"></c-orgcheck-extended-datatable>            
-                </lightning-tab>
-                <lightning-tab value="apex-unit-tests" label="Apex Unit Tests" onactive={handleSubTabActivation}>
-                    <c-orgcheck-extended-datatable
-                        empty-message="There is no Apex Unit Test to show."
-                        show-search
-                        show-statistics
-                        onviewscore={handleViewScore}
-                        show-row-number-column
-                        is-sticky-headers
-                        is-infinite-scrolling
-                        infinite-scrolling-initial-nb-rows=25
-                        infinite-scrolling-additional-nb-rows=100
-                        columns={apexTestsTableColumns}
-                        rows={apexTestsTableData}
-                        show-export-button
-                        export-basename="ApexUnitTests"></c-orgcheck-extended-datatable>            
-                </lightning-tab>
-            </lightning-tabset>
-        </lightning-tab>
+                </lightning-layout>
+                <lightning-tabset>
+                    <lightning-tab value="apex-classes" label="Apex Classes" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no Apex Class to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={apexClassesTableColumns}
+                            rows={apexClassesTableData}
+                            show-export-button
+                            export-basename="ApexClasses"></c-orgcheck-extended-datatable>            
+                    </lightning-tab>
+                    <lightning-tab value="apex-recompilation-needed" label="Apex Classes That Need Recompilation" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no Apex Uncompiled Class to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={apexUncompiledTableColumns}
+                            rows={apexUncompiledTableData}
+                            show-export-button
+                            export-basename="ApexClassesNeedCompilation"></c-orgcheck-extended-datatable>            
+                    </lightning-tab>
+                    <lightning-tab value="apex-triggers" label="Apex Triggers" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no Apex Trigger to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={apexTriggersTableColumns}
+                            rows={apexTriggersTableData}
+                            show-export-button
+                            export-basename="ApexTriggers"></c-orgcheck-extended-datatable>            
+                    </lightning-tab>
+                    <lightning-tab value="apex-unit-tests" label="Apex Unit Tests" onactive={handleSubTabActivation}>
+                        <c-orgcheck-extended-datatable
+                            empty-message="There is no Apex Unit Test to show."
+                            show-search
+                            show-statistics
+                            onviewscore={handleViewScore}
+                            show-row-number-column
+                            is-sticky-headers
+                            is-infinite-scrolling
+                            infinite-scrolling-initial-nb-rows=25
+                            infinite-scrolling-additional-nb-rows=100
+                            columns={apexTestsTableColumns}
+                            rows={apexTestsTableData}
+                            show-export-button
+                            export-basename="ApexUnitTests"></c-orgcheck-extended-datatable>            
+                    </lightning-tab>
+                </lightning-tabset>
+            </lightning-tab>
+        </template>
     </lightning-tabset>
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/orgcheckApp/orgcheckApp.js b/force-app/main/default/lwc/orgcheckApp/orgcheckApp.js
index e41dbb6..1a4408f 100644
--- a/force-app/main/default/lwc/orgcheckApp/orgcheckApp.js
+++ b/force-app/main/default/lwc/orgcheckApp/orgcheckApp.js
@@ -11,6 +11,9 @@ export default class OrgCheckApp extends LightningElement {
      */
     logoURL = OrgCheckStaticRessource + '/img/Logo.svg';
 
+    useOrgCheckInThisOrgConfirmed = false;
+    useOrgCheckInThisOrgNeedConfirmation = false;
+
     orgCheckVersion;
     orgName;
     orgType;
@@ -45,7 +48,6 @@ export default class OrgCheckApp extends LightningElement {
     #api;
 
     #hasRenderOnce = false;
-    #keepSpinnerOpen = true;
     #spinner;
     #modal;
     #filters;
@@ -56,7 +58,7 @@ export default class OrgCheckApp extends LightningElement {
             this.#spinner = this.template.querySelector('c-orgcheck-spinner');
             this.#modal = this.template.querySelector('c-orgcheck-modal');
             this.#filters = this.template.querySelector('c-orgcheck-global-filters');
-            await this._loadAPI();
+            await this._load();
         }
     }
 
@@ -70,6 +72,13 @@ export default class OrgCheckApp extends LightningElement {
         await this._updateCurrentTab();
     }
 
+    async handleClickUsageAcceptance(event) {
+        if (event.target.checked) {
+            this.#api.acceptUsageTerms();
+            await this._load();
+        }
+    }
+
     /**
      * Event called when user selects a main tab
      * This updates the internal private property called "#currentTab" that represents the name of the tab currently opened/visible.
@@ -221,75 +230,94 @@ export default class OrgCheckApp extends LightningElement {
     }
 
     /**
-     * Internal method to load the Org Check API and its dependencies
+     * Internal method to load and set the Org Check API
      */ 
-    async _loadAPI() {
+    async _load() {
 
-        const LOG_SECTION = 'INIT';
+        const LOG_SECTION = 'LOAD API';
         this.#spinner.open();
         this.#spinner.sectionStarts(LOG_SECTION, "C'est parti !");
+        let doNotCloseYet = true;
 
         try {
-            this.#spinner.sectionContinues(LOG_SECTION, 'Loading JsForce and FFLate libraries...')
-            await Promise.all([
-                loadScript(this, OrgCheckStaticRessource + '/js/jsforce.js'),
-                loadScript(this, OrgCheckStaticRessource + '/js/fflate.js')
-            ]);
-
-            this.#spinner.sectionContinues(LOG_SECTION, 'Loading Org Check library...')
-            this.#api = new OrgCheckAPI(
-                // eslint-disable-next-line no-undef
-                jsforce,
-                // eslint-disable-next-line no-undef
-                fflate,
-                this.accessToken,
-                this.userId,
-                {
-                    begin: () => { this.#spinner.open(); },
-                    sectionStarts: (s, m) => { this.#spinner.sectionStarts(s, m); },
-                    sectionContinues: (s, m) => { this.#spinner.sectionContinues(s, m); },
-                    sectionEnded: (s, m) => { this.#spinner.sectionEnded(s, m); },
-                    sectionFailed: (s, e) => { this.#spinner.sectionFailed(s, e); },
-                    end: (s, f) => { if (this.#keepSpinnerOpen === true) return; if (f === 0) this.#spinner.close(); else this.#spinner.canBeClosed(); }
-                }
-            );
 
-            this.orgCheckVersion = this.#api.getVersion();
+            // Init of the Org Check api (only once!)
+            if (!this.#api) {
+
+                // Load JS dependencies
+                this.#spinner.sectionContinues(LOG_SECTION, 'Loading JsForce and FFLate libraries...')
+                await Promise.all([
+                    loadScript(this, OrgCheckStaticRessource + '/js/jsforce.js'),
+                    loadScript(this, OrgCheckStaticRessource + '/js/fflate.js')
+                ]);
+
+                // Create the Org Check API
+                this.#spinner.sectionContinues(LOG_SECTION, 'Loading Org Check library...')
+                this.#api = new OrgCheckAPI(
+                    // eslint-disable-next-line no-undef
+                    jsforce,
+                    // eslint-disable-next-line no-undef
+                    fflate,
+                    this.accessToken,
+                    this.userId,
+                    {
+                        begin: () => { this.#spinner.open(); },
+                        sectionStarts: (s, m) => { this.#spinner.sectionStarts(s, m); },
+                        sectionContinues: (s, m) => { this.#spinner.sectionContinues(s, m); },
+                        sectionEnded: (s, m) => { this.#spinner.sectionEnded(s, m); },
+                        sectionFailed: (s, e) => { this.#spinner.sectionFailed(s, e); },
+                        end: (s, f) => { if (doNotCloseYet) return; if (f === 0) this.#spinner.close(); else this.#spinner.canBeClosed(); }
+                    }
+                );
 
-            this.#spinner.sectionContinues(LOG_SECTION, 'Checking if current user has enough permission...')
-            await this.#api.checkCurrentUserPermissions();
+                // Set the version
+                this.orgCheckVersion = this.#api.getVersion();
+            }
 
-            this.#spinner.sectionContinues(LOG_SECTION, 'Gathering information from the org and fetching info for the global filter...');
-            const infoData = await Promise.all([
-                this.#api.getOrganizationInformation(),
-                this.#api.getPackagesTypesAndObjects('*', '*')
-            ]);
+            // Check if we can use this org
+            this.#spinner.sectionContinues(LOG_SECTION, 'Checking if we can use the org according to the terms...')
+            if (await this.#api.checkUsageTerms()) {
+                this.useOrgCheckInThisOrgNeedConfirmation = false;
+                this.useOrgCheckInThisOrgConfirmed = true;
+            } else {
+                this.useOrgCheckInThisOrgNeedConfirmation = true;
+                this.useOrgCheckInThisOrgConfirmed = false;
+            }
 
             // Information about the org
             this.#spinner.sectionContinues(LOG_SECTION, 'Information about the org...');
-            const orgInfo = infoData[0];
+            const orgInfo = await this.#api.getOrganizationInformation();
             this.orgName = orgInfo.name + ' (' + orgInfo.id + ')';
             this.orgType = orgInfo.type;
             this.isOrgProduction = orgInfo.isProduction;
             if (orgInfo.isProduction === true) this.themeForOrgType = 'slds-theme_error';
             else if (orgInfo.isSandbox === true) this.themeForOrgType = 'slds-theme_warning';
             else this.themeForOrgType = 'slds-theme_success';
-            this.#filters.updateIsCurrentOrgAProduction(this.isOrgProduction === true);
 
-            // Data for the filters
-            this.#spinner.sectionContinues(LOG_SECTION, 'Data for the filters...');
-            const filtersData = infoData[1];
-            this.#filters.updateSObjectTypeOptions(filtersData.types);
-            this.#filters.updatePackageOptions(filtersData.packages);
-            this.#filters.updateSObjectApiNameOptions(filtersData.objects);
+            if (this.useOrgCheckInThisOrgConfirmed === true) {
+
+                // Check basic permission
+                this.#spinner.sectionContinues(LOG_SECTION, 'Checking if current user has enough permission...')
+                await this.#api.checkCurrentUserPermissions();
+                
+                // Data for the filters
+                this.#spinner.sectionContinues(LOG_SECTION, 'Data for the filters...');
+                const filtersData = await this.#api.getPackagesTypesAndObjects('*', '*');
+                this.#filters.updateSObjectTypeOptions(filtersData.types);
+                this.#filters.updatePackageOptions(filtersData.packages);
+                this.#filters.updateSObjectApiNameOptions(filtersData.objects);
+                this.#filters.show();
+
+                this._updateCurrentTab();
+            }
 
             // FINALLY!
+            doNotCloseYet = false;
             this.#spinner.sectionEnded(LOG_SECTION, 'All set!');
-            this._updateCurrentTab();
-            this._updateDailyAPIUsage();
-            this.#keepSpinnerOpen = false;
+            this.#spinner.close();
     
         } catch(error) {
+            this.#spinner.canBeClosed();
             this.#spinner.sectionFailed(LOG_SECTION, error);
         }
     }
@@ -328,19 +356,7 @@ export default class OrgCheckApp extends LightningElement {
         const namespace = this.#filters.isSelectedPackageAny === true ? '*' : (this.#filters.isSelectedPackageNo === true ? '' : this.#filters.selectedPackage);
         const sobjectType = this.#filters.isSelectedSObjectTypeAny === true ? '*' : this.#filters.selectedSObjectType;
         const sobject = this.#filters.isSelectedSObjectApiNameAny === true ? '*' : this.#filters.selectedSObjectApiName;
-        const shouldWeStop = this.isOrgProduction === true && this.#filters.isUseInProductionConfirmed === false;
-
-        if (shouldWeStop === true) {
-            this.#modal.open(
-                'Wait a minute!', 
-                'You are using the application in <b>Production</b>.<br /><br />'+
-                'Please accept to terms of conditions for direct usage in production by changing the filter "<code>Do you confirm running Org Check in production?</code>" to <code>YES</code>.<br /><br />'+
-                'Thank you and have a nice day!',
-                true
-            );
-            return;
-        }
-    
+        
         // Call the API depending on the current tab
         // If not supported we stop there
         // Finally send the data to the content component.
@@ -348,7 +364,8 @@ export default class OrgCheckApp extends LightningElement {
         const section = `TAB ${this.#currentTab}`;
         try {
             this.#spinner.open();
-            this.#keepSpinnerOpen = true;
+
+            // Continue calling the api...
             this.#spinner.sectionStarts(section, 'Call the corresponding Org Check API');
             this._updateDailyAPIUsage();
             switch (this.#currentTab) {
@@ -416,7 +433,6 @@ export default class OrgCheckApp extends LightningElement {
             this._updateDailyAPIUsage();
             this.#spinner.sectionEnded(section, 'Done');
             this.#spinner.close();
-            this.#keepSpinnerOpen = false;
 
         } catch (error) {
             this.#spinner.sectionFailed(section, error);
diff --git a/force-app/main/default/lwc/orgcheckGlobalFilters/orgcheckGlobalFilters.html b/force-app/main/default/lwc/orgcheckGlobalFilters/orgcheckGlobalFilters.html
index ff5daae..43c4dc2 100644
--- a/force-app/main/default/lwc/orgcheckGlobalFilters/orgcheckGlobalFilters.html
+++ b/force-app/main/default/lwc/orgcheckGlobalFilters/orgcheckGlobalFilters.html
@@ -1,70 +1,52 @@
 <template>
-    <ul class="slds-button-group-row">
-        <li class="slds-button-group-item">
-            <lightning-combobox
-                data-id="package"
-                label="Package"
-                value={package}
-                options={packageOptions}
-                onchange={filterChanged} ></lightning-combobox>
-        </li>
-        <li class="slds-button-group-item">
-            <lightning-combobox
-                data-id="sobjectType"
-                label="SObject Type"
-                value={sobjectType}
-                options={sobjectTypeOptions}
-                onchange={filterChanged} ></lightning-combobox>
-        </li>
-        <li class="slds-button-group-item">
-            <lightning-combobox 
-                data-id="sobjectApiName"
-                label="SObject"
-                value={sobjectApiName}
-                options={sobjectApiNameOptions}
-                onchange={filterChanged}></lightning-combobox>
-        </li>
-        <!--
-        <li class="slds-button-group-item">
-            <lightning-combobox
-                data-id="showExternalRoles"
-                label="Show external roles?"
-                value={showExternalRoles}
-                options={yesNoOptions}
-                onchange={filterChanged} ></lightning-combobox>
-        </li>
-        -->
-        <template lwc:if={isCurrentOrgAProduction}>
+    <template if:true={showFilter}>
+        <ul class="slds-button-group-row">
             <li class="slds-button-group-item">
                 <lightning-combobox
-                    data-id="useInProductionConfirmation"
-                    label="Do you confirm running Org Check in production?"
-                    value={useInProductionConfirmation}
-                    options={yesNoOptions}
+                    data-id="package"
+                    label="Package"
+                    value={package}
+                    options={packageOptions}
                     onchange={filterChanged} ></lightning-combobox>
             </li>
-        </template>
-        <template lwc:if={filtersChanged}>
             <li class="slds-button-group-item">
-                <label class="slds-form-element__label">{whichFiltersChanged.length} filter(s) changed</label><br />
-                <lightning-button 
-                    variant="brand" 
-                    label="Apply" 
-                    icon-name="utility:download" 
-                    title="You are ready to apply these filters in the app..." 
-                    onclick={propagateValues}></lightning-button>
+                <lightning-combobox
+                    data-id="sobjectType"
+                    label="SObject Type"
+                    value={sobjectType}
+                    options={sobjectTypeOptions}
+                    onchange={filterChanged} ></lightning-combobox>
             </li>
-        </template>
-        <template lwc:if={filtersOriginallyChanged}>
             <li class="slds-button-group-item">
-                <label class="slds-form-element__label">Go back to the initial values</label><br />
-                <lightning-button 
-                    variant="destructive" 
-                    label="Reset" 
-                    icon-name="utility:delete" 
-                    title="Reset the filters and go back to the initial values..." 
-                    onclick={resetValues}></lightning-button>
+                <lightning-combobox 
+                    data-id="sobjectApiName"
+                    label="SObject"
+                    value={sobjectApiName}
+                    options={sobjectApiNameOptions}
+                    onchange={filterChanged}></lightning-combobox>
             </li>
-        </template>
-    </ul>
+            <template lwc:if={filtersChanged}>
+                <li class="slds-button-group-item">
+                    <label class="slds-form-element__label">{whichFiltersChanged.length} filter(s) changed</label><br />
+                    <lightning-button 
+                        variant="brand" 
+                        label="Apply" 
+                        icon-name="utility:download" 
+                        title="You are ready to apply these filters in the app..." 
+                        onclick={propagateValues}></lightning-button>
+                </li>
+            </template>
+            <template lwc:if={filtersOriginallyChanged}>
+                <li class="slds-button-group-item">
+                    <label class="slds-form-element__label">Go back to the initial values</label><br />
+                    <lightning-button 
+                        variant="destructive" 
+                        label="Reset" 
+                        icon-name="utility:delete" 
+                        title="Reset the filters and go back to the initial values..." 
+                        onclick={resetValues}></lightning-button>
+                </li>
+            </template>
+        </ul>
+    </template>
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/orgcheckGlobalFilters/orgcheckGlobalFilters.js b/force-app/main/default/lwc/orgcheckGlobalFilters/orgcheckGlobalFilters.js
index 585ca5a..9170734 100644
--- a/force-app/main/default/lwc/orgcheckGlobalFilters/orgcheckGlobalFilters.js
+++ b/force-app/main/default/lwc/orgcheckGlobalFilters/orgcheckGlobalFilters.js
@@ -25,18 +25,6 @@ export default class OrgcheckGlobalFilters extends LightningElement {
      */
     sobjectApiName = ANY_VALUES;
 
-    /** 
-     * Show external roles option selected in the filter
-     * False by default;
-     */
-    showExternalRoles = FALSE_AS_STRING;
-
-    /** 
-     * Production by-pass option selected in the filter
-     * False by default;
-     */
-    useInProductionConfirmation = FALSE_AS_STRING;
-    
     /** 
      * Package options
      */
@@ -57,8 +45,6 @@ export default class OrgcheckGlobalFilters extends LightningElement {
      */
     sobjectApiNameData;
 
-    isCurrentOrgAProduction = false;
-
     /** 
      * Yes/No options
      */
@@ -67,6 +53,12 @@ export default class OrgcheckGlobalFilters extends LightningElement {
         { label: 'No', value: FALSE_AS_STRING }
     ];
 
+    showFilter = false;
+    
+    @api show() {
+        this.showFilter = true;
+    }
+
     /**
      * Update the list of package options.
      * This method adds systematically the 'All packages' and the 'No package' options on top.
@@ -125,10 +117,6 @@ export default class OrgcheckGlobalFilters extends LightningElement {
         }
     }
 
-    @api updateIsCurrentOrgAProduction(isCurrentOrgAProduction) { 
-        this.isCurrentOrgAProduction = (isCurrentOrgAProduction === true); 
-    }
-
     /**
      * Internal filtering of object options
      */
@@ -186,10 +174,6 @@ export default class OrgcheckGlobalFilters extends LightningElement {
      */
     @api get isSelectedSObjectApiNameAny() { return this.sobjectApiName === ANY_VALUES; }
 
-    @api get isShowExternalRolesSelected() { return this.showExternalRoles === TRUE_AS_STRING; }
-
-    @api get isUseInProductionConfirmed() { return this.useInProductionConfirmation === TRUE_AS_STRING; }
-
     /**
      * This array indicates which filters has changed since last validation
      * By default, the array is empty.
@@ -245,8 +229,6 @@ export default class OrgcheckGlobalFilters extends LightningElement {
         this.package = ANY_VALUES;
         this.sobjectType = ANY_VALUES;
         this.sobjectApiName = ANY_VALUES;
-        this.showExternalRoles = FALSE_AS_STRING;
-        this.useInProductionConfirmation = FALSE_AS_STRING;
         this.propagateValues();
         this.filtersOriginallyChanged = false;
     }