diff --git a/src/JoomlaBrowser.php b/src/JoomlaBrowser.php
index 512f5c0..448968e 100644
--- a/src/JoomlaBrowser.php
+++ b/src/JoomlaBrowser.php
@@ -8,7 +8,11 @@
 
 namespace Codeception\Module;
 
+use Codeception\Module\Locators\Locators;
 use Codeception\Module\WebDriver;
+use Codeception\Lib\ModuleContainer;
+
+const TIMEOUT = 60;
 
 /**
  * Joomla Browser class to perform test suits for Joomla.
@@ -20,7 +24,8 @@ class JoomlaBrowser extends WebDriver
 	/**
 	 * The module required fields, to be set in the suite .yml configuration file.
 	 *
-	 * @var array
+	 * @var     array
+	 * @since   3.0.0
 	 */
 	protected $requiredFields = array(
 		'url',
@@ -38,6 +43,63 @@ class JoomlaBrowser extends WebDriver
 		'language'
 	);
 
+	/**
+	 * The locator
+	 *
+	 * @var     Codeception\Module\Locators\Locators
+	 * @since   3.7.4.2
+	 */
+	protected $locator;
+
+	/**
+	 * Module constructor.
+	 *
+	 * Requires module container (to provide access between modules of suite) and config.
+	 *
+	 * @param   ModuleContainer  $moduleContainer  The module container
+	 * @param   array            $config           The optional config
+	 *
+	 * @since   3.7.4.2
+	 */
+	public function __construct(ModuleContainer $moduleContainer, $config = null)
+	{
+		parent::__construct($moduleContainer, $config);
+
+		// Instantiate the locator
+		$this->instantiateLocator();
+	}
+
+	/**
+	 * Function to instantiate the Locator Class, In case of a custom Template,
+	 * path to the custom Template Locator could be passed in Acceptance.suite.yml file
+	 *
+	 * for example: If the Class is present at _support/Page/Acceptance folder, simple add a new Parameter in acceptance.suite.yml file
+	 *
+	 * locator class: 'Page\Acceptance\Bootstrap2TemplateLocators'
+	 *
+	 * Locator could be set to null like this
+	 *
+	 * locator class: null
+	 *
+	 * When set to null, Joomla Browser will use the custom Locators present inside Locators.php
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0.0
+	 */
+	protected function instantiateLocator()
+	{
+		if (empty($this->config['locator class']))
+		{
+			$this->locator = new Locators;
+
+			return;
+		}
+
+		$class         = $this->config['locator class'];
+		$this->locator = new $class;
+	}
+
 	/**
 	 * Function to Do Admin Login In Joomla!
 	 *
@@ -45,11 +107,10 @@ class JoomlaBrowser extends WebDriver
 	 * @param   string|null  $password  Optional password. If not passed the one in acceptance.suite.yml will be used
 	 *
 	 * @return  void
+	 * @since   3.0.0
 	 */
 	public function doAdministratorLogin($user = null, $password = null)
 	{
-		$I = $this;
-
 		if (is_null($user))
 		{
 			$user = $this->config['username'];
@@ -61,18 +122,18 @@ public function doAdministratorLogin($user = null, $password = null)
 		}
 
 		$this->debug('I open Joomla Administrator Login Page');
-		$I->amOnPage('/administrator/index.php');
-		$I->waitForElement(['id' => 'mod-login-username'], 60);
+		$this->amOnPage($this->locator->adminLoginPageUrl);
+		$this->waitForElement($this->locator->adminLoginUserName, TIMEOUT);
 		$this->debug('Fill Username Text Field');
-		$I->fillField(['id' => 'mod-login-username'], $user);
+		$this->fillField($this->locator->adminLoginUserName, $user);
 		$this->debug('Fill Password Text Field');
-		$I->fillField(['id' => 'mod-login-password'], $password);
+		$this->fillField($this->locator->adminLoginPassword, $password);
 
 		// @todo: update login button in joomla login screen to make this xPath more friendly
 		$this->debug('I click Login button');
-		$I->click(['xpath' => "//button[contains(normalize-space(), 'Log in')]"]);
+		$this->click($this->locator->adminLoginButton);
 		$this->debug('I wait to see Administrator Control Panel');
-		$I->waitForText('Control Panel', 4, ['css' => 'h1.page-title']);
+		$this->waitForText('Control Panel', 4, $this->locator->controlPanelLocator);
 	}
 
 	/**
@@ -82,11 +143,10 @@ public function doAdministratorLogin($user = null, $password = null)
 	 * @param   string|null  $password  Optional password. If not passed the one in acceptance.suite.yml will be used
 	 *
 	 * @return  void
+	 * @since   3.0.0
 	 */
 	public function doFrontEndLogin($user = null, $password = null)
 	{
-		$I = $this;
-
 		if (is_null($user))
 		{
 			$user = $this->config['username'];
@@ -98,148 +158,146 @@ public function doFrontEndLogin($user = null, $password = null)
 		}
 
 		$this->debug('I open Joomla Frontend Login Page');
-		$I->amOnPage('/index.php?option=com_users&view=login');
+		$this->amOnPage($this->locator->frontEndLoginUrl);
 		$this->debug('Fill Username Text Field');
-		$I->fillField(['id' => 'username'], $user);
+		$this->fillField($this->locator->loginUserName, $user);
 		$this->debug('Fill Password Text Field');
-		$I->fillField(['id' => 'password'], $password);
+		$this->fillField($this->locator->loginPassword, $password);
 
 		// @todo: update login button in joomla login screen to make this xPath more friendly
 		$this->debug('I click Login button');
-		$I->click(['xpath' => "//div[@class='login']/form/fieldset/div[4]/div/button"]);
+		$this->click($this->locator->loginButton);
 		$this->debug('I wait to see Frontend Member Profile Form with the Logout button in the module');
-		$I->waitForElement(['xpath' => "//form[@id='login-form']/div[@class='logout-button']"], 60);
+
+		$this->waitForElement($this->locator->frontEndLoginSuccess, TIMEOUT);
 	}
 
 	/**
 	 * Function to Do frontend Logout in Joomla!
 	 *
 	 * @return  void
+	 *
+	 * @since   3.0.0
 	 */
 	public function doFrontendLogout()
 	{
-		$I = $this;
 		$this->debug('I open Joomla Frontend Login Page');
-		$I->amOnPage('/index.php?option=com_users&view=login');
+		$this->amOnPage($this->locator->frontEndLoginUrl);
 		$this->debug('I click Logout button');
-		$I->click(['xpath' => "//div[@class='logout']//button[contains(text(), 'Log out')]"]);
-		$I->amOnPage('/index.php?option=com_users&view=login');
+		$this->click($this->locator->frontEndLogoutButton);
+		$this->amOnPage('/index.php?option=com_users&view=login');
 		$this->debug('I wait to see Login form');
-		$I->waitForElement(['xpath' => "//div[@class='login']//button[contains(text(), 'Log in')]"], 30);
-		$I->seeElement(['xpath' => "//div[@class='login']//button[contains(text(), 'Log in')]"]);
+		$this->waitForElement($this->locator->frontEndLoginForm, 30);
+		$this->seeElement($this->locator->frontEndLoginForm);
 	}
 
 	/**
 	 * Installs Joomla
 	 *
 	 * @return  void
+	 * @since   3.0.0
 	 */
 	public function installJoomla()
 	{
-		$I = $this;
-
-		// Install Joomla CMS');
-
 		$this->debug('I open Joomla Installation Configuration Page');
-		$I->amOnPage('/installation/index.php');
+		$this->amOnPage('/installation/index.php');
 		$this->debug('I check that FTP tab is not present in installation. Otherwise it means that I have not enough '
-			. 'permissions to install joomla and execution will be stoped');
-		$I->dontSeeElement(['id' => 'ftp']);
+		             . 'permissions to install joomla and execution will be stoped');
+		$this->dontSeeElement(['id' => 'ftp']);
 
 		// I Wait for the text Main Configuration, meaning that the page is loaded
 		$this->debug('I wait for Main Configuration');
