diff --git a/apps/Core/Components/Devtools/Modules/ModulesComponent.php b/apps/Core/Components/Devtools/Modules/ModulesComponent.php
index 15a1228bf..4373ef18d 100644
--- a/apps/Core/Components/Devtools/Modules/ModulesComponent.php
+++ b/apps/Core/Components/Devtools/Modules/ModulesComponent.php
@@ -192,7 +192,7 @@ public function viewAction()
 					foreach ($modulesTypeArr['childs'] as $childKey => &$child) {
 						$child = $this->modulesPackage->validateFilesHash($child);
 
-						if ($child['repoExists'] && !$child['isModified']) {
+						if ($child['repoExists'] && !$child['isModified'] && $child['latestRelease']) {
 							unset($modules[$moduleType]['childs'][$childKey]);
 						}
 					}
diff --git a/apps/Core/Packages/Devtools/Modules/DevtoolsModules.php b/apps/Core/Packages/Devtools/Modules/DevtoolsModules.php
index 024acaa05..f71fc4d5e 100644
--- a/apps/Core/Packages/Devtools/Modules/DevtoolsModules.php
+++ b/apps/Core/Packages/Devtools/Modules/DevtoolsModules.php
@@ -39,27 +39,7 @@ class DevtoolsModules extends BasePackage
 
     public function addModule($data)
     {
-        if ($data['api_id'] != '0' &&
-            ($data['repo'] === 'https://.../' || $data['repo'] === '')
-        ) {
-            $this->addResponse('Repository is not local, please provide correct module repo url.', 1);
-
-            return false;
-        }
-
-        if (!isset($data['module_type']) ||
-            (isset($data['module_type']) &&
-             ($data['module_type'] === 'components' || $data['module_type'] === 'apps_types')
-            )
-        ) {
-            $ignoreChars = [' '];
-        } else {
-            $ignoreChars = [''];
-        }
-
-        if (!checkCtype($data['name'], 'alpha', $ignoreChars)) {
-            $this->addResponse('Name cannot have special chars or numbers.', 1);
-
+        if (!$this->precheck($data)) {
             return false;
         }
 
@@ -111,19 +91,8 @@ public function addModule($data)
             return false;
         }
 
-        if ($data['module_type'] === 'components') {
-            $moduleMethod = 'get' . ucfirst(substr($data['module_type'], 0, -1)) . 'ByAppTypeAndRepoAndRoute';
-            $module = $this->modules->{$data['module_type']}->{$moduleMethod}($data['app_type'], $data['repo'], $data['route']);
-        } else if ($data['module_type'] === 'packages' || $data['module_type'] === 'middlewares') {
-            $moduleMethod = 'get' . ucfirst(substr($data['module_type'], 0, -1)) . 'ByAppTypeAndRepoAndClass';
-            $module = $this->modules->{$data['module_type']}->{$moduleMethod}($data['app_type'], $data['repo'], $data['class']);
-        } else if ($data['module_type'] === 'views') {
-            $moduleMethod = 'get' . ucfirst(substr($data['module_type'], 0, -1)) . 'ByAppTypeAndRepoAndName';
-            $module = $this->modules->{$data['module_type']}->{$moduleMethod}($data['app_type'], $data['repo'], $data['name']);
-        }
-
-        if ($module) {
-            $this->addResponse('Module already exists!', 1);
+        if ($this->searchModule($data)) {
+            $this->addResponse('Module already exists! Check name & class', 1);
 
             return false;
         }
@@ -218,27 +187,7 @@ public function addModule($data)
 
     public function updateModule($data)
     {
-        if ($data['api_id'] != '0' &&
-            ($data['repo'] === 'https://.../' || $data['repo'] === '')
-        ) {
-            $this->addResponse('Repository is not local, please provide correct module repo url.', 1);
-
-            return false;
-        }
-
-        if (!isset($data['module_type']) ||
-            (isset($data['module_type']) &&
-             ($data['module_type'] === 'components' || $data['module_type'] === 'apps_types')
-            )
-        ) {
-            $ignoreChars = [' '];
-        } else {
-            $ignoreChars = [''];
-        }
-
-        if (!checkCtype($data['name'], 'alpha', $ignoreChars)) {
-            $this->addResponse('Name cannot have special chars or numbers.', 1);
-
+        if (!$this->precheck($data)) {
             return false;
         }
 
@@ -290,6 +239,14 @@ public function updateModule($data)
             } else {
                 $module = $this->modules->{$data['module_type']}->getById($data['id']);
 
+                if ($searchModule = $this->searchModule($data)) {
+                    if ($searchModule['id'] !== $module['id']) {
+                        $this->addResponse('Module already exists! Check name & class', 1);
+
+                        return false;
+                    }
+                }
+
                 $module = array_merge($module, $data);
 
                 $viewPublic = true;
@@ -397,6 +354,83 @@ public function updateModule($data)
         $this->addResponse('Error updating Module', 1);
     }
 
+    protected function precheck($data)
+    {
+        if ($data['api_id'] != '0' &&
+            ($data['repo'] === 'https://.../' || $data['repo'] === '')
+        ) {
+            $this->addResponse('Repository is not local, please provide correct module repo url.', 1);
+
+            return false;
+        }
+
+        if (!isset($data['module_type']) ||
+            (isset($data['module_type']) &&
+             ($data['module_type'] === 'components' || $data['module_type'] === 'apps_types')
+            )
+        ) {
+            $ignoreChars = [' '];
+        } else {
+            $ignoreChars = [''];
+        }
+
+        if (!checkCtype($data['name'], 'alpha', $ignoreChars)) {
+            $this->addResponse('Name cannot have special chars or numbers.', 1);
+
+            return false;
+        }
+
+        if ($data['module_type'] === 'components') {
+            $data = $this->checkAppType($data);
+            $data = $this->checkModuleTypeAndCategory($data);
+            $data['class'] = str_replace('Apps\\' . ucfirst($data['app_type']) . '\\' . ucfirst($data['module_type']) . '\\', '', $data['class']);
+            $data['class'] = str_replace('Component', '', $data['class']);
+            $classArr = explode('\\', $data['class']);
+            array_pop($classArr);
+
+            $routeArr = explode('/', trim($data['route'], '/'));
+            array_walk($routeArr, function(&$route) {
+                $route = ucfirst($route);
+            });
+
+            $compare = array_diff($classArr, $routeArr);
+
+            if (count($compare) > 0) {
+                $this->addResponse('Route and class do not match!', 1);
+
+                return false;
+            }
+        } else if ($data['module_type'] === 'packages' || $data['module_type'] === 'middlewares') {
+            $classArr = explode('\\', $data['class']);
+
+            if (strtolower($this->helper->last($classArr)) !== strtolower($data['name'])) {
+                $this->addResponse('Name and class do not match!', 1);
+
+                return false;
+            }
+        } else if ($data['module_type'] === 'views') {
+            //
+        }
+
+        return true;
+    }
+
+    protected function searchModule($data)
+    {
+        if ($data['module_type'] === 'components') {
+            $moduleMethod = 'get' . ucfirst(substr($data['module_type'], 0, -1)) . 'ByAppTypeAndRoute';
+            $module = $this->modules->{$data['module_type']}->{$moduleMethod}($data['app_type'], $data['route']);
+        } else if ($data['module_type'] === 'packages' || $data['module_type'] === 'middlewares') {
+            $moduleMethod = 'get' . ucfirst(substr($data['module_type'], 0, -1)) . 'ByAppTypeAndClass';
+            $module = $this->modules->{$data['module_type']}->{$moduleMethod}($data['app_type'], $data['class']);
+        } else if ($data['module_type'] === 'views') {
+            $moduleMethod = 'get' . ucfirst(substr($data['module_type'], 0, -1)) . 'ByAppTypeAndName';
+            $module = $this->modules->{$data['module_type']}->{$moduleMethod}($data['app_type'], $data['name']);
+        }
+
+        return $module;
+    }
+
     public function removeModule($data)
     {
         try {
@@ -524,48 +558,55 @@ public function reCalculateFilesHash($module, $remove = false, $viaGenerateRelea
                 $filesHash['module_id'] = $module['id'];
             }
 
-            $moduleLocation = $this->getModuleFilesLocation($module);
-
-            $moduleLocationFiles = $this->basepackages->utils->scanDir($moduleLocation, true, ['.git/', '.fileHashes']);
-
-            //In case you have .gitignore file, it can get complicated to sort which files to hash.
-            //So, the files you want to hash, just add them in .fileHashes in the same folder as .gitignore
-            //The file should have a list of all files to hash (1 filename per line)
-            //Example:
-            //.gitignore
-            // README.md
-            // view.html
-            // view.json
-            $filesToHash = [];
-            if ($this->localContent->fileExists($moduleLocation . '.fileHashes')) {
-                $filesToHash = $this->localContent->read($moduleLocation . '.fileHashes');
+            $moduleLocationFiles['files'] = [];
 
-                if ($filesToHash && $filesToHash !== '') {
-                    $filesToHash = str_replace("'", '', $filesToHash);
-                    $filesToHash = explode(PHP_EOL, $filesToHash);
-                }
+            if ($module['module_type'] === 'views' && $module['is_subview'] == false) {
+                $moduleLocations = [$this->getModuleFilesLocation($module), $this->getModuleFilesLocation($module, true)];
+            } else {
+                $moduleLocations = [$this->getModuleFilesLocation($module)];
             }
 
-            if ($module['module_type'] === 'views' && $module['is_subview'] == false) {
-                $moduleLocation = $this->getModuleFilesLocation($module, true);
+            foreach ($moduleLocations as $moduleLocation) {
+                if ($this->localContent->fileExists($moduleLocation . '.fileHashes')) {
+                    $filesToHash = $this->localContent->read($moduleLocation . '.fileHashes');
 
-                $viewFiles = $this->basepackages->utils->scanDir($moduleLocation, true, ['.git/', '.fileHashes']);
+                    if ($filesToHash && $filesToHash !== '') {
+                        $filesToHash = str_replace("'", '', $filesToHash);
+                        $filesToHash = explode(PHP_EOL, $filesToHash);
 
-                if ($viewFiles && count($viewFiles['files']) > 0) {
-                    $moduleLocationFiles['files'] = array_merge($moduleLocationFiles['files'], $viewFiles['files']);
-                }
+                        if (count($filesToHash) > 0) {
+                            $hashFiles = [];
 
-                if ($this->localContent->fileExists($moduleLocation . '.fileHashes')) {
-                    $viewFilesToHash = $this->localContent->read($moduleLocation . '.fileHashes');
+                            foreach ($filesToHash as $fileToHash) {
+                                if (str_ends_with($fileToHash, '/')) {
+                                    $fileToHashDirList = $this->basepackages->utils->scanDir($moduleLocation . $fileToHash, true);
 
-                    if ($viewFilesToHash && $viewFilesToHash !== '') {
-                        $viewFilesToHash = str_replace("'", '', $viewFilesToHash);
-                        $viewFilesToHash = explode(PHP_EOL, $viewFilesToHash);
+                                    if ($fileToHashDirList && count($fileToHashDirList['files']) > 0) {
+                                        $hashFiles = array_merge($hashFiles, $fileToHashDirList['files']);
+                                    }
+                                } else {
+                                    array_push($hashFiles, $moduleLocation . $fileToHash);
+                                }
+                            }
 
-                        if (count($viewFilesToHash) > 0) {
-                            $filesToHash = array_merge($filesToHash, $viewFilesToHash);
+                            if (count($hashFiles) > 0) {
+                                $moduleLocationFiles['files'] = array_merge($moduleLocationFiles['files'], $hashFiles);
+                            }
                         }
                     }
+                } else {
+                    $files = $this->basepackages->utils->scanDir(
+                        $moduleLocation,
+                        true,
+                        [
+                            '.git/',
+                            'linter-backup/'
+                        ]
+                    );
+
+                    if ($files && count($files['files']) > 0) {
+                        $moduleLocationFiles['files'] = array_merge($moduleLocationFiles['files'], $files['files']);
+                    }
                 }
             }
 
@@ -577,12 +618,6 @@ public function reCalculateFilesHash($module, $remove = false, $viaGenerateRelea
 
                     $file = str_replace($moduleLocation, '', $file);
 
-                    if (count($filesToHash) > 0) {
-                        if (!in_array($file, $filesToHash)) {
-                            continue;
-                        }
-                    }
-
                     $hash = hash_file('md5', base_path($filePath));
 
                     $filesHash['files_hash'][$file] = $hash;
@@ -605,18 +640,30 @@ public function validateFilesHash($module)
             $moduleLocation = $this->getNewFilesLocation($module);
 
             $module['repoExists'] = false;
+            $module['latestRelease'] = false;
             if ($this->localContent->directoryExists($moduleLocation . '.git')) {
-                $module['repoExists'] = true;
-
-                if (!isset($module['repo_details'])) {
-                    $this->modules->manager->getModuleInfo(
+                if ((!isset($module['repo_details']) ||
+                     !isset($module['repo_details']['latestRelease'])) ||
+                    (isset($module['repo_details']['latestRelease']['name']) &&
+                     $module['repo_details']['latestRelease']['name'] !== $module['version'])
+                ) {
+                    $module = $this->modules->manager->getModuleInfo(
                         [
-                            'module_type'   => $module['module_type'],
-                            'module_id'     => $module['id'],
-                            'sync'          => true
+                            'module_type'       => $module['module_type'],
+                            'module_id'         => $module['id'],
+                            'sync'              => true,
+                            'getLatestRelease'  => true
                         ]
                     );
                 }
+
+                $module['repoExists'] = true;
+
+                if (isset($module['repo_details']['latestRelease']['name'])) {
+                    $module['latestRelease'] = $module['repo_details']['latestRelease']['name'];
+                } else {
+                    $module['latestRelease'] = false;
+                }
             }
 
             $filesHash = $this->getFilesHash($module);
@@ -628,61 +675,64 @@ public function validateFilesHash($module)
                 return $module;
             }
 
-            $moduleFiles = $this->basepackages->utils->scanDir($moduleLocation, true, ['.git/', '.fileHashes']);
+            $moduleLocationFiles['files'] = [];
 
-            //In case you have .gitignore file, it can get complicated to sort which files to hash.
-            //So, the files you want to hash, just add them in .fileHashes in the same folder as .gitignore
-            //The file should have a list of all files to hash (1 filename per line)
-            //Example:
-            //.gitignore
-            // README.md
-            // view.html
-            // view.json
-            $filesToHash = [];
-            if ($this->localContent->fileExists($moduleLocation . '.fileHashes')) {
-                $filesToHash = $this->localContent->read($moduleLocation . '.fileHashes');
-
-                if ($filesToHash && $filesToHash !== '') {
-                    $filesToHash = str_replace("'", '', $filesToHash);
-                    $filesToHash = explode(PHP_EOL, $filesToHash);
-                }
+            if ($module['module_type'] === 'views' && $module['is_subview'] == false) {
+                $moduleLocations = [$this->getModuleFilesLocation($module), $this->getModuleFilesLocation($module, true)];
+            } else {
+                $moduleLocations = [$this->getModuleFilesLocation($module)];
             }
 
-            if ($module['module_type'] === 'views' && $module['is_subview'] == false) {
-                $moduleLocation = $this->getModuleFilesLocation($module, true);
+            foreach ($moduleLocations as $moduleLocation) {
+                if ($this->localContent->fileExists($moduleLocation . '.fileHashes')) {
+                    $filesToHash = $this->localContent->read($moduleLocation . '.fileHashes');
 
-                $viewFiles = $this->basepackages->utils->scanDir($moduleLocation, true, ['.git/', '.fileHashes']);
+                    if ($filesToHash && $filesToHash !== '') {
+                        $filesToHash = str_replace("'", '', $filesToHash);
+                        $filesToHash = explode(PHP_EOL, $filesToHash);
 
-                if ($viewFiles && count($viewFiles['files']) > 0) {
-                    $moduleFiles['files'] = array_merge($moduleFiles['files'], $viewFiles['files']);
-                }
+                        if (count($filesToHash) > 0) {
+                            $hashFiles = [];
 
-                if ($this->localContent->fileExists($moduleLocation . '.fileHashes')) {
-                    $viewFilesToHash = $this->localContent->read($moduleLocation . '.fileHashes');
+                            foreach ($filesToHash as $fileToHash) {
+                                if (str_ends_with($fileToHash, '/')) {
+                                    $fileToHashDirList = $this->basepackages->utils->scanDir($moduleLocation . $fileToHash, true);
 
-                    if ($viewFilesToHash && $viewFilesToHash !== '') {
-                        $viewFilesToHash = str_replace("'", '', $viewFilesToHash);
-                        $viewFilesToHash = explode(PHP_EOL, $viewFilesToHash);
+                                    if ($fileToHashDirList && count($fileToHashDirList['files']) > 0) {
+                                        $hashFiles = array_merge($hashFiles, $fileToHashDirList['files']);
+                                    }
+                                } else {
+                                    array_push($hashFiles, $moduleLocation . $fileToHash);
+                                }
+                            }
 
-                        if (count($viewFilesToHash) > 0) {
-                            $filesToHash = array_merge($filesToHash, $viewFilesToHash);
+                            if (count($hashFiles) > 0) {
+                                $moduleLocationFiles['files'] = array_merge($moduleLocationFiles['files'], $hashFiles);
+                            }
                         }
                     }
+                } else {
+                    $files = $this->basepackages->utils->scanDir(
+                        $moduleLocation,
+                        true,
+                        [
+                            '.git/',
+                            'linter-backup/'
+                        ]
+                    );
+
+                    if ($files && count($files['files']) > 0) {
+                        $moduleLocationFiles['files'] = array_merge($moduleLocationFiles['files'], $files['files']);
+                    }
                 }
             }
 
-            if ($moduleFiles && count($moduleFiles['files']) > 0) {
-                foreach ($moduleFiles['files'] as $file) {
+            if ($moduleLocationFiles && count($moduleLocationFiles['files']) > 0) {
+                foreach ($moduleLocationFiles['files'] as $file) {
                     $filePath = $file;
 
                     $file = str_replace($moduleLocation, '', $file);
 
-                    if (count($filesToHash) > 0) {
-                        if (!in_array($file, $filesToHash)) {
-                            continue;
-                        }
-                    }
-
                     $hash = hash_file('md5', base_path($filePath));
 
                     if (!isset($filesHash['files_hash'][$file]) ||
@@ -691,7 +741,7 @@ public function validateFilesHash($module)
                     ) {
                         $module['isModified'] = true;
 
-                        return $module;
+                        break;
                     }
                 }
             }
@@ -927,35 +977,6 @@ protected function checkAppType($data)
                 }
 
                 $data['app_type'] = $data['app_type']['data'][0];
-            } else if (isset($data['app_type']['newTags'][0])) {
-                if (!checkCtype($data['app_type']['newTags'][0], 'alpha', [''])) {
-                    $this->addResponse('AppType cannot have special chars or numbers.', 1);
-
-                    return false;
-                }
-
-                $appType = $this->apps->types->getFirst('app_type', strtolower($data['app_type']['newTags'][0]));
-
-                if (!$appType) {
-                    $appType =
-                        [
-                            'name'          => $data['app_type']['newTags'][0],
-                            'app_type'      => strtolower($data['app_type']['newTags'][0]),
-                            'dashboards'    => $data['dashboards'],
-                            'description'   => 'Added via devtools module add.',
-                            'version'       => $data['version'],
-                            'api_id'        => $data['api_id'],
-                            'repo'          => $data['repo'],
-                            'updated_by'    => '0',
-                            'installed'     => $data['installed']
-                        ];
-
-                    $this->apps->types->add($appType);
-
-                    $this->addUpdateAppTypeFiles($appType);
-                }
-
-                $data['app_type'] = strtolower($data['app_type']['newTags'][0]);
             }
         } else if (isset($data['app_type']) &&
                    !isset($data['module_type'])
@@ -3499,6 +3520,7 @@ public function generateModuleRepoUrl($data)
         $this->validation->init()->add('api_id', PresenceOf::class, ["message" => "Please provide api id."]);
         $this->validation->add('app_type', PresenceOf::class, ["message" => "Please provide app type."]);
         $this->validation->add('module_type', PresenceOf::class, ["message" => "Please provide module type."]);
+        $this->validation->add('category', PresenceOf::class, ["message" => "Please provide module category."]);
 
         if (!$this->validateData($data)) {
             return false;
@@ -3809,7 +3831,17 @@ public function getRemoteModules($id)
             }
 
             try {
-                $modulesArr = $this->apiClient->useMethod($collection, $method, $args)->getResponse(true);
+                $page = 1;
+                $getRemoteModules = [];
+                $modulesArr = [];
+                while ($getRemoteModules !== false) {
+                    $args['page'] = $page;
+                    $getRemoteModules = $this->apiClient->useMethod($collection, $method, $args)->getResponse(true);
+                    if ($getRemoteModules) {
+                        $modulesArr = array_merge($modulesArr, $getRemoteModules);
+                    }
+                    $page++;
+                }
             } catch (\throwable | ClientException $e) {
                 $this->addResponse($e->getMessage(), 1);
 
diff --git a/apps/Core/Views/Default/html/devtools/modules/changes/view.html b/apps/Core/Views/Default/html/devtools/modules/changes/view.html
index 11f70edb4..59c89dddb 100644
--- a/apps/Core/Views/Default/html/devtools/modules/changes/view.html
+++ b/apps/Core/Views/Default/html/devtools/modules/changes/view.html
@@ -1,4 +1,4 @@
-<!-- htmlhint tag-pair:false -->
+<!-- htmlhint tag-pair:false --><!-- htmlmin:ignore -->
 {% set changesHtml = '' %}
 {% if modules|length > 0 %}
     {% for moduleType, modulesArr in modules %}
@@ -11,8 +11,14 @@
                     '</button>'
                 %}
                 {% set moduleUrl = '-' %}
-                {% if moduleArr['repoExists'] != false and moduleArr['repo_details']['details']['html_url'] is defined %}
-                    {% set moduleUrl = '<a href="' ~  moduleArr['repo_details']['details']['html_url'] ~ '" target="blank">' ~  moduleArr['repo_details']['details']['html_url'] %}
+                {% set moduleVersion = '-' %}
+                {% if moduleArr['repoExists'] != false %}
+                    {% if moduleArr['repo_details']['details']['html_url'] is defined %}
+                        {% set moduleUrl = '<a href="' ~  moduleArr['repo_details']['details']['html_url'] ~ '" target="blank">' ~  moduleArr['repo_details']['details']['html_url'] %}
+                    {% endif %}
+                    {% if moduleArr['repo_details']['latestRelease'] is defined %}
+                        {% set moduleVersion = moduleArr['repo_details']['latestRelease']['name'] %}
+                    {% endif %}
                 {% endif %}
                 {% set moduleModified = '-' %}
                 {% if moduleArr['isModified'] != false %}
@@ -22,6 +28,7 @@
                 '           <td>' ~ moduleArr['name'] ~ '</td>' ~
                 '           <td>' ~ moduleArr['module_type'] ~ '</td>' ~
                 '           <td>' ~ moduleUrl ~ '</td>' ~
+                '           <td>' ~ moduleVersion ~ '</td>' ~
                 '           <td>' ~ moduleModified ~ '</td>' ~
                 '           <td id="{{componentId}}-{{sectionId}}-changes-modules-' ~ moduleArr['name'] ~ '">' ~  moduleEdit ~ '</td>' ~
                 '       </tr>' %}
@@ -61,6 +68,7 @@
                         <th class="text-uppercase">Name</th>
                         <th class="text-uppercase">Module Type</th>
                         <th class="text-uppercase">Repository</th>
+                        <th class="text-uppercase">Latest Version</th>
                         <th class="text-uppercase">Modified</th>
                         <th class="text-uppercase">Edit</th>
                     </tr>
@@ -111,6 +119,7 @@
                 null,
                 null,
                 null,
+                null,
                 { orderable: false }
             ],
             lengthMenu: [
@@ -199,3 +208,4 @@
     dataCollectionSectionForm['funcs']['init']();
 });
 </script>
+<!-- htmlmin:ignore -->
\ No newline at end of file
diff --git a/apps/Core/Views/Default/html/devtools/modules/module.html b/apps/Core/Views/Default/html/devtools/modules/module.html
index 44de2b47b..542fcbbac 100644
--- a/apps/Core/Views/Default/html/devtools/modules/module.html
+++ b/apps/Core/Views/Default/html/devtools/modules/module.html
@@ -1542,7 +1542,7 @@
         '{{componentId}}-{{sectionId}}-id'                                      : { },
         '{{componentId}}-{{sectionId}}-type'                                    : { },
         '{{componentId}}-{{sectionId}}-app_type'                                : {
-            'placeholder'   : 'SELECT APP TYPE OR CREATE NEW'
+            'placeholder'   : 'SELECT APP TYPE'
         },
         '{{componentId}}-{{sectionId}}-module_type'                             : {
             'placeholder'   : 'SELECT MODULE TYPE'
diff --git a/apps/Core/Views/Default/html/devtools/modules/module/info.html b/apps/Core/Views/Default/html/devtools/modules/module/info.html
index bde5b1ffc..a9ea4757e 100644
--- a/apps/Core/Views/Default/html/devtools/modules/module/info.html
+++ b/apps/Core/Views/Default/html/devtools/modules/module/info.html
@@ -159,7 +159,6 @@
                 'fieldBazPostOnCreate'                 : true,
                 'fieldBazPostOnUpdate'                 : true,
                 'fieldBazScan'                         : true,
-                'fieldDataSelect2Create'               : true,
                 'fieldDataSelect2OptionsArray'         : true,
                 'fieldDataSelect2Options'              : appTypes,
                 'fieldDataSelect2OptionsKey'           : 'id',
diff --git a/apps/Core/Views/Default/html/modules/queue/analyse.html b/apps/Core/Views/Default/html/modules/queue/analyse.html
index 1546467df..d82d44a83 100644
--- a/apps/Core/Views/Default/html/modules/queue/analyse.html
+++ b/apps/Core/Views/Default/html/modules/queue/analyse.html
@@ -250,7 +250,7 @@
 dataCollectionSectionForm['vars']['queue'] = JSON.parse('{{queue}}');
 dataCollectionSectionForm['funcs'] = { };
 dataCollectionSectionForm['funcs']['init'] = function() {
-    BazProgress.buildProgressBar($('#installer-progress'), false, true, true);
+    BazProgress.buildProgressBar($('#installer-progress'), false, true, true, false);
 
     if ($.fn.DataTable && !$.fn.DataTable.isDataTable('#{{componentId}}-{{sectionId}}-queue-table')) {
         $('#{{componentId}}-{{sectionId}}-queue-table').DataTable({
diff --git a/public/core/default/js/footer/core/Baz/BazContentSectionWithListing.js b/public/core/default/js/footer/core/Baz/BazContentSectionWithListing.js
index 2ede05e53..bead534ca 100644
--- a/public/core/default/js/footer/core/Baz/BazContentSectionWithListing.js
+++ b/public/core/default/js/footer/core/Baz/BazContentSectionWithListing.js
@@ -1266,10 +1266,11 @@
                     // Control Column
                     if (datatableOptions.rowControls) {
                         listColumns[thisOptions.listOptions.tableName].push({
-                            data        : '__control',
-                            title       : 'ACTIONS',
-                            orderable   : false,
-                            className   : classes
+                            data                : '__control',
+                            title               : 'ACTIONS',
+                            orderable           : false,
+                            className           : classes,
+                            responsivePriority  : -1
                         });
                     }
 
diff --git a/public/core/default/js/footer/core/Baz/BazHelpers.js b/public/core/default/js/footer/core/Baz/BazHelpers.js
index 5174effa9..0622f37e1 100644
--- a/public/core/default/js/footer/core/Baz/BazHelpers.js
+++ b/public/core/default/js/footer/core/Baz/BazHelpers.js
@@ -108,7 +108,37 @@ var BazHelpers = function() {
                 output += bazCreateHtmlList(obj[k]);
                 output += '</li>';
             } else {
-                output += '<li>' + k + ' : ' + obj[k] + '</li>';
+                if (typeof obj[k] === 'string') {
+                    if (obj[k].startsWith('{')) {
+                        var regex = /{.*}/g;
+
+                        var found = obj[k].match(regex);
+
+                        if (found) {
+                            //eslint-disable-next-line
+                            var data = found[0].replaceAll('\"', '"');
+                            //eslint-disable-next-line
+                            data = data.replaceAll('\\', '\\\\\\\\');
+                            //eslint-disable-next-line
+                            data = data.replaceAll('\\\\\\u0022', '"');
+                            var objObject = JSON.parse(data);
+
+                            if (objObject) {
+                                output += '<li>' + k + ' : ';
+                                output += bazCreateHtmlList(objObject);
+                                output += '</li>';
+                            } else {
+                                output += '<li>' + k + ' : ' + obj[k] + '</li>';
+                            }
+                        } else {
+                            output += '<li>' + k + ' : ' + obj[k] + '</li>';
+                        }
+                    } else {
+                        output += '<li>' + k + ' : ' + obj[k] + '</li>';
+                    }
+                } else {
+                    output += '<li>' + k + ' : ' + obj[k] + '</li>';
+                }
             }
         });
         output += '</ul>';
diff --git a/public/core/default/js/footer/core/Baz/BazProgress.js b/public/core/default/js/footer/core/Baz/BazProgress.js
index 0aefea7e0..646a13da1 100644
--- a/public/core/default/js/footer/core/Baz/BazProgress.js
+++ b/public/core/default/js/footer/core/Baz/BazProgress.js
@@ -18,7 +18,7 @@ var BazProgress = function() {
     var initialized = false;
     var progressCounter = 0;
     var online = false;
-    var element, manualShowHide, hasChild, hasSubProcess, hasCancelButton;
+    var element, manualShowHide, hasChild, hasSubProcess, hasCancelButton, hasDetails;
     var callableFunc = null;
     var url
     var postData = { };
@@ -68,12 +68,13 @@ var BazProgress = function() {
         console.log('Progress service offline');
     }
 
-    function buildProgressBar(el, mSH = false, hC = false, hSP = false, hCB = true) {
+    function buildProgressBar(el, mSH = false, hC = false, hSP = false, hCB = true, hD = true) {
         element = el;
         manualShowHide = mSH;
         hasChild = hC;
         hasSubProcess = hSP;
         hasCancelButton = hCB;
+        hasDetails = hD;
 
         $(element).html(
             '<div class="progress active progress-xs">' +
@@ -115,17 +116,37 @@ var BazProgress = function() {
             );
         }
 
+        var buttons = '<div class="row">';
+
         if (hasCancelButton) {
-            $(element).append(
-                '<div class="text-center mt-3" id="' + $(element)[0].id + '-cancel" hidden>' +
-                    '<button class="btn btn-sm btn-secondary mr-1" id="' + $(element)[0].id + '-cancel-button" role="button">' +
-                        'Cancel' +
-                    '</button>' +
-                '</div>'
-            );
+            buttons +=
+                '<div class="col">' +
+                    '<div class="text-center mt-3" id="' + $(element)[0].id + '-cancel" hidden>' +
+                        '<button class="text-uppercase btn btn-sm btn-secondary mr-1" id="' + $(element)[0].id + '-cancel-button" role="button">' +
+                            'Cancel' +
+                        '</button>' +
+                    '</div>' +
+                '</div>';
+        }
+
+        if (hasDetails) {
+            buttons +=
+                '<div class="col">' +
+                    '<div class="text-center mt-3" id="' + $(element)[0].id + '-details">' +
+                        '<button class="text-uppercase btn btn-sm btn-primary mr-1" id="' + $(element)[0].id + '-details-button" role="button">' +
+                            'Show Details' +
+                        '</button>' +
+                    '</div>' +
+                '</div>';
+        }
 
-            $('#' + $(element)[0].id + '-cancel').off();
-            $('#' + $(element)[0].id + '-cancel').click(function() {
+        buttons += '</div>';
+
+        $(element).append(buttons);
+
+        if (hasCancelButton) {
+            $('#' + $(element)[0].id + '-cancel-button').off();
+            $('#' + $(element)[0].id + '-cancel-button').click(function() {
                 if (pid > 0) {
                     Swal.fire({
                         title                       : '<span class="text-danger"> Cancel current process?</span>',
@@ -165,6 +186,8 @@ var BazProgress = function() {
                                         'title' : response.responseMessage
                                     });
 
+                                    $('body').trigger('bazProgressCancelled');
+
                                     resetProgressCounter();
                                 } else {
                                     paginatedPNotify('error', {
@@ -177,6 +200,32 @@ var BazProgress = function() {
                 }
             });
         }
+
+        if (hasDetails) {
+            $('#' + $(element)[0].id + '-details-button').off();
+            $('#' + $(element)[0].id + '-details-button').click(function() {
+                var text = $('#' + $(element)[0].id + '-details-button').text().toLowerCase();
+
+                if (text === 'show details') {
+                    $('#' + $(element)[0].id + '-details-button').text('Hide details');
+                    $('#details-div').attr('hidden', false);
+                } else if (text === 'hide details') {
+                    $('#' + $(element)[0].id + '-details-button').text('Show details');
+                    $('#details-div').attr('hidden', true);
+                }
+            });
+
+            $(element).append(
+                '<div class="row" id="details-div" hidden>' +
+                    '<div class="col">' +
+                        '<div class="form-group">' +
+                            '<label class="text-uppercase text-xs" for="username">Progress Details</label>' +
+                            '<div id="details-data" class="height-control-400 overflow-scroll"></div>' +
+                        '</div>' +
+                    '</div>' +
+                '</div>'
+            );
+        }
     }
 
     function getProgress(options) {
@@ -185,6 +234,7 @@ var BazProgress = function() {
         if (callableFunc && callableFunc['beforeStart']) {
             if (callableFunc['beforeStart']() === false) {
                 resetProgressCounter();
+
                 return;
             }
         }
@@ -217,6 +267,7 @@ var BazProgress = function() {
         if (callableFunc && callableFunc['beforeProcess']) {
             if (callableFunc['beforeProcess'](response) === false) {
                 resetProgressCounter();
+
                 return;
             }
         }
@@ -235,6 +286,8 @@ var BazProgress = function() {
                 if (responseData['pid']) {
                     $('#' + $(element)[0].id + '-cancel').attr('hidden', false);
                     pid = responseData['pid'];
+
+                    $('#details-data').html('PID running : Progress is running with process ID: ' + pid + '<br>');
                 }
 
                 if (responseData['progressFile']) {
@@ -242,13 +295,57 @@ var BazProgress = function() {
                 }
 
                 if (responseData['preCheckComplete'] == false ||
-                    (responseData['callResult'] && responseData['callResult'] === 'reset')
+                    (responseData['callResult'] && responseData['callResult'] === 'reset') ||
+                    (responseData['callResult'] && responseData['callResult'] === 'pid_running')
                 ) {
-                    resetProgressCounter();
+                    if (responseData['errors']) {
+                        $('#details-div').attr('hidden', false);
+                        var html = responseData['errors'];
+                        var regex = /{.*}/g;
+                        var found = html.match(regex);
+
+                        if (found) {
+                            //eslint-disable-next-line
+                            var data = found[0].replaceAll('\"', '"');
+                            //eslint-disable-next-line
+                            data = data.replaceAll('\\', '\\\\\\\\');
+                            //eslint-disable-next-line
+                            data = data.replaceAll('\\\\\\u0022', '"');
+                            var obj = JSON.parse(data);
+
+                            if (obj) {
+                                $('#details-data').html(
+                                    '<div class="text-danger">' +
+                                        BazHelpers.createHtmlList({'obj': obj}));
+                                    '</div>'
+                            }
+                        } else {
+                            $('#details-data').html(html);
+                        }
+
+                        $('#details-data').scrollTop($('#details-data')[0].scrollHeight);
+                    }
+
+                    if (responseData['callResult'] === 'pid_running') {
+                        $('#' + $(element)[0].id).attr('hidden', false);
+                        $('#' + $(element)[0].id + '-cancel').attr('hidden', false);
+                        $('#' + $(element)[0].id + '-cancel-button').text('Cancel Process: ' + responseData['pid']);
+                    }
+
+                    if (responseData['callResult'] && responseData['callResult'] === 'reset') {
+                        if (!responseData['errors']) {
+                            resetProgressCounter();
+                        }
+                    }
 
                     return false;
                 }
 
+                if (responseData['details']) {
+                    var pidHtml = $('#details-data').html();
+                    $('#details-data').html(pidHtml + BazHelpers.createHtmlList({'obj': responseData['details']}));
+                }
+
                 if (responseData['total'] !== 'undefined' && responseData['completed'] !== 'undefined') {
                     if (responseData['total'] !== responseData['completed']) {
                         if (responseData['runners'] && responseData['runners']['running'] !== false) {
@@ -446,12 +543,16 @@ var BazProgress = function() {
                 responseData['runners']['running']['remoteWebCounters']['downloadTotal'] > 0
             ) {
                 isDownload = true;
+                isUpload = false;
+                isSteps = false;
                 downloadTotal = responseData['runners']['running']['remoteWebCounters']['downloadTotal'];
                 downloadedBytes = responseData['runners']['running']['remoteWebCounters']['downloadedBytes'];
             } else if (responseData['runners']['running']['remoteWebCounters']['uploadTotal'] &&
                 responseData['runners']['running']['remoteWebCounters']['uploadTotal'] > 0
             ) {
                 isUpload = true;
+                isDownload = false;
+                isSteps = false;
                 uploadTotal = responseData['runners']['running']['remoteWebCounters']['uploadTotal'];
                 uploadedBytes = responseData['runners']['running']['remoteWebCounters']['uploadedBytes'];
             }
@@ -460,6 +561,8 @@ var BazProgress = function() {
                 responseData['runners']['running']['stepsCounters']['stepsTotal'] > 0
             ) {
                 isSteps = true;
+                isDownload = false;
+                isUpload = false;
                 stepsTotal = responseData['runners']['running']['stepsCounters']['stepsTotal'];
                 stepsCurrent = responseData['runners']['running']['stepsCounters']['stepsCurrent'];
             }
@@ -478,7 +581,7 @@ var BazProgress = function() {
         return text;
     }
 
-    function resetProgressCounter() {
+    function resetProgressCounter(hideDiv = true) {
         if (progressCounter !== 60) {
             progressCounter ++;
 
@@ -490,10 +593,14 @@ var BazProgress = function() {
             }
         }
 
-        $('#' + $(element)[0].id).attr('hidden', true);
+        if (hideDiv) {
+            $('#' + $(element)[0].id).attr('hidden', true);
+            $('#details-div').attr('hidden', true);
+        }
         $('.' + $(element)[0].id + '-bar').css('width', '0%');
         $('.' + $(element)[0].id + '-bar').attr('aria-valuenow', 0);
         switchProgressBarColor('.' + $(element)[0].id + '-bar', 'info');
+        $('#' + $(element)[0].id + '-cancel-button').text('Cancel');
         downloadTotal = 0;
         downloadedBytes = 0;
         uploadTotal = 0;
@@ -543,8 +650,8 @@ var BazProgress = function() {
                 getProgress(options);
             }
         }
-        BazProgress.buildProgressBar = function(el, mSH = false, child = false, hasSubProcess = false, hasCancelButton = true) {
-            buildProgressBar(el, mSH, child, hasSubProcess, hasCancelButton);
+        BazProgress.buildProgressBar = function(el, mSH = false, child = false, hasSubProcess = false, hasCancelButton = true, hasDetails = true) {
+            buildProgressBar(el, mSH, child, hasSubProcess, hasCancelButton, hasDetails);
         }
         BazProgress.switchProgressBarColor = function(el, color) {
             switchProgressBarColor(el, color);
diff --git a/public/core/default/js/footer/core/Baz/BazTunnels.js b/public/core/default/js/footer/core/Baz/BazTunnels.js
index 673ccb537..c0a66edbd 100644
--- a/public/core/default/js/footer/core/Baz/BazTunnels.js
+++ b/public/core/default/js/footer/core/Baz/BazTunnels.js
@@ -1,5 +1,5 @@
 /* exported BazTunnels */
-/* globals BazNotifications BazMessenger BazAnnouncements BazProgress ab BazHelpers */
+/* globals BazNotifications BazMessenger BazProgress ab BazHelpers */
 /*
 * @title                    : BazTunnels
 * @description              : Baz Tunnels Lib for wstunnels
@@ -104,17 +104,17 @@ var BazTunnels = function() {
                         });
                     }
 
-                    if (tunnelsToInit.includes('messengerNotifications')) {
-                        dataCollection.env.wsTunnels.pusher.subscribe('messengerNotifications', function(topic, data) {
-                            BazMessenger.onMessage(data);
-                        });
-                    }
+                    // if (tunnelsToInit.includes('messengerNotifications')) {
+                    //     dataCollection.env.wsTunnels.pusher.subscribe('messengerNotifications', function(topic, data) {
+                    //         BazMessenger.onMessage(data);
+                    //     });
+                    // }
 
-                    if (tunnelsToInit.includes('systemAnnouncements')) {
-                        dataCollection.env.wsTunnels.pusher.subscribe('systemAnnouncements', function(topic, data) {
-                            BazAnnouncements.onMessage('systemAnnouncements', data);
-                        });
-                    }
+                    // if (tunnelsToInit.includes('systemAnnouncements')) {
+                    //     dataCollection.env.wsTunnels.pusher.subscribe('systemAnnouncements', function(topic, data) {
+                    //         BazAnnouncements.onMessage('systemAnnouncements', data);
+                    //     });
+                    // }
 
                     if (tunnelsToInit.includes('progress')) {
                         dataCollection.env.wsTunnels.pusher.subscribe('progress', function(topic, data) {
@@ -128,12 +128,12 @@ var BazTunnels = function() {
                         if (tunnelsToInit.includes('systemNotifications')) {
                             BazNotifications.serviceOnline();
                         }
-                        if (tunnelsToInit.includes('messengerNotifications')) {
-                            BazMessenger.serviceOnline();
-                        }
-                        if (tunnelsToInit.includes('systemAnnouncements')) {
-                            BazAnnouncements.serviceOnline();
-                        }
+                        // if (tunnelsToInit.includes('messengerNotifications')) {
+                        //     BazMessenger.serviceOnline();
+                        // }
+                        // if (tunnelsToInit.includes('systemAnnouncements')) {
+                        //     BazAnnouncements.serviceOnline();
+                        // }
                         if (tunnelsToInit.includes('progress')) {
                             BazProgress.serviceOnline();
                         }
@@ -141,12 +141,12 @@ var BazTunnels = function() {
                         if (tunnelsToInit.includes('systemNotifications')) {
                             BazNotifications.init();
                         }
-                        if (tunnelsToInit.includes('messengerNotifications')) {
-                            BazMessenger.init();
-                        }
-                        if (tunnelsToInit.includes('systemAnnouncements')) {
-                            BazAnnouncements.init();
-                        }
+                        // if (tunnelsToInit.includes('messengerNotifications')) {
+                        //     BazMessenger.init();
+                        // }
+                        // if (tunnelsToInit.includes('systemAnnouncements')) {
+                        //     BazAnnouncements.init();
+                        // }
                         if (tunnelsToInit.includes('progress')) {
                             BazProgress.init();
                         }
@@ -164,12 +164,12 @@ var BazTunnels = function() {
                     if (tunnelsToInit.includes('systemNotifications')) {
                         BazNotifications.serviceOffline();
                     }
-                    if (tunnelsToInit.includes('messengerNotifications')) {
-                        BazMessenger.serviceOffline();
-                    }
-                    if (tunnelsToInit.includes('systemAnnouncements')) {
-                        BazAnnouncements.serviceOffline();
-                    }
+                    // if (tunnelsToInit.includes('messengerNotifications')) {
+                    //     BazMessenger.serviceOffline();
+                    // }
+                    // if (tunnelsToInit.includes('systemAnnouncements')) {
+                    //     BazAnnouncements.serviceOffline();
+                    // }
                     if (tunnelsToInit.includes('progress')) {
                         BazProgress.serviceOffline();
                     }
diff --git a/public/core/default/js/footer/jsFooterCore.js b/public/core/default/js/footer/jsFooterCore.js
index 6ad89299b..67a732a4b 100644
--- a/public/core/default/js/footer/jsFooterCore.js
+++ b/public/core/default/js/footer/jsFooterCore.js
@@ -3072,7 +3072,37 @@ var BazHelpers = function() {
                 output += bazCreateHtmlList(obj[k]);
                 output += '</li>';
             } else {
-                output += '<li>' + k + ' : ' + obj[k] + '</li>';
+                if (typeof obj[k] === 'string') {
+                    if (obj[k].startsWith('{')) {
+                        var regex = /{.*}/g;
+
+                        var found = obj[k].match(regex);
+
+                        if (found) {
+                            //eslint-disable-next-line
+                            var data = found[0].replaceAll('\"', '"');
+                            //eslint-disable-next-line
+                            data = data.replaceAll('\\', '\\\\\\\\');
+                            //eslint-disable-next-line
+                            data = data.replaceAll('\\\\\\u0022', '"');
+                            var objObject = JSON.parse(data);
+
+                            if (objObject) {
+                                output += '<li>' + k + ' : ';
+                                output += bazCreateHtmlList(objObject);
+                                output += '</li>';
+                            } else {
+                                output += '<li>' + k + ' : ' + obj[k] + '</li>';
+                            }
+                        } else {
+                            output += '<li>' + k + ' : ' + obj[k] + '</li>';
+                        }
+                    } else {
+                        output += '<li>' + k + ' : ' + obj[k] + '</li>';
+                    }
+                } else {
+                    output += '<li>' + k + ' : ' + obj[k] + '</li>';
+                }
             }
         });
         output += '</ul>';
@@ -6821,10 +6851,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
                     // Control Column
                     if (datatableOptions.rowControls) {
                         listColumns[thisOptions.listOptions.tableName].push({
-                            data        : '__control',
-                            title       : 'ACTIONS',
-                            orderable   : false,
-                            className   : classes
+                            data                : '__control',
+                            title               : 'ACTIONS',
+                            orderable           : false,
+                            className           : classes,
+                            responsivePriority  : -1
                         });
                     }
 
@@ -10073,7 +10104,7 @@ var BazContentFieldsValidator = function() {
     return bazContentFieldsValidatorConstructor;
 }();
 /* exported BazTunnels */
-/* globals BazNotifications BazMessenger BazAnnouncements BazProgress ab BazHelpers */
+/* globals BazNotifications BazMessenger BazProgress ab BazHelpers */
 /*
 * @title                    : BazTunnels
 * @description              : Baz Tunnels Lib for wstunnels
@@ -10178,17 +10209,17 @@ var BazTunnels = function() {
                         });
                     }
 
-                    if (tunnelsToInit.includes('messengerNotifications')) {
-                        dataCollection.env.wsTunnels.pusher.subscribe('messengerNotifications', function(topic, data) {
-                            BazMessenger.onMessage(data);
-                        });
-                    }
+                    // if (tunnelsToInit.includes('messengerNotifications')) {
+                    //     dataCollection.env.wsTunnels.pusher.subscribe('messengerNotifications', function(topic, data) {
+                    //         BazMessenger.onMessage(data);
+                    //     });
+                    // }
 
-                    if (tunnelsToInit.includes('systemAnnouncements')) {
-                        dataCollection.env.wsTunnels.pusher.subscribe('systemAnnouncements', function(topic, data) {
-                            BazAnnouncements.onMessage('systemAnnouncements', data);
-                        });
-                    }
+                    // if (tunnelsToInit.includes('systemAnnouncements')) {
+                    //     dataCollection.env.wsTunnels.pusher.subscribe('systemAnnouncements', function(topic, data) {
+                    //         BazAnnouncements.onMessage('systemAnnouncements', data);
+                    //     });
+                    // }
 
                     if (tunnelsToInit.includes('progress')) {
                         dataCollection.env.wsTunnels.pusher.subscribe('progress', function(topic, data) {
@@ -10202,12 +10233,12 @@ var BazTunnels = function() {
                         if (tunnelsToInit.includes('systemNotifications')) {
                             BazNotifications.serviceOnline();
                         }
-                        if (tunnelsToInit.includes('messengerNotifications')) {
-                            BazMessenger.serviceOnline();
-                        }
-                        if (tunnelsToInit.includes('systemAnnouncements')) {
-                            BazAnnouncements.serviceOnline();
-                        }
+                        // if (tunnelsToInit.includes('messengerNotifications')) {
+                        //     BazMessenger.serviceOnline();
+                        // }
+                        // if (tunnelsToInit.includes('systemAnnouncements')) {
+                        //     BazAnnouncements.serviceOnline();
+                        // }
                         if (tunnelsToInit.includes('progress')) {
                             BazProgress.serviceOnline();
                         }
@@ -10215,12 +10246,12 @@ var BazTunnels = function() {
                         if (tunnelsToInit.includes('systemNotifications')) {
                             BazNotifications.init();
                         }
-                        if (tunnelsToInit.includes('messengerNotifications')) {
-                            BazMessenger.init();
-                        }
-                        if (tunnelsToInit.includes('systemAnnouncements')) {
-                            BazAnnouncements.init();
-                        }
+                        // if (tunnelsToInit.includes('messengerNotifications')) {
+                        //     BazMessenger.init();
+                        // }
+                        // if (tunnelsToInit.includes('systemAnnouncements')) {
+                        //     BazAnnouncements.init();
+                        // }
                         if (tunnelsToInit.includes('progress')) {
                             BazProgress.init();
                         }
@@ -10238,12 +10269,12 @@ var BazTunnels = function() {
                     if (tunnelsToInit.includes('systemNotifications')) {
                         BazNotifications.serviceOffline();
                     }
-                    if (tunnelsToInit.includes('messengerNotifications')) {
-                        BazMessenger.serviceOffline();
-                    }
-                    if (tunnelsToInit.includes('systemAnnouncements')) {
-                        BazAnnouncements.serviceOffline();
-                    }
+                    // if (tunnelsToInit.includes('messengerNotifications')) {
+                    //     BazMessenger.serviceOffline();
+                    // }
+                    // if (tunnelsToInit.includes('systemAnnouncements')) {
+                    //     BazAnnouncements.serviceOffline();
+                    // }
                     if (tunnelsToInit.includes('progress')) {
                         BazProgress.serviceOffline();
                     }
@@ -11845,7 +11876,7 @@ var BazProgress = function() {
     var initialized = false;
     var progressCounter = 0;
     var online = false;
-    var element, manualShowHide, hasChild, hasSubProcess, hasCancelButton;
+    var element, manualShowHide, hasChild, hasSubProcess, hasCancelButton, hasDetails;
     var callableFunc = null;
     var url
     var postData = { };
@@ -11895,12 +11926,13 @@ var BazProgress = function() {
         console.log('Progress service offline');
     }
 
-    function buildProgressBar(el, mSH = false, hC = false, hSP = false, hCB = true) {
+    function buildProgressBar(el, mSH = false, hC = false, hSP = false, hCB = true, hD = true) {
         element = el;
         manualShowHide = mSH;
         hasChild = hC;
         hasSubProcess = hSP;
         hasCancelButton = hCB;
+        hasDetails = hD;
 
         $(element).html(
             '<div class="progress active progress-xs">' +
@@ -11942,17 +11974,37 @@ var BazProgress = function() {
             );
         }
 
+        var buttons = '<div class="row">';
+
         if (hasCancelButton) {
-            $(element).append(
-                '<div class="text-center mt-3" id="' + $(element)[0].id + '-cancel" hidden>' +
-                    '<button class="btn btn-sm btn-secondary mr-1" id="' + $(element)[0].id + '-cancel-button" role="button">' +
-                        'Cancel' +
-                    '</button>' +
-                '</div>'
-            );
+            buttons +=
+                '<div class="col">' +
+                    '<div class="text-center mt-3" id="' + $(element)[0].id + '-cancel" hidden>' +
+                        '<button class="text-uppercase btn btn-sm btn-secondary mr-1" id="' + $(element)[0].id + '-cancel-button" role="button">' +
+                            'Cancel' +
+                        '</button>' +
+                    '</div>' +
+                '</div>';
+        }
+
+        if (hasDetails) {
+            buttons +=
+                '<div class="col">' +
+                    '<div class="text-center mt-3" id="' + $(element)[0].id + '-details">' +
+                        '<button class="text-uppercase btn btn-sm btn-primary mr-1" id="' + $(element)[0].id + '-details-button" role="button">' +
+                            'Show Details' +
+                        '</button>' +
+                    '</div>' +
+                '</div>';
+        }
+
+        buttons += '</div>';
+
+        $(element).append(buttons);
 
-            $('#' + $(element)[0].id + '-cancel').off();
-            $('#' + $(element)[0].id + '-cancel').click(function() {
+        if (hasCancelButton) {
+            $('#' + $(element)[0].id + '-cancel-button').off();
+            $('#' + $(element)[0].id + '-cancel-button').click(function() {
                 if (pid > 0) {
                     Swal.fire({
                         title                       : '<span class="text-danger"> Cancel current process?</span>',
@@ -11992,6 +12044,8 @@ var BazProgress = function() {
                                         'title' : response.responseMessage
                                     });
 
+                                    $('body').trigger('bazProgressCancelled');
+
                                     resetProgressCounter();
                                 } else {
                                     paginatedPNotify('error', {
@@ -12004,6 +12058,32 @@ var BazProgress = function() {
                 }
             });
         }
+
+        if (hasDetails) {
+            $('#' + $(element)[0].id + '-details-button').off();
+            $('#' + $(element)[0].id + '-details-button').click(function() {
+                var text = $('#' + $(element)[0].id + '-details-button').text().toLowerCase();
+
+                if (text === 'show details') {
+                    $('#' + $(element)[0].id + '-details-button').text('Hide details');
+                    $('#details-div').attr('hidden', false);
+                } else if (text === 'hide details') {
+                    $('#' + $(element)[0].id + '-details-button').text('Show details');
+                    $('#details-div').attr('hidden', true);
+                }
+            });
+
+            $(element).append(
+                '<div class="row" id="details-div" hidden>' +
+                    '<div class="col">' +
+                        '<div class="form-group">' +
+                            '<label class="text-uppercase text-xs" for="username">Progress Details</label>' +
+                            '<div id="details-data" class="height-control-400 overflow-scroll"></div>' +
+                        '</div>' +
+                    '</div>' +
+                '</div>'
+            );
+        }
     }
 
     function getProgress(options) {
@@ -12012,6 +12092,7 @@ var BazProgress = function() {
         if (callableFunc && callableFunc['beforeStart']) {
             if (callableFunc['beforeStart']() === false) {
                 resetProgressCounter();
+
                 return;
             }
         }
@@ -12044,6 +12125,7 @@ var BazProgress = function() {
         if (callableFunc && callableFunc['beforeProcess']) {
             if (callableFunc['beforeProcess'](response) === false) {
                 resetProgressCounter();
+
                 return;
             }
         }
@@ -12062,6 +12144,8 @@ var BazProgress = function() {
                 if (responseData['pid']) {
                     $('#' + $(element)[0].id + '-cancel').attr('hidden', false);
                     pid = responseData['pid'];
+
+                    $('#details-data').html('PID running : Progress is running with process ID: ' + pid + '<br>');
                 }
 
                 if (responseData['progressFile']) {
@@ -12069,13 +12153,57 @@ var BazProgress = function() {
                 }
 
                 if (responseData['preCheckComplete'] == false ||
-                    (responseData['callResult'] && responseData['callResult'] === 'reset')
+                    (responseData['callResult'] && responseData['callResult'] === 'reset') ||
+                    (responseData['callResult'] && responseData['callResult'] === 'pid_running')
                 ) {
-                    resetProgressCounter();
+                    if (responseData['errors']) {
+                        $('#details-div').attr('hidden', false);
+                        var html = responseData['errors'];
+                        var regex = /{.*}/g;
+                        var found = html.match(regex);
+
+                        if (found) {
+                            //eslint-disable-next-line
+                            var data = found[0].replaceAll('\"', '"');
+                            //eslint-disable-next-line
+                            data = data.replaceAll('\\', '\\\\\\\\');
+                            //eslint-disable-next-line
+                            data = data.replaceAll('\\\\\\u0022', '"');
+                            var obj = JSON.parse(data);
+
+                            if (obj) {
+                                $('#details-data').html(
+                                    '<div class="text-danger">' +
+                                        BazHelpers.createHtmlList({'obj': obj}));
+                                    '</div>'
+                            }
+                        } else {
+                            $('#details-data').html(html);
+                        }
+
+                        $('#details-data').scrollTop($('#details-data')[0].scrollHeight);
+                    }
+
+                    if (responseData['callResult'] === 'pid_running') {
+                        $('#' + $(element)[0].id).attr('hidden', false);
+                        $('#' + $(element)[0].id + '-cancel').attr('hidden', false);
+                        $('#' + $(element)[0].id + '-cancel-button').text('Cancel Process: ' + responseData['pid']);
+                    }
+
+                    if (responseData['callResult'] && responseData['callResult'] === 'reset') {
+                        if (!responseData['errors']) {
+                            resetProgressCounter();
+                        }
+                    }
 
                     return false;
                 }
 
+                if (responseData['details']) {
+                    var pidHtml = $('#details-data').html();
+                    $('#details-data').html(pidHtml + BazHelpers.createHtmlList({'obj': responseData['details']}));
+                }
+
                 if (responseData['total'] !== 'undefined' && responseData['completed'] !== 'undefined') {
                     if (responseData['total'] !== responseData['completed']) {
                         if (responseData['runners'] && responseData['runners']['running'] !== false) {
@@ -12273,12 +12401,16 @@ var BazProgress = function() {
                 responseData['runners']['running']['remoteWebCounters']['downloadTotal'] > 0
             ) {
                 isDownload = true;
+                isUpload = false;
+                isSteps = false;
                 downloadTotal = responseData['runners']['running']['remoteWebCounters']['downloadTotal'];
                 downloadedBytes = responseData['runners']['running']['remoteWebCounters']['downloadedBytes'];
             } else if (responseData['runners']['running']['remoteWebCounters']['uploadTotal'] &&
                 responseData['runners']['running']['remoteWebCounters']['uploadTotal'] > 0
             ) {
                 isUpload = true;
+                isDownload = false;
+                isSteps = false;
                 uploadTotal = responseData['runners']['running']['remoteWebCounters']['uploadTotal'];
                 uploadedBytes = responseData['runners']['running']['remoteWebCounters']['uploadedBytes'];
             }
@@ -12287,6 +12419,8 @@ var BazProgress = function() {
                 responseData['runners']['running']['stepsCounters']['stepsTotal'] > 0
             ) {
                 isSteps = true;
+                isDownload = false;
+                isUpload = false;
                 stepsTotal = responseData['runners']['running']['stepsCounters']['stepsTotal'];
                 stepsCurrent = responseData['runners']['running']['stepsCounters']['stepsCurrent'];
             }
@@ -12305,7 +12439,7 @@ var BazProgress = function() {
         return text;
     }
 
-    function resetProgressCounter() {
+    function resetProgressCounter(hideDiv = true) {
         if (progressCounter !== 60) {
             progressCounter ++;
 
@@ -12317,10 +12451,14 @@ var BazProgress = function() {
             }
         }
 
-        $('#' + $(element)[0].id).attr('hidden', true);
+        if (hideDiv) {
+            $('#' + $(element)[0].id).attr('hidden', true);
+            $('#details-div').attr('hidden', true);
+        }
         $('.' + $(element)[0].id + '-bar').css('width', '0%');
         $('.' + $(element)[0].id + '-bar').attr('aria-valuenow', 0);
         switchProgressBarColor('.' + $(element)[0].id + '-bar', 'info');
+        $('#' + $(element)[0].id + '-cancel-button').text('Cancel');
         downloadTotal = 0;
         downloadedBytes = 0;
         uploadTotal = 0;
@@ -12370,8 +12508,8 @@ var BazProgress = function() {
                 getProgress(options);
             }
         }
-        BazProgress.buildProgressBar = function(el, mSH = false, child = false, hasSubProcess = false, hasCancelButton = true) {
-            buildProgressBar(el, mSH, child, hasSubProcess, hasCancelButton);
+        BazProgress.buildProgressBar = function(el, mSH = false, child = false, hasSubProcess = false, hasCancelButton = true, hasDetails = true) {
+            buildProgressBar(el, mSH, child, hasSubProcess, hasCancelButton, hasDetails);
         }
         BazProgress.switchProgressBarColor = function(el, color) {
             switchProgressBarColor(el, color);
diff --git a/system/Base/BaseComponent.php b/system/Base/BaseComponent.php
index 8010c6b9c..2797efbc2 100644
--- a/system/Base/BaseComponent.php
+++ b/system/Base/BaseComponent.php
@@ -298,7 +298,11 @@ protected function checkComponentDependencies($component = null)
 
 				if (!$packageModule ||
 					($packageModule &&
-					 ($packageModule['installed'] == false || $packageModule['apps'][$this->app['id']]['enabled'] == false)
+					 ($packageModule['installed'] == false ||
+					  (isset($packageModule['apps'][$this->app['id']]) &&
+					   $packageModule['apps'][$this->app['id']]['enabled'] == false
+					  )
+					 )
 					)
 				) {
 					$this->setErrorDispatcher('controllerDependencyError', ['error' => true]);
diff --git a/system/Base/BasePackage.php b/system/Base/BasePackage.php
index 350c49883..9b276cba3 100644
--- a/system/Base/BasePackage.php
+++ b/system/Base/BasePackage.php
@@ -383,6 +383,10 @@ public function getByParams(array $params, bool $resetCache = false, bool $enabl
 				}
 			}
 
+			if (count($relationColumns) > 0) {
+				$this->ffRelations = true;
+			}
+
 			$order = null;
 			$limit = null;
 			$offset = null;
@@ -408,13 +412,16 @@ public function getByParams(array $params, bool $resetCache = false, bool $enabl
 				$offset = $params['offset'];
 			}
 			if (isset($params['conditions']) && is_array($params['conditions']) && count($params['conditions']) > 0) {
-				$this->ffData = $this->ffStore->findBy($params['conditions'], $order, $limit, $offset);
+				$this->ffData =
+					$this->ffStore->findBy(
+						$params['conditions'], $order, $limit, $offset, $this->ffRelations, $this->ffRelationsConditions
+					);
 			} else if (isset($params['conditions']) &&
 					   ((is_array($params['conditions']) && count($params['conditions']) === 0) ||
 						 $params['conditions'] === ''
 					   )
 			) {
-				$this->ffData = $this->ffStore->findAll($order, $limit, $offset);
+				$this->ffData = $this->ffStore->findAll($order, $limit, $offset, $this->ffRelations, $this->ffRelationsConditions);
 			} else {
 				throw new \Exception('getByParams needs parameter conditions (array) to be set.');
 			}
@@ -461,7 +468,7 @@ protected function getRelationColumnsData($relationColumns, $data)
 					$relationRowData = $model->{$alias}->toArray();
 				}
 			} else {
-				$relationRowData = $this->ffStore->findById($row['id'], true);
+				$relationRowData = $row;
 			}
 
 			foreach ($relationColumns as $relationColumnKey => $relationColumn) {
@@ -2271,6 +2278,18 @@ protected function addToLog($code, $message, $debug = true)
 		//Only if debug is enabled.
 	}
 
+	public function getDbCount($recount = false)
+	{
+		if ($this->config->databasetype === 'db') {
+			return $this->modelToUse::count();
+		} else {
+			if (!$this->ffStore) {
+				$this->ffStore = $this->ff->store($this->ffStoreToUse);
+			}
+
+			return $this->ffStore->count($recount);
+		}
+	}
 	// protected function addRefId($data)
 	// {
 	// 	if (!isset($data['ref_id'])) {
diff --git a/system/Base/Helpers.php b/system/Base/Helpers.php
index a52c777a8..189780ee2 100644
--- a/system/Base/Helpers.php
+++ b/system/Base/Helpers.php
@@ -582,4 +582,62 @@ function arrayReplace($array, $findKey, $replace) {
 
         return $array;
     }
-}
\ No newline at end of file
+}
+
+if (!function_exists('getRemoteFilesize')) {
+    /**
+     *  Get the file size of any remote resource (using get_headers()),
+     *  either in bytes or - default - as human-readable formatted string.
+     *
+     *  @author  Stephan Schmitz <eyecatchup@gmail.com>
+     *  @license MIT <http://eyecatchup.mit-license.org/>
+     *  @url     <https://gist.github.com/eyecatchup/f26300ffd7e50a92bc4d>
+     *
+     *  @param   string   $url          Takes the remote object's URL.
+     *  @param   boolean  $formatSize   Whether to return size in bytes or formatted.
+     *  @param   boolean  $useHead      Whether to use HEAD requests. If false, uses GET.
+     *  @return  string                 Returns human-readable formatted size
+     *                                  or size in bytes (default: formatted).
+     */
+    function getRemoteFilesize($url, $formatSize = false, $useHead = false) {
+        if ($useHead) {
+            stream_context_set_default(array('http' => array('method' => 'HEAD')));
+        }
+
+        $head = array_change_key_case(get_headers($url, 1));
+
+        // content-length of download (in bytes), read from Content-Length: field
+        $clen = isset($head['content-length']) ? $head['content-length'] : 0;
+
+        if (!$clen) {
+            return false;
+        }
+
+        $size = $clen;
+
+        if (is_array($clen) && count($clen) > 0) {
+            array_walk($clen, function($len, $index) use (&$size) {
+                if ($len > (int) 0) {
+                    $size = (int) $len;
+
+                    return;
+                }
+            });
+        }
+
+        if ($formatSize) {
+            switch ($size) {
+                case $size < 1024:
+                    $size = $size .' B'; break;
+                case $size < 1048576:
+                    $size = round($size / 1024, 2) .' KiB'; break;
+                case $size < 1073741824:
+                    $size = round($size / 1048576, 2) . ' MiB'; break;
+                case $size < 1099511627776:
+                    $size = round($size / 1073741824, 2) . ' GiB'; break;
+            }
+        }
+
+        return $size;
+    }
+}
diff --git a/system/Base/Installer/Components/Setup.php b/system/Base/Installer/Components/Setup.php
index 240b4f416..9d8ff6309 100644
--- a/system/Base/Installer/Components/Setup.php
+++ b/system/Base/Installer/Components/Setup.php
@@ -179,7 +179,7 @@ function () {
 			$this->helper = $this->container->getShared('helper');
 
 			if ($onlyUpdateDb === false) {
-				$this->progress = $this->basepackages->progress->init($this->container);
+				$this->progress = $this->basepackages->progress->init($this->container, 'setup');
 			}
 
 			$this->config = $configsObj->toArray();
diff --git a/system/Base/Installer/Packages/Setup/Schema.php b/system/Base/Installer/Packages/Setup/Schema.php
index 12a0b48cd..21fe9a780 100644
--- a/system/Base/Installer/Packages/Setup/Schema.php
+++ b/system/Base/Installer/Packages/Setup/Schema.php
@@ -364,7 +364,7 @@ public function getSchema($dev)
                     ]
             ];
 
-        if ($dev == true) {
+        if ($dev == 'true') {
             $schema['apps_core_devtools_files_hash'] = [
                     'schema'    => new \Apps\Core\Packages\Devtools\Modules\Install\Schema\FilesHash,
                     'model'     => new \Apps\Core\Packages\Devtools\Modules\Model\AppsCoreDevtoolsFilesHash,
diff --git a/system/Base/Installer/View/setup.phtml b/system/Base/Installer/View/setup.phtml
index fedf2965c..ea591e8ca 100644
--- a/system/Base/Installer/View/setup.phtml
+++ b/system/Base/Installer/View/setup.phtml
@@ -392,10 +392,10 @@
         </footer>
         <script type="text/javascript">
             <?php if ($precheckFail) { ?>
-                BazProgress.buildProgressBar($('#installer-progress'), true);
+                BazProgress.buildProgressBar($('#installer-progress'), true, false, false, false);
             <?php } else { ?>
                 <?php if (!$onlyUpdateDb) { ?>
-                    BazProgress.buildProgressBar($('#installer-progress'), false, true);
+                    BazProgress.buildProgressBar($('#installer-progress'), false, true, false ,false);
 
                     $('#databasetype').change(function() {
                         if ($('#databasetype').find(':selected').val() === 'ff') {
diff --git a/system/Base/Providers/AccessServiceProvider/Access/Auth.php b/system/Base/Providers/AccessServiceProvider/Access/Auth.php
index d0fb3763b..9cbc2d514 100644
--- a/system/Base/Providers/AccessServiceProvider/Access/Auth.php
+++ b/system/Base/Providers/AccessServiceProvider/Access/Auth.php
@@ -103,7 +103,8 @@ public function attempt($data)
 
         $security = $this->getAccountSecurityObject();
 
-        if ($this->core->core['settings']['security']['twofa'] == 'true' &&
+        if (isset($this->core->core['settings']['security']['twofa']) &&
+            $this->core->core['settings']['security']['twofa'] == 'true' &&
             isset($this->app['enforce_2fa']) &&
             $this->app['enforce_2fa'] == '1'
         ) {
@@ -761,7 +762,8 @@ public function validateData(array $data, $task)
             $this->validation->add('user', PresenceOf::class, ["message" => "Enter valid user name."]);
             $this->validation->add('pass', PresenceOf::class, ["message" => "Enter valid password."]);
             if ($task === 'auth2fa') {
-                if ($this->core->core['settings']['security']['twofa'] == 'true' &&
+                if (isset($this->core->core['settings']['security']['twofa']) &&
+                    $this->core->core['settings']['security']['twofa'] == 'true' &&
                     isset($this->app['enforce_2fa']) &&
                     $this->app['enforce_2fa'] == '1'
                 ) {
diff --git a/system/Base/Providers/ApiServiceProvider/Model/ServiceProviderApiScopes.php b/system/Base/Providers/ApiServiceProvider/Model/ServiceProviderApiScopes.php
index 4b500b195..53e3922f1 100644
--- a/system/Base/Providers/ApiServiceProvider/Model/ServiceProviderApiScopes.php
+++ b/system/Base/Providers/ApiServiceProvider/Model/ServiceProviderApiScopes.php
@@ -27,7 +27,7 @@ public function getIdentifier()
 
     public function initialize()
     {
-        $this->modelRelations['api']['relationObj'] = $this->hasMany(
+        $this->modelRelations['api']['relationObj'] = $this->belongsTo(
             'id',
             ServiceProviderApi::class,
             'scope_id',
diff --git a/system/Base/Providers/BasepackagesServiceProvider/Packages/Model/Users/BasepackagesUsersAccounts.php b/system/Base/Providers/BasepackagesServiceProvider/Packages/Model/Users/BasepackagesUsersAccounts.php
index 377acabdd..f44e20fac 100644
--- a/system/Base/Providers/BasepackagesServiceProvider/Packages/Model/Users/BasepackagesUsersAccounts.php
+++ b/system/Base/Providers/BasepackagesServiceProvider/Packages/Model/Users/BasepackagesUsersAccounts.php
@@ -70,7 +70,13 @@ public function initialize()
             BasepackagesUsersAccountsIdentifiers::class,
             ['account_id', 'session_id'],
             [
-                'alias'         => 'identifier'
+                'alias'         => 'identifier',
+                'params'        => [
+                    'conditions'    => 'session_id = :session_id:',
+                    'bind'          => [
+                        'session_id'       => $this->getDi()->getShared('session')->getId()
+                    ]
+                ]
             ]
         );
 
@@ -124,9 +130,8 @@ public function initialize()
             [
                 'alias'         => 'api_clients',
                 'params'        => [
-                    'conditions'    => 'account_id = :account_id: AND revoked = :revoked:',
+                    'conditions'    => 'revoked = :revoked:',
                     'bind'          => [
-                        'account_id'    => $account_id,
                         'revoked'       => '0'
                     ]
                 ]
diff --git a/system/Base/Providers/BasepackagesServiceProvider/Packages/Progress.php b/system/Base/Providers/BasepackagesServiceProvider/Packages/Progress.php
index 2cd7b9e6e..93f0f8b9d 100644
--- a/system/Base/Providers/BasepackagesServiceProvider/Packages/Progress.php
+++ b/system/Base/Providers/BasepackagesServiceProvider/Packages/Progress.php
@@ -18,6 +18,10 @@ class Progress extends BasePackage
 
     protected $countersTimer;
 
+    protected $errors = [];
+
+    protected $details = [];
+
     public function init($container = null, $fileName = null)
     {
         if ($container) {
@@ -109,10 +113,18 @@ public function unregisterMethods(array $methods, $using = 'method', array $chil
                             foreach ($progressFile['processes'][$progressFileKey]['childs'] as $childKey => $child) {
                                 if (in_array($child[$using], $childs)) {
                                     unset($progressFile['processes'][$progressFileKey]['childs'][$childKey]);
+
+                                    if (isset($progressFile['registeredMethods'][$progressFileKey]['childs'][$childKey])) {
+                                        unset($progressFile['registeredMethods'][$progressFileKey]['childs'][$childKey]);
+                                    }
                                 }
                             }
                         } else {
                             unset($progressFile['processes'][$progressFileKey]);
+
+                            if (isset($progressFile['registeredMethods'][$progressFileKey])) {
+                                unset($progressFile['registeredMethods'][$progressFileKey]);
+                            }
                         }
                     }
                 }
@@ -134,16 +146,28 @@ public function getProgress($session = null, $returnArray = false)
             return false;
         }
 
+        $errors = false;
+
+        if (is_array($this->errors) && count($this->errors) > 0) {
+            $errors = $this->helper->encode($this->errors);
+        }
+
+        $details = $this->getProgressDetails($progressFile);
+
         $progress =
             [
+                'progressFile'          => $this->progressFileName,
+                'pid'                   => $progressFile['pid'] ?? false,
                 'total'                 => $progressFile['total'],
                 'completed'             => $progressFile['completed'],
                 'preCheckComplete'      => $progressFile['preCheckComplete'],
                 'totalPercentComplete'  => $this->getPercentComplete($progressFile, false),
                 'percentComplete'       => $this->getPercentComplete($progressFile),
-                'runners'               => $progressFile['runners'] ?? false
+                'runners'               => $progressFile['runners'] ?? false,
+                'callResult'            => $callResult,
+                'errors'                => $errors,
+                'details'               => $details
             ];
-
         if ($returnArray) {
             return $progress;
         }
@@ -175,9 +199,13 @@ public function updateProgress($method, $callResult = null, $deleteFile = true,
         $progressFile = $this->readProgressFile();
 
         if (isset($progressFile['processes']) && count($progressFile['processes']) > 0) {
-            if ($progressFile['allProcesses'][0]['method'] === $method &&
-                !$callResult &&
-                $progressFile['completed'] === 0
+            if (isset($progressFile['allProcesses'][0]) &&
+                $progressFile['allProcesses'][0]['method'] === $method &&
+                is_null($callResult) &&
+                is_null($child) &&
+                is_null($counters) &&
+                $progressFile['completed'] === 0 &&
+                $progressFile['pid'] > 0
             ) {
                 $this->checkProcessIsRunning($progressFile);
             }
@@ -268,9 +296,10 @@ public function checkProcessIsRunning($progressFile = null)
             $progressFile = $this->checkProgressFile();
         }
 
-        //Check if process is already running
+        //Check if process is running
         //If a user tries to reinitiate same process from start, we should return an error.
         if ($progressFile &&
+            array_key_exists('runners', $progressFile) &&
             ($progressFile['runners']['running'] !== false) &&
             $progressFile['pid'] > 0
         ) {
@@ -281,7 +310,11 @@ public function checkProcessIsRunning($progressFile = null)
                     count($output) > 0
                 ) {
                     if (str_contains($output[0], 'php')) {
-                        throw new DuplicateProgressException('Process is already running with process ID: ' . $progressFile['pid']);
+                        $this->errors = ['PID running' => 'Progress is running with process ID: ' . $progressFile['pid']];
+
+                        $this->sendNotification('pid_running');
+
+                        throw new DuplicateProgressException('Progress is running with process ID: ' . $progressFile['pid']);
                     }
                 }
             }
@@ -324,6 +357,14 @@ protected function sendNotification($callResult, $counters = null)
             $progressFile = $this->readProgressFile();
 
             if ($progressFile) {
+                $errors = false;
+
+                if (is_array($this->errors) && count($this->errors) > 0) {
+                    $errors = $this->helper->encode($this->errors);
+                }
+
+                $details = $this->getProgressDetails($progressFile);
+
                 $this->wss->send(
                     [
                         'type'              => 'progress',
@@ -341,7 +382,9 @@ protected function sendNotification($callResult, $counters = null)
                                     'totalPercentComplete'  => $this->getPercentComplete($progressFile, false),
                                     'percentComplete'       => $this->getPercentComplete($progressFile),
                                     'runners'               => $progressFile['runners'] ?? false,
-                                    'callResult'            => $callResult
+                                    'callResult'            => $callResult,
+                                    'errors'                => $errors,
+                                    'details'               => $details
                                 ]
                         ]
                     ]
@@ -350,6 +393,44 @@ protected function sendNotification($callResult, $counters = null)
         }
     }
 
+    protected function getProgressDetails($progressFile)
+    {
+        $details = false;
+
+        if (isset($progressFile['allProcesses']) && is_array($progressFile['allProcesses'])) {
+            $details = [];
+
+            foreach ($progressFile['allProcesses'] as $process) {
+                if (!array_key_exists('callResult', $process)) {
+                    continue;
+                }
+
+                $processCallResult = 'Running...';
+                if (isset($progressFile['runners']['running']['method']) &&
+                    $progressFile['runners']['running']['method'] !== $process['method']) {
+                    if ($process['callResult'] === true) {
+                        $processCallResult = 'Done';
+                    } else if ($process['callResult'] === false) {
+                        $processCallResult = 'Error';
+                    }
+                    if (count($this->errors) > 0) {
+                        $processCallResult = 'Error';
+                    }
+                } else if ($progressFile['completed'] === $progressFile['total']) {
+                    $processCallResult = 'Done';
+                }
+
+                $details[$process['text']] = $processCallResult;
+            }
+
+            if (count($details) === 0) {
+                $details = false;
+            }
+        }
+
+        return $details;
+    }
+
     protected function getPercentComplete($progressFile, $counters = true)
     {
         $percentComplete = (float) number_format(($progressFile['completed'] * 100) / $progressFile['total']);
@@ -399,10 +480,10 @@ public function resetProgress($reRegisterMethods = true)
         $progressFile = $this->readProgressFile();
 
         if ($progressFile) {
-            $this->deleteProgressFile();
+            $this->deleteProgressFile(true);
 
             if ($reRegisterMethods) {
-                $this->registerMethods($progressFile['allProcesses']);
+                $this->registerMethods($progressFile['registeredMethods']);
             }
         }
 
@@ -411,6 +492,16 @@ public function resetProgress($reRegisterMethods = true)
         return true;
     }
 
+    public function setErrors(array $errors)
+    {
+        $this->errors = $errors;
+    }
+
+    public function getErrors()
+    {
+        return $this->errors;
+    }
+
     protected function checkProgressPath()
     {
         if (!is_dir(base_path('var/progress/'))) {
@@ -508,10 +599,10 @@ protected function writeProgressFile(
                 $file['runners']['running'] = current($methods);
                 $file['runners']['next'] = next($methods);
                 if ($register) {
-                    $file['allProcesses'] = $methods;
+                    $file['allProcesses'] = $file['registeredMethods'] = $methods;
                 } else if ($unregister) {
                     $progressFile = $this->readProgressFile();
-                    $file['allProcesses'] = $progressFile['allProcesses'];
+                    $file['allProcesses'] = $progressFile['registeredMethods'];
                 }
             }
 
@@ -575,6 +666,8 @@ protected function writeProgressFile(
                 if ($runners) {
                     $file['runners'] = $runners;
                 }
+
+                $file['registeredMethods'] = $progressFile['registeredMethods'];
             }
 
             $file['processes'] = $methods;
@@ -586,10 +679,12 @@ protected function writeProgressFile(
             $file['pid'] = 0;
         }
 
-        if (!isset($file['pid'])) {
+        if (!array_key_exists('pid', $file)) {
             $file['pid'] = getmypid();
         }
 
+        $file['errors'] = $this->errors;
+
         if ($this->opCache) {
             if ($progressFile) {
                 $this->opCache->resetCache($this->progressFileName, $file, 'progress');
@@ -605,9 +700,11 @@ protected function writeProgressFile(
         }
     }
 
-    public function deleteProgressFile()
+    public function deleteProgressFile(bool $reset = false)
     {
-        $this->checkProcessIsRunning();
+        if (!$reset) {
+            $this->checkProcessIsRunning();
+        }
 
         if (!$this->progressFileName) {
             $this->progressFileName = $this->session->getId();
diff --git a/system/Base/Providers/BasepackagesServiceProvider/Packages/Storages/Local.php b/system/Base/Providers/BasepackagesServiceProvider/Packages/Storages/Local.php
index d98361d99..beeb75fa2 100644
--- a/system/Base/Providers/BasepackagesServiceProvider/Packages/Storages/Local.php
+++ b/system/Base/Providers/BasepackagesServiceProvider/Packages/Storages/Local.php
@@ -328,7 +328,11 @@ protected function moveImageToLocationAsImageName()
 
     protected function moveFileToLocationAsFileName()
     {
-        $this->file->moveTo(base_path($this->directory . '/' . $this->uuid));
+        if ($this->isPointer === 1) {
+            $this->file->moveTo(base_path($this->directory . '/' . $this->fileName));
+        } else {
+            $this->file->moveTo(base_path($this->directory . '/' . $this->uuid));
+        }
     }
 
     protected function addFileInfoToDb()
diff --git a/system/Base/Providers/BasepackagesServiceProvider/Packages/Users/Accounts.php b/system/Base/Providers/BasepackagesServiceProvider/Packages/Users/Accounts.php
index db6d36cd3..915c9c48f 100644
--- a/system/Base/Providers/BasepackagesServiceProvider/Packages/Users/Accounts.php
+++ b/system/Base/Providers/BasepackagesServiceProvider/Packages/Users/Accounts.php
@@ -26,7 +26,12 @@ public function getAccountById(int $id)
     {
         $this->setFFRelations(true);
 
-        $this->setFFRelationsConditions(['api_clients' => [['account_id', '=', $id], ['revoked', '=', false]]]);
+        $this->setFFRelationsConditions(
+            [
+                'api_clients' => [['revoked', '=', false]],
+                'identifier'  => [['session_id', '=', $this->session->getId()]]
+            ]
+        );
 
         $this->getFirst('id', $id);
 
diff --git a/system/Base/Providers/DatabaseServiceProvider.php b/system/Base/Providers/DatabaseServiceProvider.php
index 5b67d6a44..9befebf2a 100644
--- a/system/Base/Providers/DatabaseServiceProvider.php
+++ b/system/Base/Providers/DatabaseServiceProvider.php
@@ -42,13 +42,6 @@ function () {
 					return (new ModelsManager())->init();
 				}
 			);
-
-			$container->setShared(
-				'sqlite',
-				function () {
-					return (new Sqlite())->init();
-				}
-			);
 		} else {
 			if ($config->databasetype === 'hybrid') {
 				$container->setShared(
@@ -76,5 +69,12 @@ function () use ($config, $request, $helper) {
 				);
 			}
 		}
+
+		$container->setShared(
+			'sqlite',
+			function () {
+				return (new Sqlite())->init();
+			}
+		);
 	}
 }
diff --git a/system/Base/Providers/DatabaseServiceProvider/Ff.php b/system/Base/Providers/DatabaseServiceProvider/Ff.php
index 1266ee7ff..2de3aaf2f 100644
--- a/system/Base/Providers/DatabaseServiceProvider/Ff.php
+++ b/system/Base/Providers/DatabaseServiceProvider/Ff.php
@@ -146,6 +146,7 @@ public function generateSchema($tableName, $tableClass, $tableModel)
         $schema['type'] = 'object';
         $schema['properties'] = [];
         $schema['required'] = [];
+        $schema['relations'] = [];
 
         foreach ($tableClass->columns()['columns'] as $column) {
             $schema['properties'][$column->getName()] = [];
@@ -216,11 +217,14 @@ public function generateSchema($tableName, $tableClass, $tableModel)
                         if ($relation['relationObj']->getReferencedModel() &&
                             is_string($relation['relationObj']->getReferencedModel())
                         ) {
+                            $references[$relationKey]['alias'] = $relationKey;
                             if (isset($relation['relationObj']->getOptions()['alias'])) {
                                 $references[$relationKey]['alias'] = $relation['relationObj']->getOptions()['alias'];
                             }
-
                             switch ($relation['relationObj']->getType()) {
+                                case '0':
+                                    $references[$relationKey]['type'] = 'belongsTo';
+                                    break;
                                 case '1':
                                     $references[$relationKey]['type'] = 'hasOne';
                                     break;
@@ -274,7 +278,7 @@ public function generateSchema($tableName, $tableClass, $tableModel)
                             }
 
                             if (isset($relation['relationObj']->getOptions()['params'])) {
-                                $references[$relationKey]['params'] = 'hasParams';
+                                $references[$relationKey]['hasParams'] = true;
                             }
                         }
                     }
@@ -282,31 +286,7 @@ public function generateSchema($tableName, $tableClass, $tableModel)
             }
 
             if (isset($references) && is_array($references)) {
-                foreach ($references as $key => $reference) {
-                    if (isset($reference['alias'])) {
-                        $schema['properties'][$reference['alias']] = [];
-                        $schema['properties'][$reference['alias']]['type'] = ['null','array'];
-
-                        if (isset($reference[0]) && isset($reference[1])) {
-                            if (isset($reference[0]['fields']) && count($reference[0]['fields']) > 0) {
-                                $reference[0]['fields'] = join(':', $reference[0]['fields']);
-                            }
-                            if (isset($reference[1]['fields']) && count($reference[1]['fields']) > 0) {
-                                $reference[1]['fields'] = join(':', $reference[1]['fields']);
-                            }
-
-                            $reference[0] = join('+', $reference[0]);
-                            $reference[1] = join('+', $reference[1]);
-                            $schema['properties'][$reference['alias']]['relation'] = join('|', $reference);
-                        } else {
-                            if (isset($reference['fields']) && count($reference['fields']) > 0) {
-                                $reference['fields'] = join(':', $reference['fields']);
-                            }
-
-                            $schema['properties'][$reference['alias']]['relation'] = join('|', $reference);
-                        }
-                    }
-                }
+                $schema['relations'] = $references;
             }
         }
 
@@ -364,7 +344,6 @@ public function generateConfig($tableName, $tableClass, $tableModel, $configArr
             foreach ($tableClass->columns()['columns'] as $column) {
                 $columns[$column->getName()] = $column;
             }
-
             foreach ($tableClass->indexes() as $index) {
                 if ($index->getType() === 'UNIQUE' && $index->getColumns() && count($index->getColumns()) > 0) {
                     if (isset($config['uniqueFields']) && count($config['uniqueFields']) > 0) {
@@ -378,7 +357,7 @@ public function generateConfig($tableName, $tableClass, $tableModel, $configArr
                     foreach ($index->getColumns() as $indexColumn) {
                         if (isset($columns[$indexColumn])) {
                             if (in_array($columns[$indexColumn]->getType(), $columnsTypeToIndex)) {
-                                $config['indexes'] = array_merge($config['indexes'], $index->getColumns());
+                                array_push($config['indexes'], $indexColumn);
                             }
                         }
                     }
diff --git a/system/Base/Providers/DatabaseServiceProvider/Ff/Classes/DocumentFinder.php b/system/Base/Providers/DatabaseServiceProvider/Ff/Classes/DocumentFinder.php
index 1d9f44b42..f61d8b518 100644
--- a/system/Base/Providers/DatabaseServiceProvider/Ff/Classes/DocumentFinder.php
+++ b/system/Base/Providers/DatabaseServiceProvider/Ff/Classes/DocumentFinder.php
@@ -55,9 +55,10 @@ public function findDocuments(bool $getOneDocument, bool $reduceAndJoinPossible)
         $skip = $queryBuilderProperties["skip"];
         $limit = $queryBuilderProperties["limit"];
         $fieldsToExclude = $queryBuilderProperties["fieldsToExclude"];
-
         unset($queryBuilderProperties);
 
+        $indexSearched = false;
+
         if ($this->storeConfiguration['indexing']) {
             // This has to be rewritten to include multiple keywords using spaces
             // Example: If we want to search for wes aus, it should search for all entries with Wes keyword and that also includes Aus keyword.
@@ -66,6 +67,8 @@ public function findDocuments(bool $getOneDocument, bool $reduceAndJoinPossible)
                     if (isset($condition[0]) &&
                         in_array($condition[0][0], $this->storeConfiguration['indexes'])
                     ) {
+                        $indexSearched = true;
+
                         $keyword = trim($condition[0][2], '%');//This needs to extend
 
                         if (strlen($keyword) < $this->storeConfiguration['min_index_chars']) {
@@ -84,22 +87,45 @@ public function findDocuments(bool $getOneDocument, bool $reduceAndJoinPossible)
                             $indexJson = json_decode($indexFile, true);
 
                             if (count($indexJson) > 0) {
+                                if ($limit && count($indexJson) > 0) {
+                                    self::skip($indexJson, $skip);
+                                    self::limit($indexJson, $limit);
+                                }
+
                                 if (isset($indexJson[strtolower($keyword)])) {
                                     if (count($indexJson[strtolower($keyword)]) === 1) {
-                                        $found[] = $this->store->findById($indexJson[strtolower($keyword)][0]);
+                                        $indexIdData = $this->store->findById($indexJson[strtolower($keyword)][0]);
+
+                                        if ($indexIdData) {
+                                            $found[] = $indexIdData;
+                                        }
                                     } else {
                                         foreach ($indexJson[strtolower($keyword)] as $id) {
-                                            $found[] = $this->store->findById($id);
+                                            $indexIdData = $this->store->findById($id);
+
+                                            if ($indexIdData) {
+                                                $found[] = $indexIdData;
+                                            }
                                         }
                                     }
                                 } else {
                                     foreach ($indexJson as $key => $ids) {
+                                        if ($limit && count($ids) > $limit) {
+
+                                            self::skip($ids, $skip);
+                                            self::limit($ids, $limit);
+                                        }
+
                                         $key = strtolower($key);
 
                                         if (strtolower($condition[0][1]) === 'like') {
                                             if (str_starts_with($key, strtolower($keyword))) {
                                                 foreach ($ids as $id) {
-                                                    $found[] = $this->store->findById($id);
+                                                    $indexIdData = $this->store->findById($id);
+
+                                                    if ($indexIdData) {
+                                                        $found[] = $indexIdData;
+                                                    }
                                                 }
                                             }
                                         } else if ($condition[0][1] === '=' ||
@@ -107,7 +133,11 @@ public function findDocuments(bool $getOneDocument, bool $reduceAndJoinPossible)
                                         ) {
                                             if ($key === strtolower($keyword)) {
                                                 foreach ($ids as $id) {
-                                                    $found[] = $this->store->findById($id);
+                                                    $indexIdData = $this->store->findById($id);
+
+                                                    if ($indexIdData) {
+                                                        $found[] = $indexIdData;
+                                                    }
                                                 }
                                             }
                                         }
@@ -122,88 +152,85 @@ public function findDocuments(bool $getOneDocument, bool $reduceAndJoinPossible)
             }
         }
 
-        if (count($found) === 0) {
-            if ($handle = opendir($dataPath)) {
-                while (false !== ($entry = readdir($handle))) {
-                    if ($entry === "." || $entry === "..") {
-                        continue;
-                    }
+        if (!$indexSearched && count($found) === 0) {
+            $scanDir = scandir($dataPath);
+            $files = [];
+            array_walk($scanDir, function($file) use (&$files) {
+                if ($file !== '..' && $file !== '.') {
+                    array_push($files, (int) str_replace('.json', '', $file));
+                }
+            });
+            sort($files);
+            if ($limit && count($conditions) === 0 && count($files) > 0) {
+                self::skip($files, $skip);
+                self::limit($files, $limit);
+            }
 
-                    $documentPath = $dataPath . $entry;
+            foreach ($files as $entry) {
+                $documentPath = $dataPath . $entry . '.json';
 
-                    try {
-                        $data = IoHelper::getFileContent($documentPath);
-                    } catch (Exception $exception) {
-                        continue;
-                    }
+                try {
+                    $data = IoHelper::getFileContent($documentPath);
+                } catch (Exception $exception) {
+                    continue;
+                }
 
-                    $data = @json_decode($data, true);
+                $data = @json_decode($data, true);
 
-                    if (!is_array($data)) {
-                        continue;
-                    }
+                if (!is_array($data)) {
+                    continue;
+                }
 
-                    $storePassed = true;
+                $storePassed = true;
 
-                    if (!empty($conditions)) {
-                        $storePassed = ConditionsHandler::handleWhereConditions($conditions, $data);
-                    }
+                if (!empty($conditions)) {
+                    $storePassed = ConditionsHandler::handleWhereConditions($conditions, $data);
+                }
 
-                    if ($storePassed === true && count($distinctFields) > 0) {
-                        $storePassed = ConditionsHandler::handleDistinct($found, $data, $distinctFields);
-                    }
+                if ($storePassed === true && count($distinctFields) > 0) {
+                    $storePassed = ConditionsHandler::handleDistinct($found, $data, $distinctFields);
+                }
 
-                    if ($storePassed === true) {
-                        $found[] = $data;
+                if ($storePassed === true) {
+                    $found[] = $data;
 
-                        if ($getOneDocument === true) {
-                            break;
-                        }
+                    if ($getOneDocument === true) {
+                        break;
                     }
                 }
-
-                closedir($handle);
             }
         }
 
-        if ($reduceAndJoinPossible === true) {
-            DocumentReducer::joinData($found, $listOfJoins);
-        }
-
         if (count($found) > 0) {
+            if ($reduceAndJoinPossible === true) {
+                DocumentReducer::joinData($found, $listOfJoins);
+            }
+
             self::performSearch($found, $search, $searchOptions);
-        }
 
-        if ($reduceAndJoinPossible === true && !empty($groupBy) && count($found) > 0) {
-            DocumentReducer::handleGroupBy(
-                $found,
-                $groupBy,
-                $fieldsToSelect
-            );
-        }
+            if ($reduceAndJoinPossible === true && !empty($groupBy) && count($found) > 0) {
+                DocumentReducer::handleGroupBy(
+                    $found,
+                    $groupBy,
+                    $fieldsToSelect
+                );
+            }
 
-        if ($reduceAndJoinPossible === true && empty($groupBy) && count($found) > 0) {
-            DocumentReducer::selectFields($found, $primaryKey, $fieldsToSelect);
-        }
+            if ($reduceAndJoinPossible === true && empty($groupBy) && count($found) > 0) {
+                DocumentReducer::selectFields($found, $primaryKey, $fieldsToSelect);
+            }
 
-        if (count($found) > 0) {
             self::handleHaving($found, $havingConditions);
-        }
-
-        if ($reduceAndJoinPossible === true && count($found) > 0) {
-            DocumentReducer::excludeFields($found, $fieldsToExclude);
-        }
-
-        if (count($found) > 0) {
-            self::sort($found, $orderBy);
-        }
 
-        if (count($found) > 0) {
-            self::skip($found, $skip);
-        }
+            if ($reduceAndJoinPossible === true && count($found) > 0) {
+                DocumentReducer::excludeFields($found, $fieldsToExclude);
+            }
 
-        if (count($found) > 0) {
-            self::limit($found, $limit);
+            if (!$indexSearched && count($conditions) > 0) {
+                self::sort($found, $orderBy);
+                self::skip($found, $skip);
+                self::limit($found, $limit);
+            }
         }
 
         return $found;
diff --git a/system/Base/Providers/DatabaseServiceProvider/Ff/Classes/IndexHandler.php b/system/Base/Providers/DatabaseServiceProvider/Ff/Classes/IndexHandler.php
index 26f912974..5f2fb5364 100644
--- a/system/Base/Providers/DatabaseServiceProvider/Ff/Classes/IndexHandler.php
+++ b/system/Base/Providers/DatabaseServiceProvider/Ff/Classes/IndexHandler.php
@@ -82,11 +82,19 @@ public function setIndex($content, $remove = false)
 
                                 $indexChars = strtolower(mb_substr($content, 0, $this->minIndexChars, 'UTF-8'));
 
+                                if (str_contains($indexChars, '/')) {//this will result in subdirectories
+                                    continue;
+                                }
+
                                 $this->writeIndex($indexPointer, $index, $indexChars, $content, $remove);
                             }
                         } else {
                             $indexChars = strtolower(mb_substr($content[$index], 0, $this->minIndexChars, 'UTF-8'));
 
+                            if (str_contains($indexChars, '/')) {//this will result in subdirectories
+                                continue;
+                            }
+
                             $this->writeIndex($indexPointer, $index, $indexChars, $content[$index], $remove);
                         }
                     } else {
@@ -96,6 +104,10 @@ public function setIndex($content, $remove = false)
                     if (is_string($content[$index])) {
                         $indexChars = strtolower(mb_substr($content[$index], 0, $this->minIndexChars, 'UTF-8'));
 
+                        if (str_contains($indexChars, '/')) {//this will result in subdirectories
+                            continue;
+                        }
+
                         $this->writeIndex($indexPointer, $index, $indexChars, $content[$index], $remove);
                     } else {
                         $this->writeIndex($indexPointer, $index, $content[$index], $content[$index], $remove);
diff --git a/system/Base/Providers/DatabaseServiceProvider/Ff/Store.php b/system/Base/Providers/DatabaseServiceProvider/Ff/Store.php
index 8a02c3425..9fcfe38a9 100644
--- a/system/Base/Providers/DatabaseServiceProvider/Ff/Store.php
+++ b/system/Base/Providers/DatabaseServiceProvider/Ff/Store.php
@@ -53,6 +53,8 @@ class Store
 
     protected $storeSchema = [];
 
+    protected $relationStores = [];
+
     public $data;
 
     protected $ff;
@@ -83,12 +85,14 @@ public function __construct(string $storeName, string $databasePath, $ff, array
 
         $this->indexesPath = $this->databasePath . $this->storeName . 'indexes/';
 
-        $this->setConfigurationAndSchema($configuration, $schema);
-
         $this->createDatabasePath();
 
         if (count($schema) > 0) {
+            $this->setConfigurationAndSchema($configuration, $schema, true);
+
             $this->createStore($configuration, $schema);
+        } else {
+            $this->setConfigurationAndSchema($configuration, $schema);
         }
     }
 
@@ -289,7 +293,7 @@ public function getStoreName(): string
         return $this->storeName;
     }
 
-    public function findAll(array $orderBy = null, int $limit = null, int $offset = null): array
+    public function findAll(array $orderBy = null, int $limit = null, int $offset = null, $getRelations = false, $relationsConditions = false): array
     {
         try {
             $qb = $this->createQueryBuilder();
@@ -305,8 +309,17 @@ public function findAll(array $orderBy = null, int $limit = null, int $offset =
             if (!is_null($offset)) {
                 $qb->skip($offset);
             }
+            $dataArr = $qb->getQuery()->fetch();
+
+            if ($dataArr && count($dataArr) > 0) {
+                if ($getRelations) {
+                    foreach ($dataArr as &$data) {
+                        $data = $this->getRelations($data, $relationsConditions);
+                    }
+                }
+            }
 
-            $this->data = $qb->getQuery()->fetch();
+            $this->data = $dataArr;
         } catch (\Exception $e) {
             throw $e;
         }
@@ -335,7 +348,7 @@ public function findById($id, $getRelations = false, $relationsConditions = fals
         return $data;
     }
 
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null, $getRelations = false, $relationsConditions = false): array
     {
         try {
             $qb = $this->createQueryBuilder();
@@ -352,7 +365,17 @@ public function findBy(array $criteria, array $orderBy = null, int $limit = null
                 $qb->skip($offset);
             }
 
-            $this->data = $qb->getQuery()->fetch();
+            $dataArr = $qb->getQuery()->fetch();
+
+            if ($dataArr && count($dataArr) > 0) {
+                if ($getRelations) {
+                    foreach ($dataArr as &$data) {
+                        $data = $this->getRelations($data, $relationsConditions);
+                    }
+                }
+            }
+
+            $this->data = $dataArr;
         } catch (\Exception $e) {
             throw $e;
         }
@@ -979,137 +1002,132 @@ public function getRelations($data, $relationsConditions = false)
             $schema = json_decode($this->storeSchema, true);
         }
 
-        if (isset($schema['properties']) && count($schema['properties']) > 0) {
-            foreach ($schema['properties'] as $propertyKey => $property) {
-                if (!is_array($property['type'])) {
-                    continue;
-                }
+        if (!isset($schema['relations']) ||
+            isset($schema['relations']) && count($schema['relations']) === 0
+        ) {
+            return true;
+        }
 
-                if (in_array('array', $property['type']) && isset($property['relation'])) {
-                    $relation = explode('|', $property['relation']);
+        foreach ($schema['relations'] as $relationKey => $relation) {
+            if ($relation['type'] === 'belongsTo') {//We dont want to get relations if it belongs to. This will cause infinite loop!
+                continue;
+            }
 
-                    if (count($relation) > 0) {
-                        if ($relation[1] === 'hasOne' || $relation[1] === 'hasMany') {
+            if ((isset($relation['hasParams']) &&
+                 $relationsConditions &&
+                 count($relationsConditions) === 0
+                ) ||
+                (isset($relation['hasParams']) &&
+                 $relationsConditions &&
+                 count($relationsConditions) > 0 &&
+                 !isset($relationsConditions[$relation['alias']])
+                )
+            ) {
+                throw new InvalidArgumentException('Model has params(conditions) set for ' . $relation['type'] . '. Please set ffRelationsConditions. Please refer to model file.');
+            }
 
-                            if ((in_array('hasParams', $relation) && $relationsConditions && count($relationsConditions) === 0) ||
-                                (in_array('hasParams', $relation) && $relationsConditions && count($relationsConditions) > 0 && !isset($relationsConditions[$relation[0]]))
-                            ) {
-                                throw new InvalidArgumentException('Model has params(conditions) set for ' . $relation[0] . '. Please set ffRelationsConditions. Please refer to model file.');
-                            }
+            if ($relation['type'] === 'hasOne' || $relation['type'] === 'hasMany') {
+                if (isset($relation['fields']) &&
+                    count($relation['fields']) > 0 &&
+                    count($relation['fields']) % 2 == 0
+                ) {
+                    $fieldsArr = $this->ff->helper->chunk($relation['fields'], 2);
 
-                            if (isset($relation[4])) {
-                                if (isset($relationsConditions[$relation[0]])) {
-                                    try {
-                                        $store = new Store($relation[2], $this->databasePath, $this->ff);
+                    $criteria = [];
 
-                                        $storeData = $store->findBy($relationsConditions[$relation[0]]);
+                    if (count($fieldsArr) === 1) {
+                        foreach ($fieldsArr as $fieldArr) {
+                            array_push($criteria, [$fieldArr[1], '=', $data[$fieldArr[0]]]);
+                        }
+                    } else {
+                        foreach ($fieldsArr as $fieldArrKey => $fieldArr) {
+                            array_push($criteria, [$fieldArr[$fieldArrKey], '=', $data[$fieldArr[$fieldArrKey]]]);
+                        }
+                    }
 
-                                        if ($storeData && count($storeData) > 0) {
-                                            if ($relation[1] === 'hasOne') {
-                                                $data[$relation[0]] = $storeData[0];
-                                            } else if ($relation[1] === 'hasMany') {
-                                                $data[$relation[0]] = $storeData;
-                                            }
-                                        } else {
-                                            $data[$relation[0]] = null;
-                                        }
-                                    } catch (\Exception $e) {
-                                        continue;
-                                    }
-                                } else {
-                                    $fields = explode(':', $relation[4]);
+                    if (isset($relationsConditions[$relation['alias']])) {//Relation with condition
+                        $criteria = array_merge($criteria, $relationsConditions[$relation['alias']]);
+                    }
 
-                                    if (count($fields) > 0 && count($fields) % 2 == 0) {
-                                        $fieldsArr = $this->ff->helper->chunk($fields, 2);
-                                        $criteria = [];
+                    try {
+                        $directRelationStoreData = $this->relationStores[$relation['table']]->findBy($criteria);
 
-                                        foreach ($fieldsArr as $fieldArr) {
-                                            array_push($criteria, [$fieldArr[1], '=', $data[$fieldArr[0]]]);
-                                        }
+                        if ($directRelationStoreData && count($directRelationStoreData) > 0) {
+                            if ($relation['type'] === 'hasOne') {
+                                $data[$relation['alias']] = $directRelationStoreData[0];
+                            } else if ($relation['type'] === 'hasMany') {
+                                $data[$relation['alias']] = $directRelationStoreData;
+                            }
+                        } else {
+                            $data[$relation['alias']] = null;
+                        }
+                    } catch (\Exception $e) {
+                        continue;
+                    }
+                }
+            } else if ($relation['type'] === 'hasOneThrough' || $relation['type'] === 'hasManyThrough') {
+                if (isset($relation[0]['fields']) &&
+                    count($relation[0]['fields']) > 0 &&
+                    count($relation[0]['fields']) % 2 == 0
+                ) {
+                    $fieldsArr = $this->ff->helper->chunk($relation[0]['fields'], 2);
 
-                                        try {
-                                            $store = new Store($relation[2], $this->databasePath, $this->ff);
+                    $criteria = [];
 
-                                            $storeData = $store->findBy($criteria);
+                    if (count($fieldsArr) === 1) {
+                        foreach ($fieldsArr as $fieldArr) {
+                            array_push($criteria, [$fieldArr[1], '=', $data[$fieldArr[0]]]);
+                        }
+                    } else {
+                        foreach ($fieldsArr as $fieldArrKey => $fieldArr) {
+                            array_push($criteria, [$fieldArr[$fieldArrKey], '=', $data[$fieldArr[$fieldArrKey]]]);
+                        }
+                    }
 
-                                            if ($storeData && count($storeData) > 0) {
-                                                if ($relation[1] === 'hasOne') {
-                                                    $data[$relation[0]] = $storeData[0];
-                                                } else if ($relation[1] === 'hasMany') {
-                                                    $data[$relation[0]] = $storeData;
-                                                }
-                                            } else {
-                                                $data[$relation[0]] = null;
-                                            }
-                                        } catch (\Exception $e) {
-                                            continue;
-                                        }
-                                    }
-                                }
-                            }
-                        } else if ($relation[1] === 'hasOneThrough' || $relation[1] === 'hasManyThrough') {
-                            if (isset($relation[2]) && isset($relation[3])) {
-                                $relation[2] = explode('+', $relation[2]);
-                                $relation[3] = explode('+', $relation[3]);
-                            }
+                    if (isset($relationsConditions[$relation['alias']])) {//Relation with condition
+                        $criteria = array_merge($criteria, $relationsConditions[$relation['alias']]);
+                    }
 
-                            if (isset($relation[2][2]) && isset($relation[3][2])) {
-                                $intermediateFields = explode(':', $relation[2][2]);
-                                $fields = explode(':', $relation[3][2]);
-                            }
+                    try {
+                        $intermediateStoreDataArr = $this->relationStores[$relation[0]['table']]->findBy($criteria);
+                    } catch (\Exception $e) {
+                        continue;
+                    }
 
-                            if ((count($intermediateFields) > 0 && count($intermediateFields) % 2 == 0) &&
-                                (count($fields) > 0 && count($fields) % 2 == 0)
+                    if (!$intermediateStoreDataArr) {
+                        continue;
+                    }
+
+                    if (count($intermediateStoreDataArr) > 0) {
+                        foreach ($intermediateStoreDataArr as $intermediateStoreData) {
+                            if (isset($relation[1]['fields']) &&
+                                count($relation[1]['fields']) > 0 &&
+                                count($relation[1]['fields']) % 2 == 0
                             ) {
-                                $fieldsArr = $this->ff->helper->chunk($intermediateFields, 2);
-                                $criteria = [];
+                                $fieldsArr = $this->ff->helper->chunk($relation[1]['fields'], 2);
 
+                                $criteria = [];
                                 if (count($fieldsArr) === 1) {
                                     foreach ($fieldsArr as $fieldArr) {
-                                        array_push($criteria, [$fieldArr[1], '=', $data[$fieldArr[0]]]);
+                                        array_push($criteria, [$fieldArr[1], '=', $intermediateStoreData[$fieldArr[0]]]);
                                     }
                                 } else {
                                     foreach ($fieldsArr as $fieldArrKey => $fieldArr) {
-                                        array_push($criteria, [$fieldArr[$fieldArrKey], '=', $data[$fieldArr[$fieldArrKey]]]);
+                                        array_push($criteria, [$fieldArr[$fieldArrKey], '=', $intermediateStoreData[$fieldArr[$fieldArrKey]]]);
                                     }
                                 }
 
                                 try {
-                                    $store = new Store($relation[2][0], $this->databasePath, $this->ff);
-
-                                    $storeData = $store->findOneBy($criteria);
-
-                                    $fieldsArr = $this->ff->helper->chunk($fields, 2);
-                                    $criteria = [];
-
-                                    if ($storeData && count($storeData) > 0) {
-                                        if (count($fieldsArr) === 1) {
-                                            foreach ($fieldsArr as $fieldArr) {
-                                                array_push($criteria, [$fieldArr[1], '=', $storeData[$fieldArr[0]]]);
-                                            }
-                                        } else {
-                                            foreach ($fieldsArr as $fieldArrKey => $fieldArr) {
-                                                array_push($criteria, [$fieldArr[$fieldArrKey], '=', $storeData[$fieldArr[$fieldArrKey]]]);
-                                            }
-                                        }
-                                    }
+                                    $finalRelationStoreData = $this->relationStores[$relation[1]['table']]->findBy($criteria);
 
-                                    if (count($criteria) > 0) {
-                                        $store = new Store($relation[3][0], $this->databasePath, $this->ff);
-
-                                        $storeData = $store->findBy($criteria);
-
-                                        if ($storeData && count($storeData) > 0) {
-                                            if ($relation[1] === 'hasOneThrough') {
-                                                $data[$relation[0]] = $storeData[0];
-                                            } else if ($relation[1] === 'hasManyThrough') {
-                                                $data[$relation[0]] = $storeData;
-                                            }
-                                        } else {
-                                            $data[$relation[0]] = null;
+                                    if ($finalRelationStoreData && count($finalRelationStoreData) > 0) {
+                                        if ($relation['type'] === 'hasOneThrough') {
+                                            $data[$relation['alias']] = $finalRelationStoreData[0];
+                                        } else if ($relation['type'] === 'hasManyThrough') {
+                                            $data[$relation['alias']] = $finalRelationStoreData;
                                         }
                                     } else {
-                                        $data[$relation[0]] = null;
+                                        $data[$relation['alias']] = null;
                                     }
                                 } catch (\Exception $e) {
                                     continue;
@@ -1188,8 +1206,9 @@ protected function createDatabasePath()
         IoHelper::createFolder($this->databasePath, $this->folderPermissions);
     }
 
-    protected function setConfigurationAndSchema(array $configuration = [], array $schema = [])
+    protected function setConfigurationAndSchema(array $configuration = [], array $schema = [], $createStore = false)
     {
+        //Configuration
         if (count($configuration) === 0 || !array_key_exists('primary_key', $configuration)) {
             if (file_exists($this->storePath . 'config.json')) {
                 if (isset($configuration['auto_cache'])) {
@@ -1199,8 +1218,10 @@ protected function setConfigurationAndSchema(array $configuration = [], array $s
                     $cacheLifetime = $configuration['cache_lifetime'];
                 }
 
-                $configuration = IoHelper::getFileContent($this->storePath . 'config.json');
-                $configuration = json_decode($configuration, true);
+                $oldConfiguration = IoHelper::getFileContent($this->storePath . 'config.json');
+                $oldConfiguration = json_decode($oldConfiguration, true);
+
+                $configuration = array_replace($oldConfiguration, $configuration);
 
                 if (isset($autoCache)) {
                     $configuration['auto_cache'] = $autoCache;
@@ -1211,19 +1232,6 @@ protected function setConfigurationAndSchema(array $configuration = [], array $s
             }
         }
 
-        if (count($schema) === 0) {
-            if (file_exists($this->storePath . 'schema.json')) {
-                $schema = IoHelper::getFileContent($this->storePath . 'schema.json');
-                $schema = json_decode($schema, true);
-            }
-
-            if (count($schema) > 0) {
-                $this->storeSchema = json_encode($schema);
-            }
-        } else {
-            $this->storeSchema = json_encode($schema);
-        }
-
         if (array_key_exists("min_index_chars", $configuration)) {
             if (!is_int($configuration["min_index_chars"])) {
                 throw new InvalidConfigurationException("min_index_chars has to be an integer");
@@ -1252,7 +1260,6 @@ protected function setConfigurationAndSchema(array $configuration = [], array $s
             $this->minMultiWordsChars = $configuration["minMultiWordsChars"];
         }
 
-
         if (array_key_exists("indexes", $configuration)) {
             if (!is_array($configuration["indexes"])) {
                 throw new InvalidConfigurationException("indexes has to be an array");
@@ -1360,6 +1367,38 @@ protected function setConfigurationAndSchema(array $configuration = [], array $s
         }
 
         $this->storeConfiguration();
+
+        //Schema
+        if (count($schema) === 0) {
+            if (file_exists($this->storePath . 'schema.json')) {
+                $oldSchema = IoHelper::getFileContent($this->storePath . 'schema.json');
+                $oldSchema = json_decode($oldSchema, true);
+                $schema = array_replace($oldSchema, $schema);
+            }
+        }
+
+        if (!$createStore &&
+            isset($schema['relations']) && count($schema['relations']) > 0
+        ) {
+            foreach ($schema['relations'] as $relation) {
+                if ($relation['type'] === 'belongsTo') {
+                    continue;
+                }
+
+                if (isset($relation['table'])) {
+                    $this->relationStores[$relation['table']] = new Store($relation['table'], $this->databasePath, $this->ff);
+                } else if (isset($relation[0]) && isset($relation[1])) {
+                    if (!isset($this->relationStores[$relation[0]['table']])) {
+                        $this->relationStores[$relation[0]['table']] = new Store($relation[0]['table'], $this->databasePath, $this->ff);
+                    }
+                    if (!isset($this->relationStores[$relation[1]['table']])) {
+                        $this->relationStores[$relation[1]['table']] = new Store($relation[1]['table'], $this->databasePath, $this->ff);
+                    }
+                }
+            }
+        }
+
+        $this->storeSchema = json_encode($schema);
     }
 
     protected function storeConfiguration()
@@ -1765,4 +1804,16 @@ public function reIndexStore()
 
         return $this;
     }
+
+    public function getIndexing()
+    {
+        return $this->indexing;
+    }
+
+    public function setIndexing($indexing = true)
+    {
+        $this->indexing = $indexing;
+
+        return $this->getIndexing();
+    }
 }
\ No newline at end of file
diff --git a/system/Base/Providers/DatabaseServiceProvider/Sqlite.php b/system/Base/Providers/DatabaseServiceProvider/Sqlite.php
index a1549bbd8..3f54e86e6 100644
--- a/system/Base/Providers/DatabaseServiceProvider/Sqlite.php
+++ b/system/Base/Providers/DatabaseServiceProvider/Sqlite.php
@@ -13,18 +13,21 @@ public function __construct()
         //
     }
 
-    public function init()
+    public function init($file = null)
     {
-        $this->databaseDir = base_path('.sql/');
+        if (!$file) {
+            $this->databaseDir = base_path('.sql/');
 
-        $this->checkDatabasePath();
+            $this->checkDatabasePath();
+
+            $file = $this->databaseDir . 'sp.sqlite';
+        }
 
         return new PhalconSqlite(
             [
-                'dbname'    => $this->databaseDir . 'baz.sqlite'
+                'dbname'    => $file
             ]
         );
-
     }
 
     protected function checkDatabasePath()
diff --git a/system/Base/Providers/MicroMiddlewaresServiceProvider.php b/system/Base/Providers/MicroMiddlewaresServiceProvider.php
index 4a028ffc3..29576bf3a 100644
--- a/system/Base/Providers/MicroMiddlewaresServiceProvider.php
+++ b/system/Base/Providers/MicroMiddlewaresServiceProvider.php
@@ -205,7 +205,7 @@ protected function checkRoute($middleware)
 
     protected function componentsNeedsAuth()
     {
-        $componentsArr = $this->modules->components->getComponentsForAppType($this->data['app']['app_type']);
+        $componentsArr = $this->modules->components->getComponentsForAppType($this->data['app']['app_type'], true);
 
         foreach ($componentsArr as $key => $componentValue) {
             $match = false;
diff --git a/system/Base/Providers/MiddlewaresServiceProvider.php b/system/Base/Providers/MiddlewaresServiceProvider.php
index ec2bef74e..973344947 100644
--- a/system/Base/Providers/MiddlewaresServiceProvider.php
+++ b/system/Base/Providers/MiddlewaresServiceProvider.php
@@ -181,7 +181,7 @@ protected function checkRoute($middleware)
 
     protected function componentsNeedsAuth()
     {
-        $componentsArr = $this->modules->components->getComponentsForAppType($this->data['app']['app_type']);
+        $componentsArr = $this->modules->components->getComponentsForAppType($this->data['app']['app_type'], true);
 
         foreach ($componentsArr as $key => $componentValue) {
             $match = false;
diff --git a/system/Base/Providers/ModulesServiceProvider/DbInstaller.php b/system/Base/Providers/ModulesServiceProvider/DbInstaller.php
index 80b9ae7cf..1e71c31d4 100644
--- a/system/Base/Providers/ModulesServiceProvider/DbInstaller.php
+++ b/system/Base/Providers/ModulesServiceProvider/DbInstaller.php
@@ -131,6 +131,11 @@ public function installDb($databases)
             }
 
             if (count($storesToIndex) > 0) {
+                //Increase Exectimeout to 1 hour as this process takes time to index
+                if ((int) ini_get('max_execution_time') < 3600) {
+                    set_time_limit(3600);
+                }
+
                 foreach ($storesToIndex as $storeToIndex) {
                     ($this->ff->store($storeToIndex))->reIndexStore();
                 }
diff --git a/system/Base/Providers/ModulesServiceProvider/Manager.php b/system/Base/Providers/ModulesServiceProvider/Manager.php
index 9629a0d68..d9683f708 100644
--- a/system/Base/Providers/ModulesServiceProvider/Manager.php
+++ b/system/Base/Providers/ModulesServiceProvider/Manager.php
@@ -233,6 +233,12 @@ public function updateModuleRepoDetails($module, $data = null)
 
                 $latestRelease = $this->moduleNeedsUpgrade($responseArr, $module);
 
+                if (!$latestRelease &&
+                    (isset($data['getLatestRelease']) && $data['getLatestRelease'] === true)
+                ) {
+                    $latestRelease = $this->getLatestRelease($module['repo_details']['details']);
+                }
+
                 if ($latestRelease) {
                     $module['repo_details']['latestRelease'] = $latestRelease;
                     $latestReleaseJson = $this->getRemoteModuleJson($module['module_type'], $module, true);
@@ -249,11 +255,16 @@ public function updateModuleRepoDetails($module, $data = null)
                         } else {
                             $module['dependencies'] = $module['repo_details']['latestRelease']['moduleJson']['dependencies'];
                             if ($module['installed'] == '1') {
-                                $module['update_available'] = '1';
-                                $module['update_version'] = $module['repo_details']['latestRelease']['name'];
+                                if ($module['repo_details']['latestRelease']['name'] !== $module['version']) {
+                                    $module['update_available'] = '1';
+                                    $module['update_version'] = $module['repo_details']['latestRelease']['name'];
+                                } else {
+                                    $module['update_available'] = null;
+                                    $module['update_version'] = null;
+                                }
                             } else {
                                 $module['version'] = $module['repo_details']['latestRelease']['name'];
-                                $module['update_available'] = '0';
+                                $module['update_available'] = null;
                                 $module['update_version'] = null;
                             }
                         }
@@ -293,16 +304,21 @@ public function updateModuleRepoDetails($module, $data = null)
                     if ($latestRelease) {
                         $module['repo_details']['latestRelease'] = $latestRelease;
                         if ($module['installed'] == '1') {
-                            $module['update_available'] = '1';
-                            $module['update_version'] = $module['repo_details']['latestRelease']['name'];
+                            if ($module['repo_details']['latestRelease']['name'] !== $module['version']) {
+                                $module['update_available'] = '1';
+                                $module['update_version'] = $module['repo_details']['latestRelease']['name'];
+                            } else {
+                                $module['update_available'] = null;
+                                $module['update_version'] = null;
+                            }
                         } else {
-                            $module['update_available'] = '0';
+                            $module['update_available'] = null;
+                            $module['update_version'] = null;
                             $module['version'] = $module['repo_details']['latestRelease']['name'];
-                            $module['update_version'] = '-';
                         }
                     } else {
-                        $module['update_available'] = '0';
-                        $module['update_version'] = '-';
+                        $module['update_available'] = null;
+                        $module['update_version'] = null;
                     }
                 } else {
                     $module['repo_details'] = false;
@@ -621,7 +637,17 @@ protected function getRemoteModules()
             }
 
             try {
-                $modulesArr = $this->apiClient->useMethod($collection, $method, $args)->getResponse(true);
+                $page = 1;
+                $getRemoteModules = [];
+                $modulesArr = [];
+                while ($getRemoteModules !== false) {
+                    $args['page'] = $page;
+                    $getRemoteModules = $this->apiClient->useMethod($collection, $method, $args)->getResponse(true);
+                    if ($getRemoteModules) {
+                        $modulesArr = array_merge($modulesArr, $getRemoteModules);
+                    }
+                    $page++;
+                }
             } catch (\throwable | ClientException $e) {
                 $this->addResponse($e->getMessage(), 1);
 
diff --git a/system/Base/Providers/ModulesServiceProvider/Modules/Components.php b/system/Base/Providers/ModulesServiceProvider/Modules/Components.php
index 665d98b1b..6935e2b22 100644
--- a/system/Base/Providers/ModulesServiceProvider/Modules/Components.php
+++ b/system/Base/Providers/ModulesServiceProvider/Modules/Components.php
@@ -80,6 +80,19 @@ public function getComponentByAppTypeAndRepoAndRoute($appType, $repo, $route)
 		return false;
 	}
 
+	public function getComponentByAppTypeAndRoute($appType, $route)
+	{
+		foreach($this->components as $component) {
+			if ($component['app_type'] === $appType &&
+				trim($route, '/') === trim($component['route'], '/')
+			) {
+				return $component;
+			}
+		}
+
+		return false;
+	}
+
 	public function getComponentByRoute($route)
 	{
 		foreach($this->components as $component) {
diff --git a/system/Base/Providers/ModulesServiceProvider/Modules/Middlewares.php b/system/Base/Providers/ModulesServiceProvider/Modules/Middlewares.php
index 6bf11b1ee..13a15afab 100644
--- a/system/Base/Providers/ModulesServiceProvider/Modules/Middlewares.php
+++ b/system/Base/Providers/ModulesServiceProvider/Modules/Middlewares.php
@@ -115,6 +115,19 @@ public function getMiddlewareByAppTypeAndRepoAndClass($appType, $repo, $class)
 		return false;
 	}
 
+	public function getMiddlewareByAppTypeAndClass($appType, $class)
+	{
+		foreach($this->middlewares as $middleware) {
+			if ($middleware['app_type'] === $appType &&
+				trim($class, '\\') === trim($middleware['class'], '\\')
+			) {
+				return $middleware;
+			}
+		}
+
+		return false;
+	}
+
 	public function getMiddlewaresByApiId($apiId)
 	{
 		$middlewares = [];
diff --git a/system/Base/Providers/ModulesServiceProvider/Modules/Packages.php b/system/Base/Providers/ModulesServiceProvider/Modules/Packages.php
index 5b1314d6d..e0a1fd965 100644
--- a/system/Base/Providers/ModulesServiceProvider/Modules/Packages.php
+++ b/system/Base/Providers/ModulesServiceProvider/Modules/Packages.php
@@ -110,6 +110,19 @@ public function getPackageByAppTypeAndRepoAndClass($appType, $repo, $class)
 		return false;
 	}
 
+	public function getPackageByAppTypeAndClass($appType, $class)
+	{
+		foreach($this->packages as $package) {
+			if ($package['app_type'] === $appType &&
+				trim($class, '\\') === trim($package['class'], '\\')
+			) {
+				return $package;
+			}
+		}
+
+		return false;
+	}
+
 	public function getPackageByAppTypeAndName($appType, $name)
 	{
 		foreach($this->packages as $package) {
diff --git a/system/Base/Providers/ModulesServiceProvider/Modules/Views.php b/system/Base/Providers/ModulesServiceProvider/Modules/Views.php
index 1f74c5251..9c8840400 100644
--- a/system/Base/Providers/ModulesServiceProvider/Modules/Views.php
+++ b/system/Base/Providers/ModulesServiceProvider/Modules/Views.php
@@ -359,6 +359,19 @@ public function getViewByAppTypeAndRepoAndName($appType, $repo, $name)
         return false;
     }
 
+    public function getViewByAppTypeAndName($appType, $name)
+    {
+        foreach($this->views as $view) {
+            if ($view['app_type'] === $appType &&
+                strtolower($name) === strtolower($view['name'])
+            ) {
+                return $view;
+            }
+        }
+
+        return false;
+    }
+
     public function getViewsByApiId($apiId)
     {
         $views = [];