diff --git a/README.md b/README.md
index d96bc6a..55acbab 100644
--- a/README.md
+++ b/README.md
@@ -6,16 +6,17 @@ Here is a live example of how general and context specific hierarchy can be:
 Mark, Swapnil, Mary & Vaishali normally report to Vijay. However Mary and Vaishali have been asked to additionally report to Parth in the special context of a 'Project A'
 
 ## How to Install
-Donwload the code. Package it as a Zip and install it using the Joomla extension manager. 
+Download the code. Package it as a Zip and install it using the Joomla extension manager. 
 
 ## Configurtion
-Integration Options : Core Joomla, EasySocial, JomSocial, EasyProfile, Community Builder
+Integration Options: Core Joomla, EasySocial, JomSocial, EasyProfile, Community Builder
 
 ## Frontend Menus 
 The Hierarchy management system supports the following menus on the frontend.
 
 ### My Team 
-Shows a list view of people directly reporting to the logged in user. List can be filtered by Context. Default (context ?) is None. 
+Shows a list view of people directly reporting to the logged in user. List can be filtered by Context. Default (context ?) is None.
+
 From this view they can drill down to the user and see a short User information page and also the team that reports to that user. An Icon will let you switch to a visual representation that will show a chart view. 
 
 The default layout to use can be set in menu parameters. 
diff --git a/administrator/assets/elements/integrations.php b/administrator/assets/elements/integrations.php
index 0fd9831..b9e2e71 100644
--- a/administrator/assets/elements/integrations.php
+++ b/administrator/assets/elements/integrations.php
@@ -8,7 +8,10 @@
  */
 
 defined('_JEXEC') or die('Restricted access');
-jimport('joomla.form.formfield');
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Filesystem\File;
 
 /**
  * JFormFieldIntegrations class
@@ -17,7 +20,7 @@
  * @subpackage  component
  * @since       1.0
  */