-		$I->waitForElement('#jform_language', 10);
-		$I->debug('Wait for chosen to render the Languages list field');
-		$I->wait(2);
-		$I->debug('I select dk-DK as installation language');
+		$this->waitForElement('#jform_language', 10);
+		$this->debug('Wait for chosen to render the Languages list field');
+		$this->wait(2);
+		$this->debug('I select dk-DK as installation language');
 
 		// Select a random language to force reloading of the lang strings after selecting English
-		$I->selectOptionInChosenWithTextField('#jform_language', 'Spanish (Español)');
-		$I->waitForText('Configuración principal', 60, 'h3');
+		$this->selectOptionInChosenWithTextField('#jform_language', 'Spanish (Español)');
+		$this->waitForText('Configuración principal', TIMEOUT, 'h3');
 
 		// Wait for chosen to render the field
-		$I->debug('I select en-GB as installation language');
-		$I->debug('Wait for chosen to render the Languages list field');
-		$I->wait(2);
-		$I->selectOptionInChosenWithTextField('#jform_language', 'English (United Kingdom)');
-		$I->waitForText('Main Configuration', 60, 'h3');
+		$this->debug('I select en-GB as installation language');
+		$this->debug('Wait for chosen to render the Languages list field');
+		$this->wait(2);
+		$this->selectOptionInChosenWithTextField('#jform_language', 'English (United Kingdom)');
+		$this->waitForText('Main Configuration', TIMEOUT, 'h3');
 		$this->debug('I fill Site Name');
-		$I->fillField(['id' => 'jform_site_name'], 'Joomla CMS test');
+		$this->fillField(['id' => 'jform_site_name'], 'Joomla CMS test');
 		$this->debug('I fill Site Description');
-		$I->fillField(['id' => 'jform_site_metadesc'], 'Site for testing Joomla CMS');
+		$this->fillField(['id' => 'jform_site_metadesc'], 'Site for testing Joomla CMS');
 
 		// I get the configuration from acceptance.suite.yml (see: tests/_support/acceptancehelper.php)
 		$this->debug('I fill Admin Email');
-		$I->fillField(['id' => 'jform_admin_email'], $this->config['admin email']);
+		$this->fillField(['id' => 'jform_admin_email'], $this->config['admin email']);
 		$this->debug('I fill Admin Username');
-		$I->fillField(['id' => 'jform_admin_user'], $this->config['username']);
+		$this->fillField(['id' => 'jform_admin_user'], $this->config['username']);
 		$this->debug('I fill Admin Password');
-		$I->fillField(['id' => 'jform_admin_password'], $this->config['password']);
+		$this->fillField(['id' => 'jform_admin_password'], $this->config['password']);
 		$this->debug('I fill Admin Password Confirmation');
-		$I->fillField(['id' => 'jform_admin_password2'], $this->config['password']);
+		$this->fillField(['id' => 'jform_admin_password2'], $this->config['password']);
 		$this->debug('I click Site Offline: no');
 
 		// ['No Site Offline']
-		$I->click(['xpath' => "//fieldset[@id='jform_site_offline']/label[@for='jform_site_offline1']"]);
+		$this->click(['xpath' => "//fieldset[@id='jform_site_offline']/label[@for='jform_site_offline1']"]);
 		$this->debug('I click Next');
-		$I->click(['link' => 'Next']);
+		$this->click(['link' => 'Next']);
 
 		$this->debug('I Fill the form for creating the Joomla site Database');
-		$I->waitForText('Database Configuration', 60, ['css' => 'h3']);
+		$this->waitForText('Database Configuration', TIMEOUT, ['css' => 'h3']);
 
 		$this->debug('I select MySQLi');
-		$I->selectOption(['id' => 'jform_db_type'], $this->config['database type']);
+		$this->selectOption(['id' => 'jform_db_type'], $this->config['database type']);
 		$this->debug('I fill Database Host');
-		$I->fillField(['id' => 'jform_db_host'], $this->config['database host']);
+		$this->fillField(['id' => 'jform_db_host'], $this->config['database host']);
 		$this->debug('I fill Database User');
-		$I->fillField(['id' => 'jform_db_user'], $this->config['database user']);
+		$this->fillField(['id' => 'jform_db_user'], $this->config['database user']);
 		$this->debug('I fill Database Password');
-		$I->fillField(['id' => 'jform_db_pass'], $this->config['database password']);
+		$this->fillField(['id' => 'jform_db_pass'], $this->config['database password']);
 		$this->debug('I fill Database Name');
-		$I->fillField(['id' => 'jform_db_name'], $this->config['database name']);
+		$this->fillField(['id' => 'jform_db_name'], $this->config['database name']);
 		$this->debug('I fill Database Prefix');
-		$I->fillField(['id' => 'jform_db_prefix'], $this->config['database prefix']);
+		$this->fillField(['id' => 'jform_db_prefix'], $this->config['database prefix']);
 		$this->debug('I click Remove Old Database ');
-		$I->selectOptionInRadioField('Old Database Process', 'Remove');
+		$this->selectOptionInRadioField('Old Database Process', 'Remove');
 		$this->debug('I click Next');
-		$I->click(['link' => 'Next']);
+		$this->click(['link' => 'Next']);
 		$this->debug('I wait Joomla to remove the old database if exist');
-		$I->wait(1);
-		$I->waitForElementVisible(['id' => 'jform_sample_file-lbl'], 30);
+		$this->wait(1);
+		$this->waitForElementVisible(['id' => 'jform_sample_file-lbl'], 30);
 
 		$this->debug('I install joomla with or without sample data');
-		$I->waitForText('Finalisation', 60, ['xpath' => '//h3']);
+		$this->waitForText('Finalisation', TIMEOUT, ['xpath' => '//h3']);
 
 		// @todo: installation of sample data needs to be created
 
 		// No sample data
-		$I->selectOption(['id' => 'jform_sample_file'], ['id' => 'jform_sample_file0']);
-		$I->click(['link' => 'Install']);
+		$this->selectOption(['id' => 'jform_sample_file'], ['id' => 'jform_sample_file0']);
+		$this->click(['link' => 'Install']);
 
 		// Wait while Joomla gets installed
 		$this->debug('I wait for Joomla being installed');
-		$I->waitForText('Congratulations! Joomla! is now installed.', 60, ['xpath' => '//h3']);
+		$this->waitForText('Congratulations! Joomla! is now installed.', TIMEOUT, ['xpath' => '//h3']);
 	}
 
 	/**
 	 * Install Joomla removing the Installation folder at the end of the execution
 	 *
 	 * @return  void
+	 * @since   3.0.0
 	 */
 	public function installJoomlaRemovingInstallationFolder()
 	{
-		$I = $this;
-
-		$I->installJoomla();
+		$this->installJoomla();
 
 		$this->debug('Removing Installation Folder');
-		$I->click(['xpath' => "//input[@value='Remove installation folder']"]);
+		$this->click(['xpath' => "//input[@value='Remove installation folder']"]);
 
-		$I->debug('I wait for Removing Installation Folder button to become disabled');
-		$I->waitForJS("return jQuery('form#adminForm input[name=instDefault]').attr('disabled') == 'disabled';", 60);
+		$this->debug('I wait for Removing Installation Folder button to become disabled');
+		$this->waitForJS("return jQuery('form#adminForm input[name=instDefault]').attr('disabled') == 'disabled';", TIMEOUT);
 
-		$I->debug('Joomla is now installed');
-		$I->see('Congratulations! Joomla! is now installed.', ['xpath' => '//h3']);
+		$this->debug('Joomla is now installed');
+		$this->see('Congratulations! Joomla! is now installed.', ['xpath' => '//h3']);
 	}
 
 	/**
@@ -247,9 +305,10 @@ public function installJoomlaRemovingInstallationFolder()
 	 *
 	 * @param   array  $languages  Array containing the language names to be installed
 	 *
-	 * @example: $I->installJoomlaMultilingualSite(['Spanish', 'French']);
+	 * @example: $this->installJoomlaMultilingualSite(['Spanish', 'French']);
 	 *
 	 * @return  void
+	 * @since   3.0.0
 	 */
 	public function installJoomlaMultilingualSite($languages = array())
 	{
@@ -259,61 +318,60 @@ public function installJoomlaMultilingualSite($languages = array())
 			$languages[] = 'French';
 		}
 
-		$I = $this;
-
-		$I->installJoomla();
+		$this->installJoomla();
 
 		$this->debug('I go to Install Languages page');
-		$I->click(['id' => 'instLangs']);
-		$I->waitForText('Install Language packages', 60, ['xpath' => '//h3']);
+		$this->click(['id' => 'instLangs']);
+		$this->waitForText('Install Language packages', TIMEOUT, ['xpath' => '//h3']);
 
 		foreach ($languages as $language)
 		{
-			$I->debug('I mark the checkbox of the language: ' . $language);
-			$I->click(['xpath' => "//label[contains(text()[normalize-space()], '$language')]"]);
+			$this->debug('I mark the checkbox of the language: ' . $language);
+			$this->click(['xpath' => "//label[contains(text()[normalize-space()], '$language')]"]);
 		}
 
-		$I->click(['link' => 'Next']);
-		$I->waitForText('Multilingual', 60, ['xpath' => '//h3']);
-		$I->selectOptionInRadioField('Activate the multilingual feature', 'Yes');
-		$I->waitForElementVisible(['id' => 'jform_activatePluginLanguageCode-lbl']);
-		$I->selectOptionInRadioField('Install localised content', 'Yes');
-		$I->selectOptionInRadioField('Enable the language code plugin', 'Yes');
-		$I->click(['link' => 'Next']);
+		$this->click(['link' => 'Next']);
+		$this->waitForText('Multilingual', TIMEOUT, ['xpath' => '//h3']);
+		$this->selectOptionInRadioField('Activate the multilingual feature', 'Yes');
+		$this->waitForElementVisible(['id' => 'jform_activatePluginLanguageCode-lbl']);
+		$this->selectOptionInRadioField('Install localised content', 'Yes');
+		$this->selectOptionInRadioField('Enable the language code plugin', 'Yes');
+		$this->click(['link' => 'Next']);
 
-		$I->waitForText('Congratulations! Joomla! is now installed.', 60, ['xpath' => '//h3']);
+		$this->waitForText('Congratulations! Joomla! is now installed.', TIMEOUT, ['xpath' => '//h3']);
 		$this->debug('Removing Installation Folder');
-		$I->click(['xpath' => "//input[@value='Remove installation folder']"]);
+		$this->click(['xpath' => "//input[@value='Remove installation folder']"]);
 
 		// @todo https://github.com/joomla-projects/joomla-browser/issues/45
-		$I->wait(2);
+		$this->wait(2);
 
 		$this->debug('Joomla is now installed');