-class JFormFieldIntegrations extends JFormField
+class FormFieldIntegrations extends FormField
 {
 	/**
 	 *Function to construct a hierarchy view
@@ -63,37 +66,37 @@ public function fetchElement ($name, $value, $controlName)
 		if ($name == 'jform[integration]')
 		{
 			$options = array();
-			$options[] = JHtml::_('select.option', '2', JText::_('COM_HIERARCHY_NATIVE'));
+			$options[] = HTMLHelper::_('select.option', '2', Text::_('COM_HIERARCHY_NATIVE'));
 
-			if (JFile::exists($this->communityMainFile))
+			if (File::exists($this->communityMainFile))
 			{
-				$options[] = JHtml::_('select.option', '1', JText::_('COM_HIERARCHY_JOMSOCIAL'));
+				$options[] = HTMLHelper::_('select.option', '1', Text::_('COM_HIERARCHY_JOMSOCIAL'));
 			}
 
-			if (JFile::exists($this->jeventsMainFile))
+			if (File::exists($this->jeventsMainFile))
 			{
-				$options[] = JHtml::_('select.option', '3', JText::_('COM_HIERARCHY_JEVENT'));
+				$options[] = HTMLHelper::_('select.option', '3', Text::_('COM_HIERARCHY_JEVENT'));
 			}
 
-			if (JFile::exists($this->esMainFile))
+			if (File::exists($this->esMainFile))
 			{
-				$options[] = JHtml::_('select.option', '4', JText::_('COM_HIERARCHY_EASYSOCIAL'));
+				$options[] = HTMLHelper::_('select.option', '4', Text::_('COM_HIERARCHY_EASYSOCIAL'));
 			}
 
-			if (JFile::exists($this->easyProMainFile))
+			if (File::exists($this->easyProMainFile))
 			{
-				$options[] = JHtml::_('select.option', '5', JText::_('COM_HIERARCHY_EASYPROFILE'));
+				$options[] = HTMLHelper::_('select.option', '5', Text::_('COM_HIERARCHY_EASYPROFILE'));
 			}
 
-			if (JFile::exists($this->cbMainFile))
+			if (File::exists($this->cbMainFile))
 			{
-				$options[] = JHtml::_('select.option', '6', JText::_('COM_HIERARCHY_COMMUNITY_BUILDER'));
+				$options[] = HTMLHelper::_('select.option', '6', Text::_('COM_HIERARCHY_COMMUNITY_BUILDER'));
 			}
 
 			$fieldName = $name;
 		}
 
-		$html = JHtml::_('select.genericlist',  $options, $fieldName, 'class="inputbox"', 'value', 'text', $value, $controlName . $name);
+		$html = HTMLHelper::_('select.genericlist',  $options, $fieldName, 'class="inputbox"', 'value', 'text', $value, $controlName . $name);
 
 		return $html;
 	}
diff --git a/administrator/controller.php b/administrator/controller.php
index 331b1d7..546e44d 100755
--- a/administrator/controller.php
+++ b/administrator/controller.php
@@ -9,13 +9,15 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Factory;
 
 /**
  * Hierarchy view class for the hierarchy package.
  *
  * @since  1.6
  */
-class HierarchyController extends JControllerLegacy
+class HierarchyController extends BaseController
 {
 	/**
 	 * Method to display a view.
@@ -31,8 +33,8 @@ public function display($cachable = false, $urlparams = false)
 	{
 		require_once JPATH_COMPONENT . '/helpers/hierarchy.php';
 
-		$view = JFactory::getApplication()->input->getCmd('view', 'hierarchys');
-		JFactory::getApplication()->input->set('view', $view);
+		$view = Factory::getApplication()->input->getCmd('view', 'hierarchys');
+		Factory::getApplication()->input->set('view', $view);
 
 		parent::display($cachable, $urlparams);
 
diff --git a/administrator/controllers/hierarchy.php b/administrator/controllers/hierarchy.php
index 8681709..af5c69d 100755
--- a/administrator/controllers/hierarchy.php
+++ b/administrator/controllers/hierarchy.php
@@ -9,15 +9,19 @@
 
 // No direct access
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.controllerform');
+use Joomla\CMS\MVC\Controller\FormController;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Router\Route;
 
 /**
  * The Hierarchy Controller
  *
  * @since  1.6
  */
-class HierarchyControllerHierarchy extends JControllerForm
+class HierarchyControllerHierarchy extends FormController
 {
 	/**
 	 * Constructor.
@@ -30,11 +34,11 @@ public function __construct()
 	{
 		$this->view_list = 'hierarchys';
 
-		$this->db = JFactory::getDbo();
-		JTable::addIncludePath(JPATH_ROOT . '/administrator/components/com_hierarchy/tables');
-		$this->hierarchyTableObj = JTable::getInstance('Hierarchy', 'HierarchyTable', array('dbo', $this->db));
+		$this->db = Factory::getDbo();
+		Table::addIncludePath(JPATH_ROOT . '/administrator/components/com_hierarchy/tables');
+		$this->hierarchyTableObj = Table::getInstance('Hierarchy', 'HierarchyTable', array('dbo', $this->db));
 
-		$this->msg   = JText::_('COM_HIERARCHY_REPORTEES_SAVE_MSG');
+		$this->msg   = Text::_('COM_HIERARCHY_REPORTEES_SAVE_MSG');
 		parent::__construct();
 	}
 
@@ -51,21 +55,21 @@ public function __construct()
 	public function save($key = null, $urlVar = null)
 	{
 		// Check for request forgeries.
-		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
 
 		// Initialise variables.
-		$app   = JFactory::getApplication();
+		$app   = Factory::getApplication();
 		$model = $this->getModel('hierarchy', 'HierarchyModel');
 
 		// Get the user data.
-		$data = JFactory::getApplication()->input->get('jform', array(), 'array');
+		$data = Factory::getApplication()->input->get('jform', array(), 'array');
 
 		// Validate the posted data.
 		$form = $model->getForm();
 
 		if (!$form)
 		{
-			JError::raiseError(500, $model->getError());
+			$app->enqueueMessage($model->getError(), 'error');
 
 			return false;
 		}
@@ -76,7 +80,7 @@ public function save($key = null, $urlVar = null)
 			$data = $model->validate($form, $data);
 		}
 
-		$jinput = JFactory::getApplication()->input;
+		$jinput = Factory::getApplication()->input;
 		$data['user_id']  = $jinput->get('user_id', '', 'int');
 		$data['created_by']  = $jinput->get('created_by', '', 'int');
 		$data['modified_by'] = $jinput->get('modified_by', '', 'int');
@@ -112,7 +116,7 @@ public function save($key = null, $urlVar = null)
 			$return = $model->save($data);
 		}
 
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$id    = $input->get('id');
 
 		if (empty($id))
@@ -124,8 +128,9 @@ public function save($key = null, $urlVar = null)
 
 		if ($task == 'apply')
 		{
-			$redirect = JRoute::_('index.php?option=com_hierarchy&view=hierarchy&layout=edit&id=' . $id, false);
-			$app->redirect($redirect, $this->msg);
+			$redirect = Route::_('index.php?option=com_hierarchy&view=hierarchy&layout=edit&id=' . $id, false);
+			$app->enqueueMessage($this->msg);
+			$app->redirect($redirect);
 		}
 
 		// Clear the profile id from the session.
@@ -138,8 +143,9 @@ public function save($key = null, $urlVar = null)
 		}
 
 		// Redirect to the list screen.
-		$redirect = JRoute::_('index.php?option=com_hierarchy&view=hierarchys', false);
-		$app->redirect($redirect, $this->msg);
+		$redirect = Route::_('index.php?option=com_hierarchy&view=hierarchys', false);
+		$app->enqueueMessage($this->msg);
+		$app->redirect($redirect);
 
 		// Flush the data from the session.
 		$app->setUserState('com_hierarchy.edit.hierarchy.data', null);
@@ -154,7 +160,7 @@ public function save($key = null, $urlVar = null)
 	 */
 	public function getAutoSuggestUsers()
 	{
-		$jinput = JFactory::getApplication()->input;
+		$jinput = Factory::getApplication()->input;
 		$userId = $jinput->get('user_id', '', 'int');
 
 		// Get the model.
diff --git a/administrator/controllers/hierarchys.php b/administrator/controllers/hierarchys.php
index 364d59f..81f3061 100755
--- a/administrator/controllers/hierarchys.php
+++ b/administrator/controllers/hierarchys.php
@@ -9,16 +9,18 @@
 
 // No direct access.
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.controlleradmin');
-jimport('joomla.filesystem.file');
+use Joomla\CMS\MVC\Controller\AdminController;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Filesystem\File;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
 
 /**
  * The Hierarchys List Controller
  *
  * @since  1.6
  */
-class HierarchyControllerHierarchys extends JControllerAdmin
+class HierarchyControllerHierarchys extends AdminController
 {
 	/**
 	 * Proxy for getModel
@@ -47,23 +49,22 @@ public function getModel($name = 'hierarchy', $prefix = 'HierarchyModel', $confi
 	 */
 	public function csvImport()
 	{
-		jimport('joomla.filesystem.file');
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 
 		// Start file heandling functionality
 		$fname       = $_FILES['csvfile']['name'];
 		$rowNum      = 0;
-		$uploadsDir = JFactory::getApplication()->getCfg('tmp_path') . '/' . $fname;
-		JFile::upload($_FILES['csvfile']['tmp_name'], $uploadsDir);
+		$uploadsDir = Factory::getApplication()->get('tmp_path') . '/' . $fname;
+		File::upload($_FILES['csvfile']['tmp_name'], $uploadsDir);
 
 		if ($file = fopen($uploadsDir, "r"))
 		{
-			$ext = JFile::getExt($uploadsDir);
+			$ext = File::getExt($uploadsDir);
 
 			if ($ext != 'csv')
 			{
-				$app->enqueueMessage(JText::_('COM_HIERARCHY_CSV_FORMAT_ERROR'), 'Message');
-				$app->redirect(JRoute::_('index.php?option=com_hierarchy&view=hierarchys', false));
+				$app->enqueueMessage(Text::_('COM_HIERARCHY_CSV_FORMAT_ERROR'), 'Message');
+				$app->redirect(Route::_('index.php?option=com_hierarchy&view=hierarchys', false));
 
 				return;
 			}
@@ -100,14 +101,14 @@ public function csvImport()
 		}
 		else
 		{
-			$app->enqueueMessage(JText::_('COM_HIERARCHY_IMPORT_CSV_ERROR'), 'error');
-			$app->redirect(JRoute::_('index.php?option=com_hierarchy&view=hierarchys', false));
+			$app->enqueueMessage(Text::_('COM_HIERARCHY_IMPORT_CSV_ERROR'), 'error');
+			$app->redirect(Route::_('index.php?option=com_hierarchy&view=hierarchys', false));
 
 			return;
 		}
 
 		$model = $this->getModel();
-		$userID = JFactory::getUser()->id;
+		$userID = Factory::getUser()->id;
 
 		$data = array();
 
@@ -123,8 +124,10 @@ public function csvImport()
 			$result = $model->save($data);
 		}
 
-		$msg = JText::_('COM_HIERARCHY_IMPORT_CSV_SUCCESS_MSG');
-		$app->redirect(JRoute::_('index.php?option=com_hierarchy&view=hierarchys', false), $msg);
+		$msg = Text::_('COM_HIERARCHY_IMPORT_CSV_SUCCESS_MSG');
+
+ 		$app->enqueueMessage($msg, 'success');
+		$app->redirect(Route::_('index.php?option=com_hierarchy&view=hierarchys', false));
 
 		return;
 	}
@@ -140,7 +143,7 @@ public function csvImport()
 	 */
 	public function getUserId($email)
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true)
 			->select($db->quoteName('id'))
 			->from($db->quoteName('#__users'))
@@ -160,7 +163,7 @@ public function getUserId($email)
 	public function remove()
 	{
 		$model = $this->getModel();
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$post  = $input->post;
 		$userIds = $post->get('cid', '', 'ARRAY');
 
@@ -181,11 +184,11 @@ public function remove()
 
 		if ($model->delete($hierarchyIds))
 		{
-			$msg = JText::_('COM_HIERARCHY_HIERARCHY_DELETED_SCUSS');
+			$msg = Text::_('COM_HIERARCHY_HIERARCHY_DELETED_SCUSS');
 		}
 		else
 		{
-			$msg = JText::_('COM_HIERARCHY_HIERARCHY_DELETED_ERROR');
+			$msg = Text::_('COM_HIERARCHY_HIERARCHY_DELETED_ERROR');
 		}
 
 		$this->setRedirect("index.php?option=com_hierarchy&view=hierarchys", $msg);
diff --git a/administrator/helpers/hierarchy.php b/administrator/helpers/hierarchy.php
index ced585a..05fdaad 100755
--- a/administrator/helpers/hierarchy.php
+++ b/administrator/helpers/hierarchy.php
@@ -9,6 +9,10 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Object\CMSObject;
 
 /**
  * Hierarchys helper.
@@ -28,9 +32,12 @@ class HierarchyHelper
 	 */
 	public static function addSubmenu($vName = '')
 	{
-		JHtmlSidebar::addEntry(JText::_('COM_HIERARCHY_TITLE_HIERARCHYS'), 'index.php?option=com_hierarchy&view=hierarchys', $vName == 'hierarchys');
+		if (JVERSION < '4.0.0')
+		{
+			JHtmlSidebar::addEntry(Text::_('COM_HIERARCHY_TITLE_HIERARCHYS'), 'index.php?option=com_hierarchy&view=hierarchys', $vName == 'hierarchys');
+		}
 	}
-
+	
 	/**
 	 * Gets a list of the actions that can be performed.
 	 *
@@ -41,8 +48,8 @@ public static function addSubmenu($vName = '')
 	 */
 	public static function getActions()
 	{
-		$user = JFactory::getUser();
-		$result = new JObject;
+		$user = Factory::getUser();
+		$result = new CMSObject;
 
 		$assetName = 'com_hierarchy';
 
@@ -65,8 +72,8 @@ public static function getActions()
 	 */
 	public static function getLanguageConstant()
 	{
-		JText::script('JGLOBAL_VALIDATION_FORM_FAILED');
-		JText::script('COM_HIERARCHY_HIERARCHY_DELETE_CONF');
-		JText::script('COM_HIERARCHY_USERNAMES_DESC');
+		Text::script('JGLOBAL_VALIDATION_FORM_FAILED');
+		Text::script('COM_HIERARCHY_HIERARCHY_DELETE_CONF');
+		Text::script('COM_HIERARCHY_USERNAMES_DESC');
 	}
 }
diff --git a/administrator/hierarchy.php b/administrator/hierarchy.php
index 1c0e4cf..c10d076 100755
--- a/administrator/hierarchy.php
+++ b/administrator/hierarchy.php
@@ -9,20 +9,25 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\MVC\Controller\BaseController;
 
 // Access check.
-if (!JFactory::getUser()->authorise('core.manage', 'com_hierarchy'))
+if (!Factory::getUser()->authorise('core.manage', 'com_hierarchy'))
 {
-	throw new Exception(JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new Exception(Text::_('JERROR_ALERTNOAUTHOR'));
 }
 
 // Include dependancies
 jimport('joomla.application.component.controller');
 
 // Initialize hierarchy js
-$document = JFactory::getDocument();
-$document->addScript(JUri::root(true) . '/media/com_hierarchy/js/hierarchy.js');
+$document = Factory::getDocument();
+HTMLHelper::_('script', '/media/com_hierarchy/js/hierarchy.js');
 
-$controller = JControllerLegacy::getInstance('Hierarchy');
-$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller = BaseController::getInstance('Hierarchy');
+$controller->execute(Factory::getApplication()->input->get('task'));
 $controller->redirect();
diff --git a/administrator/language/en-GB/en-GB.com_hierarchy.ini b/administrator/language/en-GB/en-GB.com_hierarchy.ini
index b12b03b..ab7e0a6 100755
--- a/administrator/language/en-GB/en-GB.com_hierarchy.ini
+++ b/administrator/language/en-GB/en-GB.com_hierarchy.ini
@@ -62,7 +62,7 @@ COM_HIERARCHY_IMPORT_CATEGORY_SUCCESSFULY="Successfully import categoryies."
 COM_HIERARCHY_IMPORT_SUBUSERS_CSV_DATA_WRONG="Please check CSV file, Data format is wrong."
 COM_HIERARCHY_HIERARCHYS_REPORT_TO="Reports to"
 CSV_EXPORT="Export CSV"
-COM_HIERARCHY_USERS_CSV_SELECT_FILE="Select CSV File"
+COM_HIERARCHY_USERS_CSV_SELECT_FILE="Select the CSV File"
 COM_HIERARCHY_USERS_BROWSE="Browse"
 COM_HIERARCHY_CSVHELP="Note: To import users from a CSV file, make sure you enter your data in the given CSV %s"
 COM_HIERARCHY_CSV_SAMPLE="Format"
@@ -123,7 +123,7 @@ COM_HIERARCHY_GRAVATAR_INT_CONF="Fetch user profile pic from http://en.gravatar.
 COM_HIERARCHY_GRAVATAR_INT_CONF_DESC="If you enable this option then user profile pic will be taken from http://en.gravatar.com/, where most of the users profile pics available. This configuration is useful only while integration with the only Joomla."
 COM_HIERARCHY_INVALID_USER="Enter a valid user id"
 COM_HIERARCHY_INVALID_REPORTS_TO="Enter a valid reports to."
-COM_HIERARCHY_SAVE_MSG="Hierarchy save successfully."
+COM_HIERARCHY_SAVE_MSG="Hierarchy saved successfully."
 COM_HIERARCHY_FAIL_MSG="Failed to save hierarchy."
 COM_HIERARCHY_IMPORT_CSV_SUCCESS_MSG="Hierarchy imported successfully"
 COM_HIERARCHY_SET_MANAGER="Set"
diff --git a/administrator/models/fields/contextlist.php b/administrator/models/fields/contextlist.php
index 3de1105..6c04a2b 100644
--- a/administrator/models/fields/contextlist.php
+++ b/administrator/models/fields/contextlist.php
@@ -9,6 +9,10 @@
 
 // No direct access.
 defined('_JEXEC') or die();
+use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper;
 
 JFormHelper::loadFieldClass('list');
 
@@ -44,7 +48,7 @@ class JFormFieldContextList extends JFormFieldList
 	 */
 	protected function getOptions()
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 
 		// Select the required fields from the table.
@@ -57,14 +61,14 @@ protected function getOptions()
 		$contextList = $db->loadObjectList();
 
 		$options = array();
-		$options[] = JHtml::_('select.option', '0', JText::_('COM_HIERARCHY_SELECT_CONTEXT'));
+		$options[] = HTMLHelper::_('select.option', '0', Text::_('COM_HIERARCHY_SELECT_CONTEXT'));
 
 		if (!empty($contextList))
 		{
 			foreach ($contextList as $context)
 			{
 				$context   = $context->context;
-				$options[] = JHtml::_('select.option', $context, $context);
+				$options[] = HTMLHelper::_('select.option', $context, $context);
 			}
 		}
 
diff --git a/administrator/models/fields/users.php b/administrator/models/fields/users.php
index 4deb8b2..e408943 100644
--- a/administrator/models/fields/users.php
+++ b/administrator/models/fields/users.php
@@ -9,6 +9,10 @@
 
 // No direct access.
 defined('_JEXEC') or die();
+use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\UserField;
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
 
 JFormHelper::loadFieldClass('list');
 
@@ -44,7 +48,7 @@ class JFormFieldUsers extends JFormFieldList
 	 */
 	protected function getOptions()
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 
 		// Select the required fields from the table.
@@ -61,7 +65,7 @@ protected function getOptions()
 
 		foreach ($allUsers as $u)
 		{
-			$options[] = JHtml::_('select.option', $u->id, $u->name);
+			$options[] = HTMLHelper::_('select.option', $u->id, $u->name);
 		}
 
 		if (!$this->loadExternally)
diff --git a/administrator/models/hierarchy.php b/administrator/models/hierarchy.php
index e478383..e04fe16 100755
--- a/administrator/models/hierarchy.php
+++ b/administrator/models/hierarchy.php
@@ -9,16 +9,18 @@
 
 // No direct access.
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.modeladmin');
-jimport('joomla.database.table');
+use Joomla\CMS\MVC\Model\AdminModel;
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Plugin\PluginHelper;
 
 /**
  * Methods supporting a list of Hierarchy records.
  *
  * @since  1.6
  */
-class HierarchyModelHierarchy extends JModelAdmin
+class HierarchyModelHierarchy extends AdminModel
 {
 	/**
 	 * @var string The prefix to use with controller messages.
@@ -38,9 +40,9 @@ class HierarchyModelHierarchy extends JModelAdmin
 	 */
 	public function getTable($type = 'hierarchy', $prefix = 'HierarchyTable', $config = array())
 	{
-		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_hierarchy/tables');
+		Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_hierarchy/tables');
 
-		return JTable::getInstance($type, $prefix, $config);
+		return Table::getInstance($type, $prefix, $config);
 	}
 
 	/**
@@ -56,7 +58,7 @@ public function getTable($type = 'hierarchy', $prefix = 'HierarchyTable', $confi
 	public function getForm($data = array(), $loadData = true)
 	{
 		// Initialise variables.
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 
 		// Get the form.
 		$form = $this->loadForm('com_hierarchy.hierarchy', 'hierarchy', array('control' => 'jform', 'load_data' => $loadData));
@@ -79,7 +81,7 @@ public function getForm($data = array(), $loadData = true)
 	protected function loadFormData()
 	{
 		// Check the session for previously entered form data.
-		$data = JFactory::getApplication()->getUserState('com_hierarchy.edit.hierarchy.data', array());
+		$data = Factory::getApplication()->getUserState('com_hierarchy.edit.hierarchy.data', array());
 
 		if (empty($data))
 		{
@@ -101,7 +103,7 @@ public function getItem($pk = null)
 		$item = parent::getItem($pk);
 
 		// Get client and client_id from URL
-		$jinput = JFactory::getApplication()->input;
+		$jinput = Factory::getApplication()->input;
 
 		if (empty($item->context) && $jinput->get('client'))
 		{
@@ -142,7 +144,7 @@ public function save($data)
 		// Validate if user_id is not specified
 		if (!$data['user_id'] || !$data['reports_to'])
 		{
-			$this->setError(JText::_('COM_HIERARCHY_INVALID_USER'));
+			$this->setError(Text::_('COM_HIERARCHY_INVALID_USER'));
 
 			return false;
 		}
@@ -155,7 +157,7 @@ public function save($data)
 		// Check hierarchy is already exist or not.
 		$hierarchyId = $this->checkIfHierarchyExist($data);
 
-		$date = JFactory::getDate();
+		$date = Factory::getDate();
 
 		if ($hierarchyId)
 		{
@@ -172,25 +174,23 @@ public function save($data)
 		$isNew = empty($data['id']) ? true : false;
 
 		// On before assigning manager
-		$dispatcher = JDispatcher::getInstance();
-		JPluginHelper::importPlugin("system");
-		JPluginHelper::importPlugin("actionlog");
-		$dispatcher->trigger("hierarchyOnBeforeSaveHierarchy", array($data, $isNew));
+		PluginHelper::importPlugin("system");
+		PluginHelper::importPlugin("actionlog");
+		Factory::getApplication()->triggerEvent("onBeforeHierarchySaveHierarchy", array($data, $isNew));
 
 		if (parent::save($data))
 		{
 			$id = (int) $this->getState($this->getName() . '.id');
 
 			// On after assigning manager
-			$dispatcher = JDispatcher::getInstance();
-			JPluginHelper::importPlugin("system");
-			JPluginHelper::importPlugin("actionlog");
-			$dispatcher->trigger("hierarchyOnAfterSaveHierarchy", array($data, $isNew));
+			PluginHelper::importPlugin("system");
+			PluginHelper::importPlugin("actionlog");
+			Factory::getApplication()->triggerEvent("onAfterHierarchySaveHierarchy", array($data, $isNew));
 
 			return $id;
 		}
 
-		$this->setError(JText::_('COM_HIERARCHY_SAVE_FAIL'));
+		$this->setError(Text::_('COM_HIERARCHY_SAVE_FAIL'));
 
 		return false;
 	}
@@ -233,16 +233,16 @@ public function checkIfHierarchyExist($data)
 	 */
 	public function getSubUsers($id, $onlyIds = false)
 	{
-		$user = JFactory::getuser($id);
+		$user = Factory::getuser($id);
 
 		if (!$user->id)
 		{
-			$this->setError(JText::_("COM_HIERARCHY_INVALID_USER"));
+			$this->setError(Text::_("COM_HIERARCHY_INVALID_USER"));
 
 			return false;
 		}
 
-		$db = JFactory::getDBO();
+		$db = Factory::getDBO();
 		$query = $db->getQuery(true);
 
 		if ($onlyIds)
@@ -284,16 +284,16 @@ public function getSubUsers($id, $onlyIds = false)
 	 */
 	public function getManagers($id)
 	{
-		$user = JFactory::getuser($id);
+		$user = Factory::getuser($id);
 
 		if (!$user->id)
 		{
-			$this->setError(JText::_("COM_HIERARCHY_INVALID_USER"));
+			$this->setError(Text::_("COM_HIERARCHY_INVALID_USER"));
 
 			return false;
 		}
 
-		$db = JFactory::getDBO();
+		$db = Factory::getDBO();
 		$query = $db->getQuery(true);
 		$query->select('*');
 		$query->from($db->quoteName('#__hierarchy_users'));
@@ -318,16 +318,16 @@ public function getManagers($id)
 	 */
 	public function getReportsTo($reportsTo)
 	{
-		$user = JFactory::getuser($reportsTo);
+		$user = Factory::getuser($reportsTo);
 
 		if (!$user->id)
 		{
-			$this->setError(JText::_("COM_HIERARCHY_INVALID_USER"));
+			$this->setError(Text::_("COM_HIERARCHY_INVALID_USER"));
 
 			return false;
 		}
 
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select($db->quoteName(array('hu.id', 'user_id','reports_to','name','username','email')));
 		$query->from($db->quoteName('#__hierarchy_users', 'hu'));
@@ -350,12 +350,12 @@ public function getReportsTo($reportsTo)
 	 */
 	public function getAutoSuggestUsers($userId)
 	{
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 
 		// Get search term
 		$searchTerm = $app->input->get('search', '', 'STRING');
 
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 
 		// Select the required fields from the table.
@@ -387,33 +387,31 @@ public function getAutoSuggestUsers($userId)
 	 */
 	public function delete(&$pks)
 	{
-		$user = JFactory::getUser();
-		$db   = JFactory::getDbo();
+		$user = Factory::getUser();
+		$db   = Factory::getDbo();
 
-		JTable::addIncludePath(JPATH_ROOT . '/administrator/components/com_hierarchy/tables');
+		Table::addIncludePath(JPATH_ROOT . '/administrator/components/com_hierarchy/tables');
 
 		if (is_array($pks))
 		{
 			foreach ($pks as $id)
 			{
-				$hierarchyTable = JTable::getInstance('Hierarchy', 'HierarchyTable', array('dbo', $db));
+				$hierarchyTable = Table::getInstance('Hierarchy', 'HierarchyTable', array('dbo', $db));
 				$hierarchyTable->load(array('id' => $id));
 
 				$data = $hierarchyTable->getProperties();
 
 				// On before removing manager
-				JPluginHelper::importPlugin("system");
-				JPluginHelper::importPlugin("actionlog");
-				$dispatcher = JDispatcher::getInstance();
-				$dispatcher->trigger("hierarchyOnBeforeDeleteHierarchy", array($data));
+				PluginHelper::importPlugin("system");
+				PluginHelper::importPlugin("actionlog");
+				Factory::getApplication()->triggerEvent("onBeforeHierarchyDeleteHierarchy", array($data));
 
 				if ($hierarchyTable->delete($data['id']))
 				{
 					// On after removing manager
-					JPluginHelper::importPlugin("system");
-					JPluginHelper::importPlugin("actionlog");
-					$dispatcher = JDispatcher::getInstance();
-					$dispatcher->trigger("hierarchyOnAfterDeleteHierarchy", array($data));
+					PluginHelper::importPlugin("system");
+					PluginHelper::importPlugin("actionlog");
+					Factory::getApplication()->triggerEvent("onAfterHierarchyDeleteHierarchy", array($data));
 				}
 				else
 				{
@@ -423,24 +421,22 @@ public function delete(&$pks)
 		}
 		else
 		{
-			$hierarchyTable = JTable::getInstance('Hierarchy', 'HierarchyTable', array('dbo', $db));
+			$hierarchyTable = Table::getInstance('Hierarchy', 'HierarchyTable', array('dbo', $db));
 			$hierarchyTable->load(array('id' => $pks));
 
 			$data = $hierarchyTable->getProperties();
 
 			// On before removing manager
-			$dispatcher = JDispatcher::getInstance();
-			JPluginHelper::importPlugin("system");
-			JPluginHelper::importPlugin("actionlog");
-			$dispatcher->trigger("hierarchyOnBeforeDeleteHierarchy", array($data));
+			PluginHelper::importPlugin("system");
+			PluginHelper::importPlugin("actionlog");
+			Factory::getApplication()->triggerEvent("onBeforeHierarchyDeleteHierarchy", array($data));
 
 			if ($hierarchyTable->delete($data['id']))
 			{
 				// On after removing manager
-				$dispatcher = JDispatcher::getInstance();
-				JPluginHelper::importPlugin("system");
-				JPluginHelper::importPlugin("actionlog");
-				$dispatcher->trigger("hierarchyOnAfterDeleteHierarchy", array($data));
+				PluginHelper::importPlugin("system");
+				PluginHelper::importPlugin("actionlog");
+				Factory::getApplication()->triggerEvent("onAfterHierarchyDeleteHierarchy", array($data));
 			}
 			else
 			{
diff --git a/administrator/models/hierarchys.php b/administrator/models/hierarchys.php
index e3e38fb..29181d9 100644
--- a/administrator/models/hierarchys.php
+++ b/administrator/models/hierarchys.php
@@ -8,15 +8,17 @@
  */
 
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.modellist');
+use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
 
 /**
  * Methods supporting a list of Hierarchy records.
  *
  * @since  1.6
  */
-class HierarchyModelHierarchys extends JModelList
+class HierarchyModelHierarchys extends ListModel
 {
 	/**
 	 * Constructor.
@@ -37,8 +39,8 @@ public function __construct($config = array())
 			);
 		}
 
-		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_hierarchy/models');
-		$this->hierarchyModel = JModelLegacy::getInstance('Hierarchy', 'HierarchyModel');
+		BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_hierarchy/models');
+		$this->hierarchyModel = BaseDatabaseModel::getInstance('Hierarchy', 'HierarchyModel');
 
 		parent::__construct($config);
 	}
@@ -58,7 +60,7 @@ public function __construct($config = array())
 	protected function populateState($ordering = null, $direction = null)
 	{
 		// Initialise variables.
-		$app = JFactory::getApplication('administrator');
+		$app = Factory::getApplication('administrator');
 
 		// Load the filter state.
 		$search = $app->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
@@ -71,7 +73,7 @@ protected function populateState($ordering = null, $direction = null)
 		$this->setState('filter.context', $contextName);
 
 		// Load the parameters.
-		$params = JComponentHelper::getParams('com_hierarchy');
+		$params = ComponentHelper::getParams('com_hierarchy');
 		$this->setState('params', $params);
 
 		// List state information.
diff --git a/administrator/sql/install.mysql.utf8.sql b/administrator/sql/install.mysql.utf8.sql
index 5cb47c9..e8ba576 100755
--- a/administrator/sql/install.mysql.utf8.sql
+++ b/administrator/sql/install.mysql.utf8.sql
@@ -4,15 +4,15 @@
 --
 CREATE TABLE IF NOT EXISTS `#__hierarchy_users` (
 `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-`user_id` INT(11)  NOT NULL COMMENT 'This field is to store user id of user',
-`reports_to` INT(11)  NOT NULL COMMENT 'This field is to select to whom all current user reports to',
-`context` VARCHAR(255)  NOT NULL ,
-`context_id` INT(11)  NOT NULL,
-`created_by` INT(11)  NOT NULL,
-`modified_by` INT(11)  NOT NULL,
-`created_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-`modified_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-`state` INT(11)  NOT NULL,
-`note` TEXT NOT NULL,
+`user_id` INT(11) NOT NULL COMMENT 'This field is to store user id of user' DEFAULT 0,
+`reports_to` INT(11) NOT NULL COMMENT 'This field is to select to whom all current user reports to' DEFAULT 0,
+`context` VARCHAR(255) NOT NULL DEFAULT '',
+`context_id` INT(11) NOT NULL DEFAULT 0,
+`created_by` INT(11) NOT NULL DEFAULT 0,
+`modified_by` INT(11) NOT NULL DEFAULT 0,
+`created_date` datetime DEFAULT NULL,
+`modified_date` datetime DEFAULT NULL,
+`state` INT(11) NOT NULL DEFAULT 0,
+`note` TEXT DEFAULT NULL,
 PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
diff --git a/administrator/sql/updates/mysql/1.1.2.sql b/administrator/sql/updates/mysql/1.1.2.sql
index 3f23ae8..150f82b 100755
--- a/administrator/sql/updates/mysql/1.1.2.sql
+++ b/administrator/sql/updates/mysql/1.1.2.sql
@@ -2,7 +2,5 @@
 ALTER TABLE `#__hierarchy_users` ENGINE = InnoDB;
 
 -- Change charset, collation
-ALTER TABLE `#__hierarchy_users` CHANGE `note` `note` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL;
-ALTER TABLE `#__hierarchy_users` CHANGE `context` `context` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL;
-
-
+ALTER TABLE `#__hierarchy_users` CHANGE `note` `note` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL;
+ALTER TABLE `#__hierarchy_users` CHANGE `context` `context` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
diff --git a/administrator/sql/updates/mysql/1.1.sql b/administrator/sql/updates/mysql/1.1.sql
index af95455..14622b4 100755
--- a/administrator/sql/updates/mysql/1.1.sql
+++ b/administrator/sql/updates/mysql/1.1.sql
@@ -4,25 +4,24 @@
 --
 CREATE TABLE IF NOT EXISTS `#__hierarchy_users` (
 `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-`user_id` INT(11)  NOT NULL COMMENT 'This field is to store user id of user',
-`reports_to` INT(11)  NOT NULL COMMENT 'This field is to select to whom all current user reports to',
-`context` VARCHAR(255)  NOT NULL ,
-`context_id` INT(11)  NOT NULL,
-`created_by` INT(11)  NOT NULL,
-`modified_by` INT(11)  NOT NULL,
-`created_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-`modified_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-`state` INT(11)  NOT NULL,
-`note` TEXT NOT NULL,
+`user_id` INT(11) NOT NULL COMMENT 'This field is to store user id of user' DEFAULT 0,
+`reports_to` INT(11) NOT NULL COMMENT 'This field is to select to whom all current user reports to' DEFAULT 0,
+`context` VARCHAR(255) NOT NULL DEFAULT '',
+`context_id` INT(11) NOT NULL DEFAULT 0,
+`created_by` INT(11) NOT NULL DEFAULT 0,
+`modified_by` INT(11) NOT NULL DEFAULT 0,
+`created_date` datetime DEFAULT NULL,
+`modified_date` datetime DEFAULT NULL,
+`state` INT(11) NOT NULL DEFAULT 0,
+`note` TEXT DEFAULT NULL,
 PRIMARY KEY (`id`)
-) DEFAULT COLLATE=utf8_general_ci;
-
-ALTER TABLE `#__hierarchy_users` CHANGE `user_id` `reports_to`  INT(11);
-ALTER TABLE `#__hierarchy_users` CHANGE `subuser_id` `user_id` INT(11);
-ALTER TABLE `#__hierarchy_users` CHANGE `client` `context` varchar(255);
-ALTER TABLE `#__hierarchy_users` CHANGE `client_id` `context_id` varchar(255);
-ALTER TABLE `#__hierarchy_users` add column `created_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
-ALTER TABLE `#__hierarchy_users` add column `created_by` int(11) NULL DEFAULT '0' AFTER `created_date`;
-ALTER TABLE `#__hierarchy_users` add column `modified_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `created_by`;
-ALTER TABLE `#__hierarchy_users` add column `modified_by` int(11) NULL DEFAULT '0' AFTER `modified_date`;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
+ALTER TABLE `#__hierarchy_users` CHANGE `user_id` `reports_to` INT(11) NOT NULL COMMENT 'This field is to select to whom all current user reports to' DEFAULT 0;
+ALTER TABLE `#__hierarchy_users` CHANGE `subuser_id` `user_id` INT(11) NOT NULL COMMENT 'This field is to store user id of user' DEFAULT 0;
+ALTER TABLE `#__hierarchy_users` CHANGE `client` `context` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `#__hierarchy_users` CHANGE `client_id` `context_id` INT(11) NOT NULL DEFAULT 0;
+ALTER TABLE `#__hierarchy_users` add column `created_date` datetime DEFAULT NULL;
+ALTER TABLE `#__hierarchy_users` add column `created_by` INT(11) NOT NULL DEFAULT 0;
+ALTER TABLE `#__hierarchy_users` add column `modified_date` datetime DEFAULT NULL;
+ALTER TABLE `#__hierarchy_users` add column `modified_by` INT(11) NOT NULL DEFAULT 0;
diff --git a/administrator/sql/updates/mysql/2.0.0.sql b/administrator/sql/updates/mysql/2.0.0.sql
new file mode 100644
index 0000000..5402d57
--- /dev/null
+++ b/administrator/sql/updates/mysql/2.0.0.sql
@@ -0,0 +1,10 @@
+-- Adding default value for all the columns
+
+ALTER TABLE `#__hierarchy_users` CHANGE `context` `context` VARCHAR(255)  NOT NULL DEFAULT '';
+ALTER TABLE `#__hierarchy_users` CHANGE `context_id` `context_id` INT(11)  NOT NULL DEFAULT 0;
+ALTER TABLE `#__hierarchy_users` CHANGE `created_by` `created_by` INT(11)  NOT NULL DEFAULT 0;
+ALTER TABLE `#__hierarchy_users` CHANGE `modified_by` `modified_by` INT(11)  NOT NULL DEFAULT 0;
+ALTER TABLE `#__hierarchy_users` CHANGE `created_date` `created_date` datetime DEFAULT NULL;
+ALTER TABLE `#__hierarchy_users` CHANGE `modified_date` `modified_date` datetime DEFAULT NULL;
+ALTER TABLE `#__hierarchy_users` CHANGE `state` `state` INT(11) NOT NULL DEFAULT 0;
+ALTER TABLE `#__hierarchy_users` CHANGE `note` `note` TEXT DEFAULT NULL;
diff --git a/administrator/tables/hierarchy.php b/administrator/tables/hierarchy.php
index e866302..0c2aae9 100644
--- a/administrator/tables/hierarchy.php
+++ b/administrator/tables/hierarchy.php
@@ -9,13 +9,14 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Table\Table;
 
 /**
  * hierarchy Table class
  * 
  * @since  1.0.4
  */
-class HierarchyTableHierarchy extends JTable
+class HierarchyTableHierarchy extends Table
 {
 	/**
 	 * Constructor
diff --git a/administrator/views/hierarchy/tmpl/edit.php b/administrator/views/hierarchy/tmpl/edit.php
index 2223e7d..0e356c1 100755
--- a/administrator/views/hierarchy/tmpl/edit.php
+++ b/administrator/views/hierarchy/tmpl/edit.php
@@ -9,24 +9,28 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\Router\Route;
 
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
-JHtml::_('behavior.keepalive');
-$input   = JFactory::getApplication()->input;
+HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+HTMLHelper::_('behavior.tooltip');
+HTMLHelper::_('behavior.formvalidation');
+HTMLHelper::_('behavior.keepalive');
+$input   = Factory::getApplication()->input;
 $userId = $input->get('user_id', 0);
-$JUriRoot = JUri::root(true) . '/administrator/';
+$UriRoot = Uri::root(true) . '/administrator/';
 
 // Tokenize
-$document = JFactory::getDocument();
-$document->addScript(JUri::root(true) . '/media/com_hierarchy/vendors/tokenize/jquery.tokenize.js');
-$document->addStylesheet(JUri::root(true) . '/media/com_hierarchy/vendors/tokenize/jquery.tokenize.css');
+$document = Factory::getDocument();
+HTMLHelper::_('script', '/media/com_hierarchy/vendors/tokenize/jquery.tokenize.js');
+HTMLHelper::_('stylesheet','/media/com_hierarchy/vendors/tokenize/jquery.tokenize.css');
 
 // Call helper function
 HierarchyHelper::getLanguageConstant();
 ?>
-<form action="<?php echo JRoute::_('index.php?option=com_hierarchy&layout=edit&id=' . (int) $this->item->id); ?>" method="post" enctype="multipart/form-data" name="adminForm" id="hierarchy-form" class="form-validate">
+<form action="<?php echo Route::_('index.php?option=com_hierarchy&layout=edit&id=' . (int) $this->item->id); ?>" method="post" enctype="multipart/form-data" name="adminForm" id="hierarchy-form" class="form-validate">
 	<div class="form-horizontal">
 		<div class="row-fluid">
 			<div class="span10 form-horizontal">
@@ -40,16 +44,16 @@
 				</fieldset>
 			</div>
 		</div>
-		<?php echo JHtml::_('bootstrap.endTab');?>
+		<?php echo HTMLHelper::_('bootstrap.endTab');?>
 		<input type="hidden" name="task" value="" />
 		<input type="hidden" id="user_id" name="user_id" value="<?php  echo $userId; ?>">
 		<input type="hidden" id="created_by" name="created_by" value="<?php  echo $userId; ?>">
 		<input type="hidden" id="modified_by" name="modified_by" value="<?php  echo $userId; ?>">
-		<?php echo JHtml::_('form.token'); ?>
+		<?php echo HTMLHelper::_('form.token'); ?>
 	</div>
 </form>
 <script type="text/javascript">
-	var JUriRoot = "<?php echo $JUriRoot; ?>";
+	var UriRoot = "<?php echo $UriRoot; ?>";
 	var client = "<?php echo $this->client; ?>";
 	var userID = "<?php echo $userId; ?>";
 	var clientID = "<?php echo $this->clientID; ?>";
diff --git a/administrator/views/hierarchy/view.html.php b/administrator/views/hierarchy/view.html.php
index 10977da..14b555f 100755
--- a/administrator/views/hierarchy/view.html.php
+++ b/administrator/views/hierarchy/view.html.php
@@ -9,14 +9,17 @@
 
 // No direct access
 defined('_JEXEC') or die;
-jimport('joomla.application.component.view');
+use Joomla\CMS\MVC\View\HtmlView;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Toolbar\ToolbarHelper;
 
 /**
  * hierarchy View
  *
  * @since  0.0.1
  */
-class HierarchyViewHierarchy extends JViewLegacy
+class HierarchyViewHierarchy extends HtmlView
 {
 	protected $state;
 
@@ -37,7 +40,7 @@ public function display($tpl = null)
 		$this->item  = $this->get('Item');
 		$this->form  = $this->get('Form');
 
-		$jinput = JFactory::getApplication()->input;
+		$jinput = Factory::getApplication()->input;
 
 		$this->client = $jinput->get('client');
 		$this->clientID = $jinput->get('client_id');
@@ -61,8 +64,8 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		JFactory::getApplication()->input->set('hidemainmenu', true);
-		$user  = JFactory::getUser();
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user  = Factory::getUser();
 		$isNew = ($this->item->id == 0);
 
 		if (isset($this->item->checked_out))
@@ -75,12 +78,12 @@ protected function addToolbar()
 		}
 
 		$canDo = HierarchyHelper::getActions();
-		JToolBarHelper::title(JText::_('COM_HIERARCHY_TITLE_HIERARCHY'), 'pencil-2');
+		ToolbarHelper::title(Text::_('COM_HIERARCHY_TITLE_HIERARCHY'), 'pencil-2');
 
 		// If not checked out, can save the item.
 		if (!$checkedOut && ($canDo->get('core.edit') || ($canDo->get('core.create'))))
 		{
-			JToolBarHelper::apply('hierarchy.apply', 'JTOOLBAR_APPLY');
+			ToolbarHelper::apply('hierarchy.apply', 'JTOOLBAR_APPLY');
 		}
 	}
 }
diff --git a/administrator/views/hierarchys/tmpl/default.php b/administrator/views/hierarchys/tmpl/default.php
index 0b1eaab..4c588e3 100755
--- a/administrator/views/hierarchys/tmpl/default.php
+++ b/administrator/views/hierarchys/tmpl/default.php
@@ -9,17 +9,31 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Uri\Uri;
 
-JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('bootstrap.tooltip');
-JHtml::_('behavior.multiselect');
-JHTML::_('behavior.modal', 'a.modal');
-JHtml::_('behavior.keepalive');
+HTMLHelper::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+HTMLHelper::_('bootstrap.tooltip');
+HTMLHelper::_('behavior.multiselect');
+HTMLHelper::_('behavior.keepalive');
+
+if (JVERSION < '4.0.0')
+{
+	HTMLHelper::_('behavior.modal', 'a.modal');
+}
+else
+{
+	HTMLHelper::_('bootstrap.renderModal', 'a.modal');
+}
 
 // Import CSS
-JHtml::_('script', 'jui/fielduser.min.js', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('script', 'jui/fielduser.min.js', array('version' => 'auto', 'relative' => true));
 
-$user      = JFactory::getUser();
+$user      = Factory::getUser();
 $userId    = $user->get('id');
 $listOrder = $this->state->get('list.ordering');
 $listDirn  = $this->state->get('list.direction');
@@ -29,7 +43,7 @@
 if ($saveOrder)
 {
 	$saveOrderingUrl = 'index.php?option=com_hierarchy&task=hierarchys.saveOrderAjax&tmpl=component';
-	JHtml::_('sortablelist.sortable', 'hierarchyList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+	HTMLHelper::_('sortablelist.sortable', 'hierarchyList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
 }
 
 $sortFields = $this->getSortFields();
@@ -37,7 +51,7 @@
 // Call helper function
 HierarchyHelper::getLanguageConstant();
 ?>
-<form action="<?php echo JRoute::_('index.php?option=com_hierarchy&view=hierarchys'); ?>" method="post" name="adminForm" id="adminForm">
+<form action="<?php echo Route::_('index.php?option=com_hierarchy&view=hierarchys'); ?>" method="post" name="adminForm" id="adminForm">
 <?php
 	if(!empty($this->sidebar)):
 		?>
@@ -53,14 +67,14 @@
 	endif;
 
 	// Search tools bar
-	echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
 	?>
 	<div class="clearfix"> </div>
 	<?php
 		if (empty($this->items)) :
 			?>
 			<div class="alert alert-no-items">
-				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 			<?php
 		else :
@@ -69,22 +83,22 @@
 			<thead>
 				<tr>
 					<th width="1%">
-						<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+						<input type="checkbox" name="checkall-toggle" value="" title="<?php echo Text::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
 					</th>
 					<th class='left'>
-						<?php echo JHtml::_('grid.sort',  'COM_HIERARCHY_HIERARCHYS_USER_NAME', 'a.name', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort',  'COM_HIERARCHY_HIERARCHYS_USER_NAME', 'a.name', $listDirn, $listOrder); ?>
 					</th>
 					<th class='left'>
-						<?php echo JText::_('COM_HIERARCHY_CONTEXT'); ?>
+						<?php echo Text::_('COM_HIERARCHY_CONTEXT'); ?>
 					</th>
 					<th class='left'>
-						<?php echo JText::_('COM_HIERARCHY_CONTEXT_ID'); ?>
+						<?php echo Text::_('COM_HIERARCHY_CONTEXT_ID'); ?>
 					</th>
 					<th class='left'>
-						<?php echo JText::_('COM_HIERARCHY_HIERARCHYS_REPORT_TO'); ?>
+						<?php echo Text::_('COM_HIERARCHY_HIERARCHYS_REPORT_TO'); ?>
 					</th>
 					<th class='right'>
-						<?php echo JHtml::_('grid.sort',  'COM_HIERARCHY_HIERARCHYS_USER_ID', 'a.id', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort',  'COM_HIERARCHY_HIERARCHYS_USER_ID', 'a.id', $listDirn, $listOrder); ?>
 					</th>
 				</tr>
 			</thead>
@@ -112,7 +126,7 @@
 
 					?>
 					<tr class="row<?php echo $i % 2; ?> reports_to">
-						<td class='center'><?php echo JHtml::_('grid.id', $i, $item->subuserId); ?></td>
+						<td class='center'><?php echo HTMLHelper::_('grid.id', $i, $item->subuserId); ?></td>
 						<td><?php  echo $item->name; ?></td>
 						<td>
 						<?php
@@ -135,11 +149,11 @@
 								}
 
 								if ($this->canEdit) :
-									$url = JRoute::_('index.php?option=com_hierarchy&view=hierarchy&layout=edit&id='.(int) $item->id . '&user_id=' .(int) $item->subuserId . $clientUrl);
-									$text = JText::_('COM_HIERARCHY_SET_MANAGER');
+									$url = Route::_('index.php?option=com_hierarchy&view=hierarchy&layout=edit&id='.(int) $item->id . '&user_id=' .(int) $item->subuserId . $clientUrl);
+									$text = Text::_('COM_HIERARCHY_SET_MANAGER');
 								else :
-									$url = JRoute::_('index.php?option=com_hierarchy&view=hierarchy&layout=edit&user_id=' . (int) $item->subuserId . $clientUrl);
-									$text = JText::_('COM_HIERARCHY_SET_MANAGER');
+									$url = Route::_('index.php?option=com_hierarchy&view=hierarchy&layout=edit&user_id=' . (int) $item->subuserId . $clientUrl);
+									$text = Text::_('COM_HIERARCHY_SET_MANAGER');
 								endif;
 							?>
 							<a href="<?php echo $url;?>" class="btn button btn-success modal" rel="{handler: 'iframe', size: {x: 800, y: 500}}">
@@ -169,31 +183,31 @@
 		<input type="hidden" name="boxchecked" value="0" />
 		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
 		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
-		<?php echo JHtml::_('form.token'); ?>
+		<?php echo HTMLHelper::_('form.token'); ?>
 	</div>
 </form>
 <div style="display:none">
 	<div id="import_append">
-		<form action="<?php echo JUri::base(); ?>index.php?option=com_hierarchy&task=hierarchys.csvImport&tmpl=component&format=html" id="uploadForm" class="form-inline center"  name="uploadForm" method="post" enctype="multipart/form-data">
+		<form action="<?php echo Uri::base(); ?>index.php?option=com_hierarchy&task=hierarchys.csvImport&tmpl=component&format=html" id="uploadForm" class="form-inline center"  name="uploadForm" method="post" enctype="multipart/form-data">
 			<table>
 				</br>
 				<tr>
 					<div id="uploadform">
 						<fieldset id="upload-noflash" class="actions">
 							<label for="upload-file" class="control-label">
-								<?php echo JText::_('COM_HIERARCHY_UPLOADE_FILE'); ?>
+								<?php echo Text::_('COM_HIERARCHY_UPLOADE_FILE'); ?>
 							</label>
 							<input type="file" id="upload-file" name="csvfile" id="csvfile" />
 							<button class="btn btn-primary" id="upload-submit">
 								<i class="icon-upload icon-white"></i>
-								<?php echo JText::_('COM_HIERARCHY_IMPORT_CSV'); ?>
+								<?php echo Text::_('COM_HIERARCHY_IMPORT_CSV'); ?>
 							</button>
 							<hr class="hr hr-condensed">
 							<div class="alert alert-warning" role="alert">
 								<i class="icon-info"></i>
 								<?php
-									$link = '<a href="' . JUri::root() . 'media/com_hierarchy/samplecsv/userImport.csv' . '">' . JText::_("COM_HIERARCHY_CSV_SAMPLE") . '</a>';
-									echo JText::sprintf('COM_HIERARCHY_CSVHELP', $link);
+									$link = '<a href="' . Uri::root() . 'media/com_hierarchy/samplecsv/userImport.csv' . '" download>' . Text::_("COM_HIERARCHY_CSV_SAMPLE") . '</a>';
+									echo Text::sprintf('COM_HIERARCHY_CSVHELP', $link);
 								?>
 							</div>
 						</fieldset>
diff --git a/administrator/views/hierarchys/view.csv.php b/administrator/views/hierarchys/view.csv.php
index 8a25b5c..e68cfdd 100644
--- a/administrator/views/hierarchys/view.csv.php
+++ b/administrator/views/hierarchys/view.csv.php
@@ -9,6 +9,9 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Language\Text;
 
 // Import CSV library view
 jimport('techjoomla.view.csv');
@@ -29,15 +32,18 @@ class HierarchyViewHierarchys extends TjExportCsv
 	 */
 	public function display($tpl = null)
 	{
-		$input = JFactory::getApplication()->input;
-		$user  = JFactory::getUser();
+		$app   = Factory::getApplication();
+		$input = $app->input;
+		$user  = Factory::getUser();
 		$userAuthorisedExport = $user->authorise('core.create', 'com_hierarchy');
 
 		if ($userAuthorisedExport != 1 || !$user)
 		{
 			// Redirect to the list screen.
-			$redirect = JRoute::_('index.php?option=com_hierarchy&view=hierarchys', false);
-			JFactory::getApplication()->redirect($redirect, JText::_('JERROR_ALERTNOAUTHOR'));
+			$redirect = Route::_('index.php?option=com_hierarchy&view=hierarchys', false);
+
+			$app->enqueueMessage(Text::_('JERROR_ALERTNOAUTHOR'), 'error');
+			$app->redirect($redirect);
 
 			return false;
 		}
@@ -47,7 +53,7 @@ public function display($tpl = null)
 			{
 				$fileName = $input->get('file_name');
 				$this->download($fileName);
-				JFactory::getApplication()->close();
+				$app->close();
 			}
 			else
 			{
diff --git a/administrator/views/hierarchys/view.html.php b/administrator/views/hierarchys/view.html.php
index 43709a0..fc68c9f 100755
--- a/administrator/views/hierarchys/view.html.php
+++ b/administrator/views/hierarchys/view.html.php
@@ -9,15 +9,18 @@
 
 // No direct access
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.view');
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\MVC\View\HtmlView;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Toolbar\ToolbarHelper;
 
 /**
  * View class for a list of Hierarchy.
  *
  * @since  1.6
  */
-class HierarchyViewHierarchys extends JViewLegacy
+class HierarchyViewHierarchys extends HtmlView
 {
 	protected $items;
 
@@ -34,7 +37,7 @@ class HierarchyViewHierarchys extends JViewLegacy
 	 */
 	public function display($tpl = null)
 	{
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		$this->state = $this->get('State');
 		$this->items = $this->get('Items');
 
@@ -64,7 +67,7 @@ public function display($tpl = null)
 		$this->activeFilters = $this->get('ActiveFilters');
 
 		// Fetch client and client ID from URL
-		$jinput = JFactory::getApplication()->input;
+		$jinput = Factory::getApplication()->input;
 		$this->client = $jinput->get('client');
 		$this->clientId = $jinput->get('client_id');
 
@@ -112,43 +115,43 @@ protected function addToolbar()
 		$canDo = HierarchyHelper::getActions($state->get('filter.category_id'));
 
 		$message = array();
-		$message['success'] = JText::_("COM_HIERARCHY_EXPORT_FILE_SUCCESS");
-		$message['error'] = JText::_("COM_HIERARCHY_EXPORT_FILE_ERROR");
-		$message['inprogress'] = JText::_("COM_HIERARCHY_EXPORT_FILE_NOTICE");
-		$message['btn-name'] = JText::_("COM_HIERARCHY_EXPORT_CSV");
+		$message['success'] = Text::_("COM_HIERARCHY_EXPORT_FILE_SUCCESS");
+		$message['error'] = Text::_("COM_HIERARCHY_EXPORT_FILE_ERROR");
+		$message['inprogress'] = Text::_("COM_HIERARCHY_EXPORT_FILE_NOTICE");
+		$message['btn-name'] = Text::_("COM_HIERARCHY_EXPORT_CSV");
 
 		if ($canDo->get('core.csv.export'))
 		{
 			$bar->appendButton('CsvExport',  $message);
 		}
 
-		JToolBarHelper::title(JText::_('COM_HIERARCHY_TITLE_HIERARCHYS'), 'list');
+		ToolbarHelper::title(Text::_('COM_HIERARCHY_TITLE_HIERARCHYS'), 'list');
 
 		// Check if the form exists before showing the add/edit buttons
 		$formPath = JPATH_COMPONENT_ADMINISTRATOR . '/views/hierarchy';
 
 		$bar = JToolBar::getInstance('toolbar');
 		$buttonImport = '<a href="#import_append" class="btn button modal" rel="{size: {x: 800, y: 200}, ajaxOptions: {method: &quot;get&quot;}}">
-		<span class="icon-upload icon-white"></span>' . JText::_('COM_HIERARCHY_IMPORT_CSV') . '</a>';
+		<span class="icon-upload icon-white"></span>' . Text::_('COM_HIERARCHY_IMPORT_CSV') . '</a>';
 
 		if ($canDo->get('core.csv.import'))
 		{
 			$bar->appendButton('Custom', $buttonImport);
 		}
 
-		JToolbarHelper::deleteList('', 'hierarchys.remove', 'JTOOLBAR_DELETE');
+		ToolbarHelper::deleteList('', 'hierarchys.remove', 'JTOOLBAR_DELETE');
 
 		if ($canDo->get('core.edit.state'))
 		{
 			if (isset($this->items[0]->checked_out))
 			{
-				JToolBarHelper::custom('hierarchys.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
+				ToolbarHelper::custom('hierarchys.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
 			}
 		}
 
 		if ($canDo->get('core.admin'))
 		{
-			JToolBarHelper::preferences('com_hierarchy');
+			ToolbarHelper::preferences('com_hierarchy');
 		}
 	}
 
@@ -162,9 +165,9 @@ protected function addToolbar()
 	protected function getSortFields()
 	{
 		return array(
-			'a.id' => JText::_('JGRID_HEADING_ID'),
-			'a.user_id' => JText::_('COM_HIERARCHY_HIERARCHYS_USER_ID'),
-			'a.subuser_id' => JText::_('COM_HIERARCHY_HIERARCHYS_SUBUSER_ID')
+			'a.id' => Text::_('JGRID_HEADING_ID'),
+			'a.user_id' => Text::_('COM_HIERARCHY_HIERARCHYS_USER_ID'),
+			'a.subuser_id' => Text::_('COM_HIERARCHY_HIERARCHYS_SUBUSER_ID')
 		);
 	}
 }
diff --git a/changelog.md b/changelog.md
index a09ac8c..30a0bbc 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,6 +6,11 @@
 - Feature Addition (+)
 - Improvement (^)
 
+## com_hierarchy v1.1.4
+
+##### ^ Improvements:
+- #173952 Adding default values to the Tables for Joomla 4 Compatibility
+
 ## com_hierarchy v1.1.3
 
 ##### - Bug Fixes:
diff --git a/hierarchy.xml b/hierarchy.xml
index f3e680b..dae8a8a 100644
--- a/hierarchy.xml
+++ b/hierarchy.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.0" method="upgrade">
     <name>com_hierarchy</name>
-    <creationDate>22nd Jul 2021</creationDate>
-    <copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
+    <creationDate>29th Apr 2022</creationDate>
+    <copyright>Copyright (C) 2016 - 2022 Techjoomla. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
     <author>Techjoomla</author>
     <authorEmail>extensions@techjoomla.com</authorEmail>
     <authorUrl>https://techjoomla.com</authorUrl>
-    <version>1.1.3</version>
+    <version>2.0.0</version>
     <description>This tool will let the admin set a ‘Reports to’ field for each user in the system. This will be updated en masse using a CSV</description>
 
     <install> <!-- Runs on install -->
diff --git a/media/js/hierarchy.js b/media/js/hierarchy.js
index e7414e8..95dc28e 100755
--- a/media/js/hierarchy.js
+++ b/media/js/hierarchy.js
@@ -32,7 +32,7 @@ var hierarchyAdmin =
 
 		getAutoSuggestUsers: function() {
 			/** Invite user field tokenfield **/
-			inviteTaskUrl = JUriRoot + 'index.php?option=com_hierarchy&task=hierarchy.getAutoSuggestUsers&user_id=' + userID;
+			inviteTaskUrl = UriRoot + 'index.php?option=com_hierarchy&task=hierarchy.getAutoSuggestUsers&user_id=' + userID;
 
 			jQuery('#jform_reports_to').tokenize({
 				placeholder: Joomla.JText._('COM_HIERARCHY_USERNAMES_DESC'),
@@ -76,7 +76,7 @@ var hierarchySite =
 		},
 
 		drillUpDrillDownList: function(userID) {
-			reportsUrl = JUriRoot + 'index.php?option=com_hierarchy&task=hierarchys.getReportsTo&user_id=' + userID;
+			reportsUrl = UriRoot + 'index.php?option=com_hierarchy&task=hierarchys.getReportsTo&user_id=' + userID;
 			jQuery.ajax({
 				type:'POST',
 				url:reportsUrl,
diff --git a/plugins/actionlog/hierarchy/hierarchy.php b/plugins/actionlog/hierarchy/hierarchy.php
index 354fed5..660bc9c 100644
--- a/plugins/actionlog/hierarchy/hierarchy.php
+++ b/plugins/actionlog/hierarchy/hierarchy.php
@@ -81,7 +81,7 @@ protected function addLog($messages, $messageLanguageKey, $context, $userId = nu
 	 *
 	 * @since   1.1.1
 	 */
-	public function hierarchyOnAfterSaveHierarchy($data, $isNew)
+	public function onAfterHierarchySaveHierarchy($data, $isNew)
 	{
 		if (!$this->params->get('logActionForAssigningManager', 1) || !$isNew)
 		{
@@ -120,7 +120,7 @@ public function hierarchyOnAfterSaveHierarchy($data, $isNew)
 	 *
 	 * @since   1.1.1
 	 */
-	public function hierarchyOnAfterDeleteHierarchy($data)
+	public function onAfterHierarchyDeleteHierarchy($data)
 	{
 		if (!$this->params->get('logActionForRemoveManager', 1) || empty($data['id']))
 		{
diff --git a/plugins/actionlog/hierarchy/hierarchy.xml b/plugins/actionlog/hierarchy/hierarchy.xml
index 0250c68..55346c6 100644
--- a/plugins/actionlog/hierarchy/hierarchy.xml
+++ b/plugins/actionlog/hierarchy/hierarchy.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="3.4" type="plugin" group="actionlog" method="upgrade">
 	<name>plg_actionlog_hierarchy</name>
-	<version>1.1.3</version>
-	<creationDate>22nd Jul 2021</creationDate>
+	<version>2.0.0</version>
+	<creationDate>29th Apr 2022</creationDate>
 	<author>Techjoomla</author>
 	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2016 - 2022 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<description>PLG_ACTIONLOG_HIERARCHY_XML_DESCRIPTION</description>
 	<files>
diff --git a/plugins/privacy/hierarchy/hierarchy.php b/plugins/privacy/hierarchy/hierarchy.php
index 013eafb..c24f887 100644
--- a/plugins/privacy/hierarchy/hierarchy.php
+++ b/plugins/privacy/hierarchy/hierarchy.php
@@ -10,11 +10,12 @@
 
 // No direct access.
 defined('_JEXEC') or die();
+use Joomla\CMS\User\User;
+use Joomla\CMS\Table\User as UserTable;
 
 JLoader::register('PrivacyPlugin', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/plugin.php');
 JLoader::register('PrivacyRemovalStatus', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/removal/status.php');
 
-use Joomla\CMS\User\User;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
@@ -57,7 +58,7 @@ class PlgPrivacyHierarchy extends PrivacyPlugin
 	 *
 	 * @since   1.1.1
 	 */
-	public function onPrivacyExportRequest(PrivacyTableRequest $request, JUser $user = null)
+	public function onPrivacyExportRequest(PrivacyTableRequest $request, User $user = null)
 	{
 		if (!$user)
 		{
@@ -65,7 +66,7 @@ public function onPrivacyExportRequest(PrivacyTableRequest $request, JUser $user
 		}
 
 		/** @var JTableUser $user */
-		$userTable = User::getTable();
+		$userTable = UserTable::getTable();
 		$userTable->load($user->id);
 
 		$domains = array();
@@ -83,7 +84,7 @@ public function onPrivacyExportRequest(PrivacyTableRequest $request, JUser $user
 	 *
 	 * @since   1.1.1
 	 */
-	private function createHierarchyUsers(JTableUser $user)
+	private function createHierarchyUsers(UserTable $user)
 	{
 		$domain = $this->createDomain('Hierarchy Users', 'Users hierarchy details');
 
@@ -120,7 +121,7 @@ private function createHierarchyUsers(JTableUser $user)
 	 *
 	 * @since   1.1.1
 	 */
-	public function onPrivacyCanRemoveData(PrivacyTableRequest $request, JUser $user = null)
+	public function onPrivacyCanRemoveData(PrivacyTableRequest $request, User $user = null)
 	{
 		$status = new PrivacyRemovalStatus;
 
@@ -142,7 +143,7 @@ public function onPrivacyCanRemoveData(PrivacyTableRequest $request, JUser $user
 	 *
 	 * @since   1.1.1
 	 */
-	public function onPrivacyRemoveData(PrivacyTableRequest $request, JUser $user = null)
+	public function onPrivacyRemoveData(PrivacyTableRequest $request, User $user = null)
 	{
 		// This plugin only processes data for registered user accounts
 		if (!$user)
diff --git a/plugins/privacy/hierarchy/hierarchy.xml b/plugins/privacy/hierarchy/hierarchy.xml
index 7eadb46..430c127 100644
--- a/plugins/privacy/hierarchy/hierarchy.xml
+++ b/plugins/privacy/hierarchy/hierarchy.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="3.4" type="plugin" group="privacy" method="upgrade">
 	<name>plg_privacy_hierarchy</name>
-	<version>1.1.3</version>
-	<creationDate>22nd Jul 2021</creationDate>
+	<version>2.0.0</version>
+	<creationDate>29th Apr 2022</creationDate>
 	<author>Techjoomla</author>
 	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2016 - 2022 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<description>PLG_PRIVACY_HIERARCHY_XML_DESCRIPTION</description>
 	<files>
diff --git a/script.hierarchy.php b/script.hierarchy.php
index 118ee7e..85e2525 100755
--- a/script.hierarchy.php
+++ b/script.hierarchy.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @version    SVN: <svn_id>
- * @package    Com_Tjlms
- * @copyright  Copyright (C) 2005 - 2014. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- * Shika is free software. This version may have been modified pursuant
+ * @package    Com_Hierarchy
+ * @copyright  Copyright (C) 2016 - 2022 Techjoomla. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see http://www.gnu.org/licenses/gpl-2.0.html
+ * Hierarchy Management Extension is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
  * is derivative of works licensed under the GNU General Public License or
  * other free or open source software licenses.
@@ -12,9 +12,11 @@
 
 // No direct access
 defined('_JEXEC') or die;
-
-jimport('joomla.filesystem.folder');
-jimport('joomla.filesystem.file');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Installer\InstallerHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Installer\Installer;
 
 /**
  * Hierarchy Installer
@@ -92,7 +94,7 @@ public function update($parent)
 	 */
 	public function installSqlFiles($parent)
 	{
-		$db = JFactory::getDBO();
+		$db = Factory::getDBO();
 
 		// Obviously you may have to change the path and name if your installation SQL file ;)
 		if (method_exists($parent, 'extension_root'))
@@ -109,8 +111,7 @@ public function installSqlFiles($parent)
 
 		if ($buffer !== false)
 		{
-			jimport('joomla.installer.helper');
-			$queries = JInstallerHelper::splitSql($buffer);
+			$queries = \JDatabaseDriver::splitSql($buffer);
 
 			if (count($queries) != 0)
 			{
@@ -122,9 +123,9 @@ public function installSqlFiles($parent)
 					{
 						$db->setQuery($query);
 
-						if (!$db->query())
+						if (!$db->execute())
 						{
-							JError::raiseWarning(1, JText::sprintf('JLIB_INSTALLER_ERROR_SQL_ERROR', $db->stderr(true)));
+							$this->setMessage(Text::sprintf('JLIB_INSTALLER_ERROR_SQL_ERROR', $db->stderr(true)), 'error');
 
 							return false;
 						}
@@ -159,9 +160,9 @@ public function postflight($type, $parent)
 	private function _installSubextensions($parent)
 	{
 		$src = $parent->getParent()->getPath('source');
-		$db  = JFactory::getDbo();
+		$db  = Factory::getDbo();
 
-		$status = new JObject;
+		$status = new CMSObject;
 		$status->modules = array();
 
 		// Plugins installation
@@ -204,7 +205,7 @@ private function _installSubextensions($parent)
 						$db->setQuery($query);
 						$count = $db->loadResult();
 
-						$installer = new JInstaller;
+						$installer = new Installer;
 						$result = $installer->install($path);
 
 						$status->plugins[] = array('name' => $plugin, 'group' => $folder, 'result' => $result, 'status' => $published);
@@ -251,9 +252,9 @@ private function _uninstallSubextensions($parent)
 	{
 		jimport('joomla.installer.installer');
 
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 
-		$status = new JObject;
+		$status = new CMSObject;
 		$status->modules = array();
 		$status->plugins = array();
 
@@ -279,7 +280,7 @@ private function _uninstallSubextensions($parent)
 
 						if ($id)
 						{
-							$installer = new JInstaller;
+							$installer = new Installer;
 							$result = $installer->uninstall('plugin', $id);
 							$status->plugins[] = array(
 								'name' => 'plg_' . $plugin,
diff --git a/site/controller.php b/site/controller.php
index ce3a6f3..9737d64 100755
--- a/site/controller.php
+++ b/site/controller.php
@@ -9,6 +9,8 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Factory;
 
 jimport('joomla.application.component.controller');
 
@@ -17,7 +19,7 @@
  *
  * @since  1.6
  */
-class HierarchyController extends JControllerLegacy
+class HierarchyController extends BaseController
 {
 	/**
 	 * Method to display a view.
@@ -33,8 +35,8 @@ public function display($cachable = false, $urlparams = false)
 	{
 		require_once JPATH_COMPONENT . '/helpers/hierarchy.php';
 
-		$view = JFactory::getApplication()->input->getCmd('view', 'hierarchys');
-		JFactory::getApplication()->input->set('view', $view);
+		$view = Factory::getApplication()->input->getCmd('view', 'hierarchys');
+		Factory::getApplication()->input->set('view', $view);
 
 		parent::display($cachable, $urlparams);
 
diff --git a/site/controllers/hierarchys.php b/site/controllers/hierarchys.php
index 695f659..170f72f 100755
--- a/site/controllers/hierarchys.php
+++ b/site/controllers/hierarchys.php
@@ -9,6 +9,7 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
 
 require_once JPATH_COMPONENT . '/controller.php';
 
@@ -46,7 +47,7 @@ public function &getModel($name = 'Hierarchys', $prefix = 'HierarchyModel', $con
 	 */
 	public function getReportsTo()
 	{
-		$jinput = JFactory::getApplication()->input;
+		$jinput = Factory::getApplication()->input;
 		$userId = $jinput->get('user_id', '', 'int');
 
 		// Get the model.
@@ -57,7 +58,7 @@ public function getReportsTo()
 
 		foreach ($reportsTo as $reportTo)
 		{
-			$user = JFactory::getUser($reportTo->user_id);
+			$user = Factory::getUser($reportTo->user_id);
 			$reportTo->name = $user->name;
 			$reportTo->also = $model->getReportsTo($reportTo->user_id);
 		}
diff --git a/site/helpers/hierarchy.php b/site/helpers/hierarchy.php
index 407a9a0..b3d11b9 100644
--- a/site/helpers/hierarchy.php
+++ b/site/helpers/hierarchy.php
@@ -8,6 +8,10 @@
  */
 
 defined('_JEXEC') or die;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Filesystem\File;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Uri\Uri;
 
 /**
  * Hierarchys helper.
@@ -23,7 +27,7 @@ class HierarchyFrontendHelper
 	 */
 	public function __construct()
 	{
-		$this->params      = JComponentHelper::getParams('com_hierarchy');
+		$this->params      = ComponentHelper::getParams('com_hierarchy');
 		$this->integration = $this->params->get('integration', 2);
 
 		if ($this->integration != 'none')
@@ -83,7 +87,7 @@ public function getViewPath($viewName, $layout = "", $searchTmpPath = 'SITE', $u
 
 		$override = $searchTmpPath . '/templates/' . $defTemplate . '/html/com_hierarchy/' . $viewName . '/' . $layoutName;
 
-		if (JFile::exists($override))
+		if (File::exists($override))
 		{
 			return $view = $override;
 		}
@@ -106,7 +110,7 @@ public function getSiteDefaultTemplate($client = 0)
 	{
 		try
 		{
-			$db = JFactory::getDBO();
+			$db = Factory::getDBO();
 
 			// Get current status for Unset previous template from being default
 			// For front end => client_id=0
@@ -135,7 +139,7 @@ public function getSiteDefaultTemplate($client = 0)
 	 */
 	public function getUserAvatar($userid, $relative = false)
 	{
-		$user        = JFactory::getUser($userid);
+		$user        = Factory::getUser($userid);
 		$gravatar    = $this->params->get('gravatar');
 		$uimage      = '';
 
@@ -143,7 +147,7 @@ public function getUserAvatar($userid, $relative = false)
 		{
 			if ($gravatar)
 			{
-				$user     = JFactory::getUser($userid);
+				$user     = Factory::getUser($userid);
 				$usermail = $user->get('email');
 
 				// Refer https://en.gravatar.com/site/implement/images/php/
@@ -160,7 +164,7 @@ public function getUserAvatar($userid, $relative = false)
 				}
 				else
 				{
-					$uimage = JUri::root() . 'media/com_hierarchy/images/default_avatar.png';
+					$uimage = Uri::root() . 'media/com_hierarchy/images/default_avatar.png';
 				}
 			}
 		}
diff --git a/site/hierarchy.php b/site/hierarchy.php
index b548f1e..bf3cf89 100755
--- a/site/hierarchy.php
+++ b/site/hierarchy.php
@@ -9,17 +9,20 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Uri\Uri;
 
 // Include dependancies
-jimport('joomla.application.component.controller');
-JHtml::_('bootstrap.loadcss');
-JHtml::_('bootstrap.framework');
+HTMLHelper::_('bootstrap.loadcss');
+HTMLHelper::_('bootstrap.framework');
 
 // Execute the task.
-$controller = JControllerLegacy::getInstance('Hierarchy');
-$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller = BaseController::getInstance('Hierarchy');
+$controller->execute(Factory::getApplication()->input->get('task'));
 $controller->redirect();
 
 // Initialize hierarchy js
-$document = JFactory::getDocument();
-$document->addScript(JUri::root(true) . '/media/com_hierarchy/js/hierarchy.js');
+$document = Factory::getDocument();
+HTMLHelper::_('script', '/media/com_hierarchy/js/hierarchy.js');
diff --git a/site/models/hierarchys.php b/site/models/hierarchys.php
index 3877df2..732e6e3 100755
--- a/site/models/hierarchys.php
+++ b/site/models/hierarchys.php
@@ -8,6 +8,8 @@
  */
 
 defined('_JEXEC') or die;
+use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\CMS\Factory;
 
 jimport('joomla.application.component.modellist');
 
@@ -16,7 +18,7 @@
  *
  * @since  1.6
  */
-class HierarchyModelHierarchys extends JModelList
+class HierarchyModelHierarchys extends ListModel
 {
 	/**
 	 * Constructor.
@@ -38,7 +40,7 @@ public function __construct($config = array())
 		}
 
 		// Create a new query object.
-		$this->db = JFactory::getDbo();
+		$this->db = Factory::getDbo();
 
 		parent::__construct($config);
 	}
@@ -58,10 +60,10 @@ public function __construct($config = array())
 	protected function populateState($ordering = null, $direction = null)
 	{
 		// Initialise variables.
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 
 		// List state information
-		$limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $app->getCfg('list_limit'));
+		$limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $app->get('list_limit'));
 		$this->setState('list.limit', $limit);
 
 		$limitstart = $app->input->getInt('limitstart', 0);
@@ -87,7 +89,7 @@ protected function populateState($ordering = null, $direction = null)
 	 */
 	protected function getListQuery()
 	{
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 
 		// Create a new query object.+
 		$query = $this->db->getQuery(true);
@@ -172,7 +174,7 @@ public function getReportsTo($reportsTo)
 
 		foreach ($results as $res)
 		{
-			$user = JFactory::getUser($res->user_id);
+			$user = Factory::getUser($res->user_id);
 			$res->reportsToName = $user->name;
 		}
 
@@ -199,7 +201,7 @@ public function getReportingTo($userID)
 
 		foreach ($results as $res)
 		{
-			$user = JFactory::getUser($res->user_id);
+			$user = Factory::getUser($res->user_id);
 			$res->reportingTo = $user->name;
 		}
 
diff --git a/site/router.php b/site/router.php
index 0e5edb1..46939e7 100755
--- a/site/router.php
+++ b/site/router.php
@@ -10,6 +10,21 @@
 // No direct access
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Component\Router\RouterBase;
+use Joomla\CMS\Table\Table;
+
+// Add Table Path
+Table::addIncludePath(JPATH_ROOT . '/administrator/components/com_hierarchy/tables');
+
+/**
+ * Routing class from com_hierarchy
+ *
+ * @subpackage  com_hierarchy
+ *
+ * @since       1.0.0
+ */
+class HierarchyRouter extends RouterBase
+{
 /**
  * Build the route for the com_hierarchy component
  *
@@ -19,63 +34,64 @@
  *
  * @since  1.5
  */
-function hierarchyBuildRoute(&$query)
-{
-	$segments = array();
-
-	if (isset($query['task']))
+	public function build(&$query)
 	{
-		$segments[] = implode('/', explode('.', $query['task']));
+		$segments = array();
 
-		unset($query['task']);
-	}
-
-	if (isset($query['view']))
-	{
-		$segments[] = $query['view'];
+		if (isset($query['task']))
+		{
+			$segments[] = implode('/', explode('.', $query['task']));
 
-		unset($query['view']);
-	}
+			unset($query['task']);
+		}
 
-	if (isset($query['id']))
-	{
-		$segments[] = $query['id'];
+		if (isset($query['view']))
+		{
+			$segments[] = $query['view'];
 
-		unset($query['id']);
-	}
+			unset($query['view']);
+		}
 
-	return $segments;
-}
+		if (isset($query['id']))
+		{
+			$segments[] = $query['id'];
 
-/**
- * Parse the segments of a URL.
- *
- * @param   array  $segments  The segments of the URL to parse.
- *
- * @return  array  The URL attributes to be used by the application.
- *
- * @since  1.5
- */
-function hierarchyParseRoute($segments)
-{
-	$vars = array();
+			unset($query['id']);
+		}
 
-	// View is always the first element of the array
-	$vars['view'] = array_shift($segments);
+		return $segments;
+	}
 
-	while (!empty($segments))
+	/**
+	 * Parse the segments of a URL.
+	 *
+	 * @param   array  $segments  The segments of the URL to parse.
+	 *
+	 * @return  array  The URL attributes to be used by the application.
+	 *
+	 * @since  1.5
+	 */
+	public function parse(&$segments)
 	{
-		$segment = array_pop($segments);
+		$vars = array();
 
-		if (is_numeric($segment))
-		{
-			$vars['id'] = $segment;
-		}
-		else
+		// View is always the first element of the array
+		$vars['view'] = array_shift($segments);
+
+		while (!empty($segments))
 		{
-			$vars['task'] = $vars['view'] . '.' . $segment;
+			$segment = array_pop($segments);
+
+			if (is_numeric($segment))
+			{
+				$vars['id'] = $segment;
+			}
+			else
+			{
+				$vars['task'] = $vars['view'] . '.' . $segment;
+			}
 		}
-	}
 
-	return $vars;
-}
+		return $vars;
+	}
+}
\ No newline at end of file
diff --git a/site/views/hierarchys/tmpl/chart.php b/site/views/hierarchys/tmpl/chart.php
index 7545a23..e756113 100644
--- a/site/views/hierarchys/tmpl/chart.php
+++ b/site/views/hierarchys/tmpl/chart.php
@@ -9,29 +9,33 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 
-JHtml::_('bootstrap.tooltip');
-JHtml::_('behavior.multiselect');
-JHtml::stylesheet(JUri::root() . 'media/com_hierarchy/vendors/treant-js/Treant.css');
-JHtml::stylesheet(JUri::root() . 'media/com_hierarchy/vendors/treant-js/collapsable.css');
-JHtml::script(JUri::root() . 'media/com_hierarchy/vendors/treant-js/vendor/raphael.js');
-JHtml::script(JUri::root() . 'media/com_hierarchy/vendors/treant-js/Treant.js');
-$JUriRoot = JUri::root();
-$user = JFactory::getUser();
+HTMLHelper::_('bootstrap.tooltip');
+HTMLHelper::_('behavior.multiselect');
+HTMLHelper::_('stylesheet', 'media/com_hierarchy/vendors/treant-js/Treant.css');
+HTMLHelper::_('stylesheet', 'media/com_hierarchy/vendors/treant-js/collapsable.css');
+HTMLHelper::_('script', 'media/com_hierarchy/vendors/treant-js/vendor/raphael.js');
+HTMLHelper::_('script', 'media/com_hierarchy/vendors/treant-js/Treant.js');
+$UriRoot = Uri::root();
+$user = Factory::getUser();
 $userName = $user->name;
 
 foreach ($this->items as $hierarchy)
 {
-	$user = JFactory::getUser($hierarchy->user_id);
+	$user = Factory::getUser($hierarchy->user_id);
 	$hierarchy->repoToName = $user->name;
 }
 ?>
 <div class="alert alert-info" role="alert">
-	<?php echo JText::_('COM_HIERARCHY_SHOW_CHART');?><b><?php echo $userName . '.'; ?></b>
+	<?php echo Text::_('COM_HIERARCHY_SHOW_CHART');?><b><?php echo $userName . '.'; ?></b>
 </div>
 <div id="hierarchy_chart"></div>
 <script type="text/javascript">
-	var JUriRoot = "<?php echo $JUriRoot; ?>";
+	var UriRoot = "<?php echo $UriRoot; ?>";
 	var userName = "<?php echo $userName; ?>";
 
 	/** Show people directly reporting to logged in user **/
@@ -42,7 +46,7 @@
 			/** Get sub-user names and create node structure **/
 			<?php $hierarchys = $this->hierarchysModel->getReportsTo($data->user_id);
 				foreach ($hierarchys as $hierarchy) {
-					$user = JFactory::getUser($hierarchy->user_id);
+					$user = Factory::getUser($hierarchy->user_id);
 					$hierarchy->subUserName = $user->name;
 				} ?>
 				var subChildArrObj = [];
diff --git a/site/views/hierarchys/tmpl/default.php b/site/views/hierarchys/tmpl/default.php
index 37a7276..d691c09 100755
--- a/site/views/hierarchys/tmpl/default.php
+++ b/site/views/hierarchys/tmpl/default.php
@@ -8,12 +8,15 @@
  */
 // no direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 require_once JPATH_COMPONENT . '/helpers/hierarchy.php';
-JHtml::_('bootstrap.tooltip');
-JHtml::_('behavior.multiselect');
-JHtml::_('formbehavior.chosen', 'select');
+HTMLHelper::_('bootstrap.tooltip');
+HTMLHelper::_('behavior.multiselect');
+HTMLHelper::_('formbehavior.chosen', 'select');
 
 $listOrder  = $this->state->get('list.ordering');
 $listDirn   = $this->state->get('list.direction');
@@ -22,10 +25,10 @@
 if ($saveOrder)
 {
 	$saveOrderingUrl = 'index.php?option=com_tjlms&task=venues.saveOrderAjax&tmpl=component';
-	JHtml::_('sortablelist.sortable', 'venueList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+	HTMLHelper::_('sortablelist.sortable', 'venueList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
 }
 
-$app = JFactory::getApplication();
+$app = Factory::getApplication();
 $menulistChart = $app->getParams()->get('select_layout');
 ?>
 <div class="container-fluid">
@@ -33,7 +36,7 @@
 	if ($this->params->get('show_page_heading', 1)):
 		?>
 		<div class="page-header">
-			<h2><?php echo JText::_('COM_HIERARCHY_TITLE'); ?></h2>
+			<h2><?php echo Text::_('COM_HIERARCHY_TITLE'); ?></h2>
 		</div>
 		<?php
 	endif;
diff --git a/site/views/hierarchys/tmpl/list.php b/site/views/hierarchys/tmpl/list.php
index 53e8a06..285cc87 100644
--- a/site/views/hierarchys/tmpl/list.php
+++ b/site/views/hierarchys/tmpl/list.php
@@ -9,16 +9,21 @@
 
 // No direct access
 defined('_JEXEC') or die;
-$user = JFactory::getUser();
-$JUriRoot = JUri::root();
+use Joomla\CMS\Factory;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\HTML\HTMLHelper;
+$user = Factory::getUser();
+$UriRoot = Uri::root();
 ?>
 <div class="alert alert-info" role="alert">
-	<?php echo JText::_('COM_HIERARCHY_SHOW_LIST');?><b><?php echo $user->name . '.'; ?></b>
+	<?php echo Text::_('COM_HIERARCHY_SHOW_LIST');?><b><?php echo $user->name . '.'; ?></b>
 </div>
-<form action="<?php echo JRoute::_('index.php?option=com_hierarchy&view=hierarchys'); ?>" method="post" name="adminForm" id="adminForm">
+<form action="<?php echo Route::_('index.php?option=com_hierarchy&view=hierarchys'); ?>" method="post" name="adminForm" id="adminForm">
 	<div class=" col-lg-3 col-md-6 col-sm-6 col-xs-12">
 		<div class="input-group">
-			<input type="text" placeholder="<?php echo JText::_('COM_HIERARCHY_ENTER_USER_NAME'); ?>" name="filter_search" id="filter_search" value="<?php echo $srch = ($this->lists['search'])?$this->lists['search']:''; ?>" class="form-control" onchange="document.adminForm.submit();" />
+			<input type="text" placeholder="<?php echo Text::_('COM_HIERARCHY_ENTER_USER_NAME'); ?>" name="filter_search" id="filter_search" value="<?php echo $srch = ($this->lists['search'])?$this->lists['search']:''; ?>" class="form-control" onchange="document.adminForm.submit();" />
 			<span class="input-group-btn">
 				<button type="button" onclick="this.form.submit();" class="btn btn-success tip hasTooltip" data-original-title="Search"><i class="fa fa-search"></i></button>
 				<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();" class="btn btn-primary tip hasTooltip" data-original-title="Clear"><i class="fa fa-remove"></i></button>
@@ -27,7 +32,7 @@
 	</div>
 	<div class=" col-lg-8 col-md-6 col-sm-6 col-xs-12">
 		<div class="input-group pull-right">
-			<?php //echo JHtml::_('select.genericlist', $this->contextList, "filter_context", 'style="display:inline-block;" class="selectpicker" data-style="btn-primary" size="1" data-live-search="true"
+			<?php //echo HTMLHelper::_('select.genericlist', $this->contextList, "filter_context", 'style="display:inline-block;" class="selectpicker" data-style="btn-primary" size="1" data-live-search="true"
 				//onchange="document.adminForm.submit();" name="filter_context"',"value", "text", $this->lists['contextList']);
 			?>
 		</div>
@@ -35,7 +40,7 @@
 	<div class=" col-lg-1 col-md-6 col-sm-6 col-xs-12">
 		<div class="btn-group pull-right hidden-xs">
 			<label for="limit" class="element-invisible">
-				<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>
+				<?php echo Text::_('JGLOBAL_DISPLAY_NUM'); ?>
 			</label>
 			<?php echo $this->pagination->getLimitBox(); ?>
 		</div>
@@ -46,7 +51,7 @@
 	{
 		?>
 		<div class="alert alert-info" role="alert">
-			<?php echo JText::_('COM_HIERARCHY_NO_USER'); ?>
+			<?php echo Text::_('COM_HIERARCHY_NO_USER'); ?>
 		</div>
 		<?php
 	}
@@ -57,7 +62,7 @@
 			<thead>
 				<tr>
 					<th class='left'>
-						<?php echo JHtml::_('grid.sort',  'COM_HIERARCHY_HIERARCHYS_USER_NAME', 'a.name', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort',  'COM_HIERARCHY_HIERARCHYS_USER_NAME', 'a.name', $listDirn, $listOrder); ?>
 					</th>
 <!--
 					<th class='left'>
@@ -68,10 +73,10 @@
 					</th>
 -->
 					<th class='left'>
-						<?php echo JText::_('COM_HIERARCHY_HIERARCHYS_REPORT_TO'); ?>
+						<?php echo Text::_('COM_HIERARCHY_HIERARCHYS_REPORT_TO'); ?>
 					</th>
 					<th class='right'>
-						<?php echo JHtml::_('grid.sort',  'COM_HIERARCHY_HIERARCHYS_USER_ID', 'a.id', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort',  'COM_HIERARCHY_HIERARCHYS_USER_ID', 'a.id', $listDirn, $listOrder); ?>
 					</th>
 				</tr>
 			</thead>
@@ -120,7 +125,7 @@
 
 							foreach($reportsTo as $reportTo)
 							{
-								$user = JFactory::getUser($reportTo->user_id);
+								$user = Factory::getUser($reportTo->user_id);
 								$name[] = $user->name;
 							}
 
@@ -149,10 +154,10 @@
 	<input type="hidden" name="boxchecked" value="0" />
 	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
 	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
-	<?php echo JHtml::_('form.token'); ?>
+	<?php echo HTMLHelper::_('form.token'); ?>
 </form>
 <script type="text/javascript">
-	var JUriRoot = "<?php echo $JUriRoot; ?>";
+	var UriRoot = "<?php echo $UriRoot; ?>";
 	var gravatar = "<?php echo $this->gravatar; ?>";
 	hierarchySite.hierarchys.showUserNames();
 </script>
diff --git a/site/views/hierarchys/view.html.php b/site/views/hierarchys/view.html.php
index ebd18a4..7de9c23 100755
--- a/site/views/hierarchys/view.html.php
+++ b/site/views/hierarchys/view.html.php
@@ -7,8 +7,15 @@
  * @license    GNU General Public License version 2 or later.
  */
 defined('_JEXEC') or die;
+use Joomla\CMS\MVC\View\HtmlView;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\Component\ComponentHelper;
 
-jimport('joomla.application.component.view');
 JLoader::import('components.com_hierarchy.models.hierarchys', JPATH_SITE);
 
 /**
@@ -16,7 +23,7 @@
  *
  * @since  1.6
  */
-class HierarchyViewHierarchys extends JViewLegacy
+class HierarchyViewHierarchys extends HtmlView
 {
 	protected $items;
 
@@ -37,18 +44,20 @@ class HierarchyViewHierarchys extends JViewLegacy
 	 */
 	public function display($tpl = null)
 	{
-		$app = JFactory::getApplication();
-		$user = JFactory::getUser();
+		$app = Factory::getApplication();
+		$user = Factory::getUser();
 
 		// Validate user login.
 		if (empty($user->id))
 		{
-			$msg = JText::_('COM_HIERARCHY_MESSAGE_LOGIN_FIRST');
+			$msg = Text::_('COM_HIERARCHY_MESSAGE_LOGIN_FIRST');
 
 			// Get current url.
-			$current = JUri::getInstance()->toString();
+			$current = Uri::getInstance()->toString();
 			$url     = base64_encode($current);
-			$app->redirect(JRoute::_('index.php?option=com_users&view=login&return=' . $url, false), $msg);
+
+			$app->enqueueMessage($msg, 'notice');
+			$app->redirect(Route::_('index.php?option=com_users&view=login&return=' . $url, false));
 		}
 
 		$this->state = $this->get('State');
@@ -59,14 +68,14 @@ public function display($tpl = null)
 		$contextName = $this->state->get('filter_context');
 
 		$contextList = array();
-		$contextList[] = JHtml::_('select.option', '0', JText::_('COM_HIERARCHY_SELECT_CONTEXT'));
+		$contextList[] = HTMLHelper::_('select.option', '0', Text::_('COM_HIERARCHY_SELECT_CONTEXT'));
 
 		if (!empty($this->items))
 		{
 			foreach ($this->items as $item)
 			{
 				// Get list of people who is managers of logged in user.
-				$this->hierarchysModel = JModelLegacy::getInstance('Hierarchys', 'HierarchyModel');
+				$this->hierarchysModel = BaseDatabaseModel::getInstance('Hierarchys', 'HierarchyModel');
 				$this->reportingsTo = $this->hierarchysModel->getReportingTo($item->reports_to);
 
 				// Get avatar
@@ -75,7 +84,7 @@ public function display($tpl = null)
 
 				// Context filter
 				$context   = $item->context;
-				$contextList[] = JHtml::_('select.option', $context, $context);
+				$contextList[] = HTMLHelper::_('select.option', $context, $context);
 			}
 		}
 
@@ -90,7 +99,7 @@ public function display($tpl = null)
 		$this->HierarchyFrontendHelper     = new HierarchyFrontendHelper;
 
 		// Get component params
-		$this->params     = JComponentHelper::getParams('com_hierarchy');
+		$this->params     = ComponentHelper::getParams('com_hierarchy');
 
 		// Get permissions
 		$this->canCreate  = $user->authorise('core.create', 'com_hierarchy');