-		$I->see('Congratulations! Joomla! is now installed.', ['xpath' => '//h3']);
+		$this->see('Congratulations! Joomla! is now installed.', ['xpath' => '//h3']);
 	}
 
 	/**
-	 * Sets in Adminitrator->Global Configuration the Error reporting to Development
+	 * Sets in Administrator->Global Configuration the Error reporting to Development
 	 * {@internal doAdminLogin() before}
 	 *
 	 * @return  void
+	 *
+	 * @since   3.0.0
 	 */
 	public function setErrorReportingToDevelopment()
 	{
-		$I = $this;
 		$this->debug('I open Joomla Global Configuration Page');
-		$I->amOnPage('/administrator/index.php?option=com_config');
+		$this->amOnPage('/administrator/index.php?option=com_config');
 		$this->debug('I wait for Global Configuration title');
-		$I->waitForText('Global Configuration', 60, ['css' => '.page-title']);
+		$this->waitForText('Global Configuration', TIMEOUT, ['css' => '.page-title']);
 		$this->debug('I open the Server Tab');
-		$I->click(['link' => 'Server']);
+		$this->click(['link' => 'Server']);
 		$this->debug('I wait for error reporting dropdown');
-		$I->selectOptionInChosen('Error Reporting', 'Development');
+		$this->selectOptionInChosen('Error Reporting', 'Development');
 		$this->debug('I click on save');
-		$I->click(['xpath' => "//div[@id='toolbar-apply']//button"]);
+		$this->click(['xpath' => "//div[@id='toolbar-apply']//button"]);
 		$this->debug('I wait for global configuration being saved');
-		$I->waitForText('Global Configuration', 60, ['css' => '.page-title']);
-		$I->see('Configuration saved.', ['id' => 'system-message-container']);
+		$this->waitForText('Global Configuration', TIMEOUT, ['css' => '.page-title']);
+		$this->see('Configuration saved.', ['id' => 'system-message-container']);
 	}
 
 	/**
@@ -326,7 +384,9 @@ public function setErrorReportingToDevelopment()
 	 *
 	 * @deprecated  since Joomla 3.4.4-dev. Use installExtensionFromFolder($path, $type = 'Extension') instead.
 	 *
-	 * @return      void
+	 * @return   void
+	 *
+	 * @since    3.0.0
 	 */
 	public function installExtensionFromDirectory($path, $type = 'Extension')
 	{
@@ -343,17 +403,19 @@ public function installExtensionFromDirectory($path, $type = 'Extension')
 	 * {@internal doAdminLogin() before}
 	 *
 	 * @return    void
+	 *
+	 * @since    3.0.0
 	 */
 	public function installExtensionFromFolder($path, $type = 'Extension')
 	{
-		$I = $this;
-		$I->amOnPage('/administrator/index.php?option=com_installer');
-		$I->waitForText('Extensions: Install', '30', ['css' => 'H1']);
-		$I->click(['link' => 'Install from Folder']);
+
+		$this->amOnPage('/administrator/index.php?option=com_installer');
+		$this->waitForText('Extensions: Install', '30', ['css' => 'H1']);
+		$this->click(['link' => 'Install from Folder']);
 		$this->debug('I enter the Path');
-		$I->fillField(['id' => 'install_directory'], $path);
-		$I->click(['id' => 'installbutton_directory']);
-		$I->waitForText('was successful', '60', ['id' => 'system-message-container']);
+		$this->fillField(['id' => 'install_directory'], $path);
+		$this->click(['id' => 'installbutton_directory']);
+		$this->waitForText('was successful', 'TIMEOUT', ['id' => 'system-message-container']);
 		$this->debug("$type successfully installed from $path");
 	}
 
@@ -366,17 +428,18 @@ public function installExtensionFromFolder($path, $type = 'Extension')
 	 * {@internal doAdminLogin() before}
 	 *
 	 * @return    void
+	 *
+	 * @since    3.0.0
 	 */
 	public function installExtensionFromUrl($url, $type = 'Extension')
 	{
-		$I = $this;
-		$I->amOnPage('/administrator/index.php?option=com_installer');
-		$I->waitForText('Extensions: Install', '30', ['css' => 'H1']);
-		$I->click(['link' => 'Install from URL']);
+		$this->amOnPage('/administrator/index.php?option=com_installer');
+		$this->waitForText('Extensions: Install', '30', ['css' => 'H1']);
+		$this->click(['link' => 'Install from URL']);
 		$this->debug('I enter the url');
-		$I->fillField(['id' => 'install_url'], $url);
-		$I->click(['id' => 'installbutton_url']);
-		$I->waitForText('was successful', '30', ['id' => 'system-message-container']);
+		$this->fillField(['id' => 'install_url'], $url);
+		$this->click(['id' => 'installbutton_url']);
+		$this->waitForText('was successful', '30', ['id' => 'system-message-container']);
 
 		if ($type == 'Extension')
 		{
@@ -402,23 +465,23 @@ public function installExtensionFromUrl($url, $type = 'Extension')
 	 * {@internal doAdminLogin() before}
 	 *
 	 * @return    void
+	 *
+	 * @since    3.0.0
 	 */
 	public function checkForPhpNoticesOrWarnings($page = null)
 	{
-		$I = $this;
-
 		if ($page)
 		{
-			$I->amOnPage($page);
+			$this->amOnPage($page);
 		}
 
-		$I->dontSeeInPageSource('Notice:');
-		$I->dontSeeInPageSource('<b>Notice</b>:');
-		$I->dontSeeInPageSource('Warning:');
-		$I->dontSeeInPageSource('<b>Warning</b>:');
-		$I->dontSeeInPageSource('Strict standards:');
-		$I->dontSeeInPageSource('<b>Strict standards</b>:');
-		$I->dontSeeInPageSource('The requested page can\'t be found');
+		$this->dontSeeInPageSource('Notice:');
+		$this->dontSeeInPageSource('<b>Notice</b>:');
+		$this->dontSeeInPageSource('Warning:');
+		$this->dontSeeInPageSource('<b>Warning</b>:');
+		$this->dontSeeInPageSource('Strict standards:');
+		$this->dontSeeInPageSource('<b>Strict standards</b>:');
+		$this->dontSeeInPageSource('The requested page can\'t be found');
 	}
 
 	/**
@@ -428,15 +491,17 @@ public function checkForPhpNoticesOrWarnings($page = null)
 	 * @param   string  $option  The text in the <option> to be selected in the chosen radio button
 	 *
 	 * @return  void
+	 *
+	 * @since   3.0.0
 	 */
 	public function selectOptionInRadioField($label, $option)
 	{
-		$I = $this;
-		$I->debug("Trying to select the $option from the $label");
-		$label = $I->findField(['xpath' => "//label[contains(normalize-space(string(.)), '$label')]"]);
+
+		$this->debug("Trying to select the $option from the $label");
+		$label = $this->findField(['xpath' => "//label[contains(normalize-space(string(.)), '$label')]"]);
 		$radioId = $label->getAttribute('for');
 
-		$I->click("//fieldset[@id='$radioId']/label[contains(normalize-space(string(.)), '$option')]");
+		$this->click("//fieldset[@id='$radioId']/label[contains(normalize-space(string(.)), '$option')]");
 	}
 
 	/**
@@ -445,21 +510,23 @@ public function selectOptionInRadioField($label, $option)
 	 * @param   string  $label   The text in the <label> with for attribute that links to the <select> element
 	 * @param   string  $option  The text in the <option> to be selected in the chosen selector
 	 *
-	 * @return void
+	 * @return  void
+	 *
+	 * @since    3.0.0
 	 */
 	public function selectOptionInChosen($label, $option)
 	{
 		$select = $this->findField($label);
 		$selectID = $select->getAttribute('id');
 		$chosenSelectID = $selectID . '_chzn';
-		$I = $this;
+
 		$this->debug("I open the $label chosen selector");
-		$I->click(['xpath' => "//div[@id='$chosenSelectID']/a/div/b"]);
+		$this->click(['xpath' => "//div[@id='$chosenSelectID']/a/div/b"]);
 		$this->debug("I select $option");
-		$I->click(['xpath' => "//div[@id='$chosenSelectID']//li[text()='$option']"]);
+		$this->click(['xpath' => "//div[@id='$chosenSelectID']//li[text()='$option']"]);
 
 		// Gives time to chosen to close
-		$I->wait(1);
+		$this->wait(1);
 	}
 
 	/**
@@ -468,22 +535,24 @@ public function selectOptionInChosen($label, $option)
 	 * @param   string  $label   The text in the <label> with for attribute that links to the <select> element
 	 * @param   string  $option  The text in the <option> to be selected in the chosen selector
 	 *
-	 * @return void
+	 * @return  void
+	 *
+	 * @since    3.0.0
 	 */
 	public function selectOptionInChosenWithTextField($label, $option)
 	{
 		$select = $this->findField($label);
 		$selectID = $select->getAttribute('id');
 		$chosenSelectID = $selectID . '_chzn';
-		$I = $this;
+
 		$this->debug("I open the $label chosen selector");
-		$I->click(['css' => 'div#' . $chosenSelectID]);
+		$this->click(['css' => 'div#' . $chosenSelectID]);
 		$this->debug("I select $option");
-		$I->fillField(['xpath' => "//div[@id='$chosenSelectID']/div/div/input"], $option);
-		$I->click(['xpath' => "//div[@id='$chosenSelectID']/div/ul/li[1]"]);
+		$this->fillField(['xpath' => "//div[@id='$chosenSelectID']/div/div/input"], $option);
+		$this->click(['xpath' => "//div[@id='$chosenSelectID']/div/ul/li[1]"]);
 
 		// Gives time to chosen to close
-		$I->wait(1);
+		$this->wait(1);
 	}
 
 	/**
@@ -497,14 +566,14 @@ public function selectOptionInChosenWithTextField($label, $option)
 	public function selectOptionInChosenById($selectId, $option)
 	{
 		$chosenSelectID = $selectId . '_chzn';
-		$I = $this;
+
 		$this->debug("I open the $chosenSelectID chosen selector");
-		$I->click(['xpath' => "//div[@id='$chosenSelectID']/a/div/b"]);
+		$this->click(['xpath' => "//div[@id='$chosenSelectID']/a/div/b"]);
 		$this->debug("I select $option");
-		$I->click(['xpath' => "//div[@id='$chosenSelectID']//li[text()='$option']"]);
+		$this->click(['xpath' => "//div[@id='$chosenSelectID']//li[text()='$option']"]);
 
 		// Gives time to chosen to close
-		$I->wait(1);
+		$this->wait(1);
 	}
 
 	/**
@@ -513,19 +582,19 @@ public function selectOptionInChosenById($selectId, $option)
 	 * @param   string  $selectId  The id of the <select> element
 	 * @param   string  $option    The text in the <option> to be selected in the chosen selector
 	 *
-	 * @return void
+	 * @return  void
+	 *
+	 * @since    3.0.0
 	 */
 	public function selectOptionInChosenByIdUsingJs($selectId, $option)
 	{
-		$I = $this;
-
 		$option = trim($option);
-		$I->executeJS("jQuery('#$selectId option').filter(function(){ return this.text.trim() === \"$option\" }).prop('selected', true);");
-		$I->executeJS("jQuery('#$selectId').trigger('liszt:updated').trigger('chosen:updated');");
-		$I->executeJS("jQuery('#$selectId').trigger('change');");
+		$this->executeJS("jQuery('#$selectId option').filter(function(){ return this.text.trim() === \"$option\" }).prop('selected', true);");
+		$this->executeJS("jQuery('#$selectId').trigger('liszt:updated').trigger('chosen:updated');");
+		$this->executeJS("jQuery('#$selectId').trigger('change');");
 
 		// Give time to Chosen to update
-		$I->wait(1);
+		$this->wait(1);
 	}
 
 	/**
@@ -534,41 +603,44 @@ public function selectOptionInChosenByIdUsingJs($selectId, $option)
 	 * @param   string  $label    Label of the select field
 	 * @param   array   $options  Array of options to be selected
 	 *
-	 * @return void
+	 * @return  void
+	 *
+	 * @since   3.0.0
 	 */
 	public function selectMultipleOptionsInChosen($label, $options)
 	{
 		$select = $this->findField($label);
 		$selectID = $select->getAttribute('id');
 		$chosenSelectID = $selectID . '_chzn';
-		$I = $this;
+
 
 		foreach ($options as $option)
 		{
 			$this->debug("I open the $label chosen selector");
-			$I->click(['xpath' => "//div[@id='$chosenSelectID']/ul"]);
+			$this->click(['xpath' => "//div[@id='$chosenSelectID']/ul"]);
 			$this->debug("I select $option");
-			$I->click(['xpath' => "//div[@id='$chosenSelectID']//li[contains(text()[normalize-space()], '$option')]"]);
+			$this->click(['xpath' => "//div[@id='$chosenSelectID']//li[contains(text()[normalize-space()], '$option')]"]);
 
 			// Gives time to chosen to close
-			$I->wait(1);
+			$this->wait(1);
 		}
 	}
 
 	/**
 	 * Function to Logout from Administrator Panel in Joomla!
 	 *
-	 * @return void
+	 * @return  void
+	 *
+	 * @since   3.0.0
 	 */
 	public function doAdministratorLogout()
 	{
-		$I = $this;
-		$I->click(['xpath' => "//ul[@class='nav nav-user pull-right']//li//a[@class='dropdown-toggle']"]);
+		$this->click(['xpath' => "//ul[@class='nav nav-user pull-right']//li//a[@class='dropdown-toggle']"]);
 		$this->debug("I click on Top Right corner toggle to Logout from Admin");
-		$I->waitForElement(['xpath' => "//li[@class='dropdown open']/ul[@class='dropdown-menu']//a[text() = 'Logout']"], 60);
-		$I->click(['xpath' => "//li[@class='dropdown open']/ul[@class='dropdown-menu']//a[text() = 'Logout']"]);
-		$I->waitForElement(['id' => 'mod-login-username'], 60);
-		$I->waitForText('Log in', 60, ['xpath' => "//fieldset[@class='loginform']//button"]);
+		$this->waitForElement(['xpath' => "//li[@class='dropdown open']/ul[@class='dropdown-menu']//a[text() = 'Logout']"], TIMEOUT);
+		$this->click(['xpath' => "//li[@class='dropdown open']/ul[@class='dropdown-menu']//a[text() = 'Logout']"]);
+		$this->waitForElement(['id' => 'mod-login-username'], TIMEOUT);
+		$this->waitForText('Log in', TIMEOUT, ['xpath' => "//fieldset[@class='loginform']//button"]);
 	}
 
 	/**
@@ -576,20 +648,21 @@ public function doAdministratorLogout()
 	 *
 	 * @param   String  $pluginName  Name of the Plugin
 	 *
-	 * @return void
+	 * @return  void
+	 *
+	 * @since   3.0.0
 	 */
 	public function enablePlugin($pluginName)
 	{
-		$I = $this;
-		$I->amOnPage('/administrator/index.php?option=com_plugins');
+		$this->amOnPage('/administrator/index.php?option=com_plugins');
 		$this->debug('I check for Notices and Warnings');
 		$this->checkForPhpNoticesOrWarnings();
-		$I->searchForItem($pluginName);
-		$I->waitForElement($this->searchResultPluginName($pluginName), 30);
-		$I->checkExistenceOf($pluginName);
-		$I->click(['xpath' => "//input[@id='cb0']"]);
-		$I->click(['xpath' => "//div[@id='toolbar-publish']/button"]);
-		$I->see(' enabled', ['id' => 'system-message-container']);
+		$this->searchForItem($pluginName);
+		$this->waitForElement($this->searchResultPluginName($pluginName), 30);
+		$this->checkExistenceOf($pluginName);
+		$this->click(['xpath' => "//input[@id='cb0']"]);
+		$this->click(['xpath' => "//div[@id='toolbar-publish']/button"]);
+		$this->see(' enabled', ['id' => 'system-message-container']);
 	}
 
 	/**
@@ -597,7 +670,9 @@ public function enablePlugin($pluginName)
 	 *
 	 * @param   String  $pluginName  Name of the Plugin
 	 *
-	 * @return string
+	 * @return  string
+	 *
+	 * @since   3.0.0
 	 */
 	private function searchResultPluginName($pluginName)
 	{
@@ -612,26 +687,27 @@ private function searchResultPluginName($pluginName)
 	 * @param   string  $extensionName  Is important to use a specific
 	 *
 	 * @return  void
+	 *
+	 * @since   3.0.0
 	 */
 	public function uninstallExtension($extensionName)
 	{
-		$I = $this;
-		$I->amOnPage('/administrator/index.php?option=com_installer&view=manage');
-		$I->waitForText('Extensions: Manage', '30', ['css' => 'H1']);
-		$I->searchForItem($extensionName);
-		$I->waitForElement(['id' => 'manageList'], '30');
-		$I->click(['xpath' => "//input[@id='cb0']"]);
-		$I->click(['xpath' => "//div[@id='toolbar-delete']/button"]);
-		$I->acceptPopup();
-		$I->waitForText('was successful', '30', ['id' => 'system-message-container']);
-		$I->see('was successful', ['id' => 'system-message-container']);
-		$I->searchForItem($extensionName);
-		$I->waitForText(
+		$this->amOnPage('/administrator/index.php?option=com_installer&view=manage');
+		$this->waitForText('Extensions: Manage', '30', ['css' => 'H1']);
+		$this->searchForItem($extensionName);
+		$this->waitForElement(['id' => 'manageList'], '30');
+		$this->click(['xpath' => "//input[@id='cb0']"]);
+		$this->click(['xpath' => "//div[@id='toolbar-delete']/button"]);
+		$this->acceptPopup();
+		$this->waitForText('was successful', '30', ['id' => 'system-message-container']);
+		$this->see('was successful', ['id' => 'system-message-container']);
+		$this->searchForItem($extensionName);
+		$this->waitForText(
 			'There are no extensions installed matching your query.',
-			60,
+			TIMEOUT,
 			['class' => 'alert-no-items']
 		);
-		$I->see('There are no extensions installed matching your query.', ['class' => 'alert-no-items']);
+		$this->see('There are no extensions installed matching your query.', ['class' => 'alert-no-items']);
 		$this->debug('Extension successfully uninstalled');
 	}
 
@@ -641,22 +717,22 @@ public function uninstallExtension($extensionName)
 	 * @param   String  $name  Name of the Item which we need to Search
 	 *
 	 * @return void
+	 *
+	 * @since   3.0.0
 	 */
 	public function searchForItem($name = null)
 	{
-		$I = $this;
-
 		if ($name)
 		{
-			$I->debug("Searching for $name");
-			$I->fillField(['id' => "filter_search"], $name);
-			$I->click(['xpath' => "//button[@type='submit' and @data-original-title='Search']"]);
-		}
-		else
-		{
-			$I->debug('clearing search filter');
-			$I->click(['xpath' => "//button[@type='button' and @data-original-title='Clear']"]);
+			$this->debug("Searching for $name");
+			$this->fillField(['id' => "filter_search"], $name);
+			$this->click(['xpath' => "//button[@type='submit' and @data-original-title='Search']"]);
+			
+			return;
 		}
+
+		$this->debug('clearing search filter');
+		$this->click(['xpath' => "//button[@type='button' and @data-original-title='Clear']"]);
 	}
 
 	/**
@@ -671,10 +747,9 @@ public function searchForItem($name = null)
 	 */
 	public function checkExistenceOf($name)
 	{
-		$I = $this;
-		$I->debug("Verifying if $name exist in search result");
-		$I->seeElement(['xpath' => "//form[@id='adminForm']/div/table/tbody"]);
-		$I->see($name, ['xpath' => "//form[@id='adminForm']/div/table/tbody"]);
+		$this->debug("Verifying if $name exist in search result");
+		$this->seeElement(['xpath' => "//form[@id='adminForm']/div/table/tbody"]);
+		$this->see($name, ['xpath' => "//form[@id='adminForm']/div/table/tbody"]);
 	}
 
 	/**
@@ -686,9 +761,9 @@ public function checkExistenceOf($name)
 	 */
 	public function checkAllResults()
 	{
-		$I = $this;
+
 		$this->debug("Selecting Checkall button");
-		$I->click(['xpath' => "//thead//input[@name='checkall-toggle' or @name='toggle']"]);
+		$this->click(['xpath' => "//thead//input[@name='checkall-toggle' or @name='toggle']"]);
 	}
 
 	/**
@@ -700,19 +775,19 @@ public function checkAllResults()
 	 */
 	public function installLanguage($languageName)
 	{
-		$I = $this;
-		$I->amOnPage('administrator/index.php?option=com_installer&view=languages');
+
+		$this->amOnPage('administrator/index.php?option=com_installer&view=languages');
 		$this->debug('I check for Notices and Warnings');
 		$this->checkForPhpNoticesOrWarnings();
 		$this->debug('Refreshing languages');
-		$I->click(['xpath' => "//div[@id='toolbar-refresh']/button"]);
-		$I->waitForElement(['id' => 'j-main-container'], 30);
-		$I->searchForItem($languageName);
-		$I->waitForElement($this->searchResultLanguageName($languageName), 30);
-		$I->click(['id' => "cb0"]);
-		$I->click(['xpath' => "//div[@id='toolbar-upload']/button"]);
-		$I->waitForText('was successful.', 60, ['id' => 'system-message-container']);
-		$I->see('No Matching Results', ['class' => 'alert-no-items']);
+		$this->click(['xpath' => "//div[@id='toolbar-refresh']/button"]);
+		$this->waitForElement(['id' => 'j-main-container'], 30);
+		$this->searchForItem($languageName);
+		$this->waitForElement($this->searchResultLanguageName($languageName), 30);
+		$this->click(['id' => "cb0"]);
+		$this->click(['xpath' => "//div[@id='toolbar-upload']/button"]);
+		$this->waitForText('was successful.', TIMEOUT, ['id' => 'system-message-container']);
+		$this->see('No Matching Results', ['class' => 'alert-no-items']);
 		$this->debug($languageName . ' successfully installed');
 	}
 
@@ -740,16 +815,15 @@ private function searchResultLanguageName($languageName)
 	 */
 	public function setModulePosition($module, $position = 'position-7')
 	{
-		$I = $this;
-		$I->amOnPage('administrator/index.php?option=com_modules');
-		$I->searchForItem($module);
-		$I->click(['link' => $module]);
-		$I->waitForText("Modules: $module", 30, ['css' => 'h1.page-title']);
-		$I->click(['link' => 'Module']);
-		$I->waitForElement(['id' => 'general'], 30);
-		$I->selectOptionInChosen('Position', $position);
-		$I->click(['xpath' => "//div[@id='toolbar-apply']/button"]);
-		$I->waitForText('Module saved', 30, ['id' => 'system-message-container']);
+		$this->amOnPage('administrator/index.php?option=com_modules');
+		$this->searchForItem($module);
+		$this->click(['link' => $module]);
+		$this->waitForText("Modules: $module", 30, ['css' => 'h1.page-title']);
+		$this->click(['link' => 'Module']);
+		$this->waitForElement(['id' => 'general'], 30);
+		$this->selectOptionInChosen('Position', $position);
+		$this->click(['xpath' => "//div[@id='toolbar-apply']/button"]);
+		$this->waitForText('Module saved', 30, ['id' => 'system-message-container']);
 	}
 
 	/**
@@ -758,15 +832,15 @@ public function setModulePosition($module, $position = 'position-7')
 	 * @param   string  $module  The full name of the module
 	 *
 	 * @return  void
+	 * @since   3.0.0
 	 */
 	public function publishModule($module)
 	{
-		$I = $this;
-		$I->amOnPage('administrator/index.php?option=com_modules');
-		$I->searchForItem($module);
-		$I->checkAllResults();
-		$I->click(['xpath' => "//div[@id='toolbar-publish']/button"]);
-		$I->waitForText(' published.', 30, ['id' => 'system-message-container']);
+		$this->amOnPage('administrator/index.php?option=com_modules');
+		$this->searchForItem($module);
+		$this->checkAllResults();
+		$this->click(['xpath' => "//div[@id='toolbar-publish']/button"]);
+		$this->waitForText(' published.', 30, ['id' => 'system-message-container']);
 	}
 
 	/**
@@ -775,20 +849,20 @@ public function publishModule($module)
 	 * @param   string  $module  The full name of the module
 	 *
 	 * @return  void
+	 * @since   3.0.0
 	 */
 	public function displayModuleOnAllPages($module)
 	{
-		$I = $this;
-		$I->amOnPage('administrator/index.php?option=com_modules');
-		$I->searchForItem($module);
-		$I->click(['link' => $module]);
-		$I->waitForElement(['link' => 'Menu Assignment'], 30);
-		$I->click(['link' => 'Menu Assignment']);
-		$I->waitForElement(['id' => 'jform_menus-lbl'], 30);
-		$I->click(['id' => 'jform_assignment_chzn']);
-		$I->click(['xpath' => "//li[@data-option-array-index='0']"]);
-		$I->click(['xpath' => "//div[@id='toolbar-apply']/button"]);
-		$I->waitForText('Module saved', 30, ['id' => 'system-message-container']);
+		$this->amOnPage('administrator/index.php?option=com_modules');
+		$this->searchForItem($module);
+		$this->click(['link' => $module]);
+		$this->waitForElement(['link' => 'Menu Assignment'], 30);
+		$this->click(['link' => 'Menu Assignment']);
+		$this->waitForElement(['id' => 'jform_menus-lbl'], 30);
+		$this->click(['id' => 'jform_assignment_chzn']);
+		$this->click(['xpath' => "//li[@data-option-array-index='0']"]);
+		$this->click(['xpath' => "//div[@id='toolbar-apply']/button"]);
+		$this->waitForText('Module saved', 30, ['id' => 'system-message-container']);
 	}
 
 	/**
@@ -797,65 +871,65 @@ public function displayModuleOnAllPages($module)
 	 * @param   string  $button  The full name of the button
 	 *
 	 * @return  void
+	 * @since   3.0.0
 	 */
 	public function clickToolbarButton($button)
 	{
-		$I = $this;
 		$input = strtolower($button);
 
 		$screenSize = explode("x", $this->config['window_size']);
 
 		if ($screenSize[0] <= 480)
 		{
-			$I->click('Toolbar');
+			$this->click('Toolbar');
 		}
 
 		switch ($input)
 		{
 			case "new":
-				$I->click(['xpath' => "//div[@id='toolbar-new']//button"]);
+				$this->click(['xpath' => "//div[@id='toolbar-new']//button"]);
 				break;
 			case "edit":
-				$I->click(['xpath' => "//div[@id='toolbar-edit']//button"]);
+				$this->click(['xpath' => "//div[@id='toolbar-edit']//button"]);
 				break;
 			case "publish":
-				$I->click(['xpath' => "//div[@id='toolbar-publish']//button"]);
+				$this->click(['xpath' => "//div[@id='toolbar-publish']//button"]);
 				break;
 			case "unpublish":
-				$I->click(['xpath' => "//div[@id='toolbar-unpublish']//button"]);
+				$this->click(['xpath' => "//div[@id='toolbar-unpublish']//button"]);
 				break;
 			case "archive":
-				$I->click(['xpath' => "//div[@id='toolbar-archive']//button"]);
+				$this->click(['xpath' => "//div[@id='toolbar-archive']//button"]);
 				break;
 			case "check-in":
-				$I->click(['xpath' => "//div[@id='toolbar-checkin']//button"]);
+				$this->click(['xpath' => "//div[@id='toolbar-checkin']//button"]);
 				break;
 			case "batch":
-				$I->click(['xpath' => "//div[@id='toolbar-batch']//button"]);
+				$this->click(['xpath' => "//div[@id='toolbar-batch']//button"]);
 				break;
 			case "rebuild":
-				$I->click(['xpath' => "//div[@id='toolbar-refresh']//button"]);
+				$this->click(['xpath' => "//div[@id='toolbar-refresh']//button"]);
 				break;
 			case "trash":
-				$I->click(['xpath' => "//div[@id='toolbar-trash']//button"]);
+				$this->click(['xpath' => "//div[@id='toolbar-trash']//button"]);
 				break;
 			case "save":
-				$I->click(['xpath' => "//div[@id='toolbar-apply']//button"]);
+				$this->click(['xpath' => "//div[@id='toolbar-apply']//button"]);
 				break;
 			case "save & close":
-				$I->click(['xpath' => "//div[@id='toolbar-save']//button"]);
+				$this->click(['xpath' => "//div[@id='toolbar-save']//button"]);
 				break;
 			case "save & new":
-				$I->click(['xpath' => "//div[@id='toolbar-save-new']//button"]);
+				$this->click(['xpath' => "//div[@id='toolbar-save-new']//button"]);
 				break;
 			case "cancel":
-				$I->click(['xpath' => "//div[@id='toolbar-cancel']//button"]);
+				$this->click(['xpath' => "//div[@id='toolbar-cancel']//button"]);
 				break;
 			case "options":
-				$I->click(['xpath' => "//div[@id='toolbar-options']//button"]);
+				$this->click(['xpath' => "//div[@id='toolbar-options']//button"]);
 				break;
 			case "empty trash":
-				$I->click(['xpath' => "//div[@id='toolbar-delete']//button"]);
+				$this->click(['xpath' => "//div[@id='toolbar-delete']//button"]);
 				break;
 		}
 	}
@@ -870,54 +944,54 @@ public function clickToolbarButton($button)
 	 * @param   string  $language      If you are using Multilingual feature, the language for the menu
 	 *
 	 * @return  void
+	 *
+	 * @since   3.0.0
 	 */
 	public function createMenuItem($menuTitle, $menuCategory, $menuItem, $menu = 'Main Menu', $language = 'All')
 	{
-		$I = $this;
-
-		$I->debug("I open the menus page");
-		$I->amOnPage('administrator/index.php?option=com_menus&view=menus');
-		$I->waitForText('Menus', '60', ['css' => 'H1']);
+		$this->debug("I open the menus page");
+		$this->amOnPage('administrator/index.php?option=com_menus&view=menus');
+		$this->waitForText('Menus', 'TIMEOUT', ['css' => 'H1']);
 		$this->checkForPhpNoticesOrWarnings();
 
-		$I->debug("I click in the menu: $menu");
-		$I->click(['link' => $menu]);
-		$I->waitForText('Menus: Items', '60', ['css' => 'H1']);
+		$this->debug("I click in the menu: $menu");
+		$this->click(['link' => $menu]);
+		$this->waitForText('Menus: Items', 'TIMEOUT', ['css' => 'H1']);
 		$this->checkForPhpNoticesOrWarnings();
 
-		$I->debug("I click new");
-		$I->click("New");
-		$I->waitForText('Menus: New Item', '60', ['css' => 'h1']);
+		$this->debug("I click new");
+		$this->click("New");
+		$this->waitForText('Menus: New Item', 'TIMEOUT', ['css' => 'h1']);
 		$this->checkForPhpNoticesOrWarnings();
-		$I->fillField(['id' => 'jform_title'], $menuTitle);
+		$this->fillField(['id' => 'jform_title'], $menuTitle);
 
-		$I->debug("Open the menu types iframe");
-		$I->click(['link' => "Select"]);
-		$I->waitForElement(['id' => 'menuTypeModal'], '60');
-		$I->wait(1);
-		$I->switchToIFrame("Menu Item Type");
+		$this->debug("Open the menu types iframe");
+		$this->click(['link' => "Select"]);
+		$this->waitForElement(['id' => 'menuTypeModal'], 'TIMEOUT');
+		$this->wait(1);
+		$this->switchToIFrame("Menu Item Type");
 
-		$I->debug("Open the menu category: $menuCategory");
+		$this->debug("Open the menu category: $menuCategory");
 
 		// Open the category
-		$I->wait(1);
-		$I->waitForElement(['link' => $menuCategory], '60');
-		$I->click(['link' => $menuCategory]);
-
-		$I->debug("Choose the menu item type: $menuItem");
-		$I->wait(1);
-		$I->waitForElement(['xpath' => "//a[contains(text()[normalize-space()], '$menuItem')]"], '60');
-		$I->click(['xpath' => "//div[@id='collapseTypes']//a[contains(text()[normalize-space()], '$menuItem')]"]);
-		$I->debug('I switch back to the main window');
-		$I->switchToIFrame();
-		$I->debug('I leave time to the iframe to close');
-		$I->wait(2);
-		$I->selectOptionInChosen('Language', $language);
-		$I->waitForText('Menus: New Item', '30', ['css' => 'h1']);
-		$I->debug('I save the menu');
-		$I->click("Save");
-
-		$I->waitForText('Menu item saved', '60', ['id' => 'system-message-container']);
+		$this->wait(1);
+		$this->waitForElement(['link' => $menuCategory], 'TIMEOUT');
+		$this->click(['link' => $menuCategory]);
+
+		$this->debug("Choose the menu item type: $menuItem");
+		$this->wait(1);
+		$this->waitForElement(['xpath' => "//a[contains(text()[normalize-space()], '$menuItem')]"], 'TIMEOUT');
+		$this->click(['xpath' => "//div[@id='collapseTypes']//a[contains(text()[normalize-space()], '$menuItem')]"]);
+		$this->debug('I switch back to the main window');
+		$this->switchToIFrame();
+		$this->debug('I leave time to the iframe to close');
+		$this->wait(2);
+		$this->selectOptionInChosen('Language', $language);
+		$this->waitForText('Menus: New Item', '30', ['css' => 'h1']);
+		$this->debug('I save the menu');
+		$this->click("Save");
+
+		$this->waitForText('Menu item successfully saved', 'TIMEOUT', ['id' => 'system-message-container']);
 	}
 
 	/**
@@ -926,11 +1000,14 @@ public function createMenuItem($menuTitle, $menuCategory, $menuItem, $menu = 'Ma
 	 * @param   string  $label  Label of the Filter you want to use.
 	 * @param   string  $value  Value you want to set in the filters.
 	 *
-	 * @return void
+	 * @return  void
+	 *
+	 * @since   3.0.0
 	 */
 	public function setFilter($label, $value)
 	{
 		$label = strtolower($label);
+
 		$filters = array(
 			"select status" 	=> "filter_published",
 			"select access"		=> "filter_access",
@@ -939,37 +1016,38 @@ public function setFilter($label, $value)
 			"select max levels"	=> "filter_level"
 		);
 
-		$I = $this;
-		$I->click(['xpath' => "//button[@data-original-title='Filter the list items.']"]);
-		$I->debug('I try to select the filters');
+		$this->click(['xpath' => "//button[@data-original-title='Filter the list items.']"]);
+		$this->debug('I try to select the filters');
 
 		foreach ($filters as $fieldName => $id)
 		{
 			if ($fieldName == $label)
 			{
-				$I->selectOptionInChosenByIdUsingJs($id, $value);
+				$this->selectOptionInChosenByIdUsingJs($id, $value);
 			}
 		}
 
-		$I->debug('Applied filters');
+		$this->debug('Applied filters');
 	}
 
 	/**
 	 * Function to Verify the Tabs on a Joomla! screen
 	 *
-	 * @param   Array  $expectedTabs  Expected Tabs on the Page
+	 * @param   array  $expectedTabs  Expected Tabs on the Page
 	 * @param   Mixed  $tabsLocator   Locator for the Tabs in Edit View
 	 *
-	 * @return void
+	 * @return  void
+	 *
+	 * @since   3.0.0
 	 */
 	public function verifyAvailableTabs($expectedTabs, $tabsLocator = ['xpath' => "//ul[@id='myTabTabs']/li/a"])
 	{
-		$I = $this;
-		$actualArrayOfTabs = $I->grabMultiple($tabsLocator);
-		$I->debug("Fetch the current list of Tabs in the edit view which is: " . implode(", ", $actualArrayOfTabs));
-		$url = $I->grabFromCurrentUrl();
-		$I->assertEquals($expectedTabs, $actualArrayOfTabs, "Tab Labels do not match on edit view of" . $url);
-		$I->debug('Verify the Tabs');
+		$actualArrayOfTabs = $this->grabMultiple($tabsLocator);
+
+		$this->debug("Fetch the current list of Tabs in the edit view which is: " . implode(", ", $actualArrayOfTabs));
+		$url = $this->grabFromCurrentUrl();
+		$this->assertEquals($expectedTabs, $actualArrayOfTabs, "Tab Labels do not match on edit view of" . $url);
+		$this->debug('Verify the Tabs');
 	}
 
 	/**
@@ -977,14 +1055,15 @@ public function verifyAvailableTabs($expectedTabs, $tabsLocator = ['xpath' => "/
 	 *
 	 * {@internal doAdminLogin() before}
 	 *
-	 * @return void
+	 * @return  void
+	 *
+	 * @since   3.5.0
 	 */
 	public function disableStatistics()
 	{
-		$I = $this;
 		$this->debug('I click on never');
-		$I->wait(1);
-		$I->waitForElement(['link' => 'Never'], 60);
-		$I->click(['link' => 'Never']);
+		$this->wait(1);
+		$this->waitForElement(['link' => 'Never'], TIMEOUT);
+		$this->click(['link' => 'Never']);
 	}
 }
diff --git a/src/locator/Locators.php b/src/locator/Locators.php
new file mode 100644
index 0000000..8e41fd3
--- /dev/null
+++ b/src/locator/Locators.php
@@ -0,0 +1,108 @@
+<?php
+namespace Codeception\Module\Locators;
+
+/**
+ * Joomla Browser Locator class to hold selector value for the default theme
+ *
+ * Class Locators
+ *
+ * @since  3.7.4.2
+ */
+class Locators
+{
+	/**
+	 * Locator for the username field
+	 *
+	 * @var    array
+	 * @since  3.7.4.2
+	 */
+	public $loginUserName = ['id' => 'username'];
+
+	/**
+	 * Locator for the Password field
+	 *
+	 * @var    array
+	 * @since  3.7.4.2
+	 */
+	public $loginPassword = ['id' => 'password'];
+
+	/**
+	 * Locator for the Login Button
+	 *
+	 * @var    array
+	 * @since  3.7.4.2
+	 */
+	public $loginButton = ['xpath' => "//div[@class='login']/form/fieldset/div[4]/div/button"];
+
+	/**
+	 * Locator for the Logout Button
+	 * 
+	 * @var    array
+	 * @since  3.7.4.2
+	 */
+	public $frontEndLoginSuccess = ['xpath' => "//form[@id='login-form']/div[@class='logout-button']"];
+
+	/**
+	 * Locator for the Logout Button
+	 * 
+	 * @var    array
+	 * @since  3.7.4.2
+	 */
+	public $frontEndLogoutButton = ['xpath' => "//div[@class='logout']//button[contains(text(), 'Log out')]"];
+
+	/**
+	 * Locator for the Login Button
+	 * 
+	 * @var    array
+	 * @since  3.7.4.2
+	 */
+	public $frontEndLoginForm = ['xpath' => "//div[@class='login']//button[contains(text(), 'Log in')]"];
+
+	/**
+	 * Locator for the Login Page Url
+	 * 
+	 * @var    array
+	 * @since  3.7.4.2
+	 */
+	public $adminLoginPageUrl = '/administrator/index.php';
+
+	/**
+	 * Locator for the administrator username field
+	 * 
+	 * @var    array
+	 * @since  3.7.4.2
+	 */
+	public $adminLoginUserName = ['id' => 'mod-login-username'];
+
+	/**
+	 * Locator for the admin password field
+	 * 
+	 * @var    array
+	 * @since  3.7.4.2
+	 */
+	public $adminLoginPassword = ['id' => 'mod-login-password'];
+
+	/**
+	 * Locator for the Login Button
+	 * 
+	 * @var    array
+	 * @since  3.7.4.2
+	 */
+	public $adminLoginButton = ['xpath' => "//button[contains(normalize-space(), 'Log in')]"];
+
+	/**
+	 * Locator for the Control Panel
+	 * 
+	 * @var    array
+	 * @since  3.7.4.2
+	 */
+	public $controlPanelLocator = ['css' => 'h1.page-title'];
+
+	/**
+	 * Locator for the Login URL
+	 * 
+	 * @var    array
+	 * @since  3.7.4.2
+	 */
+	public $frontEndLoginUrl = '/index.php?option=com_users&view=login';
+}