Index: branches/5.3.x/core/kernel/Console/Command/AbstractCommand.php
===================================================================
diff -u -N -r16282 -r16283
--- branches/5.3.x/core/kernel/Console/Command/AbstractCommand.php	(.../AbstractCommand.php)	(revision 16282)
+++ branches/5.3.x/core/kernel/Console/Command/AbstractCommand.php	(.../AbstractCommand.php)	(revision 16283)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: AbstractCommand.php 16282 2015-09-27 11:12:52Z alex $
+* @version	$Id: AbstractCommand.php 16283 2015-09-27 11:22:39Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2015 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -16,14 +16,16 @@
 
 
 use InPortal\Core\kernel\Console\ConsoleApplication;
+use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
+use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 use InPortal\Core\kernel\Console\ConsoleIO;
 use Symfony\Component\Console\Command\Command as SymfonyCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 defined('FULL_PATH') or die('restricted access!');
 
-abstract class AbstractCommand extends SymfonyCommand implements IConsoleCommand
+abstract class AbstractCommand extends SymfonyCommand implements IConsoleCommand, CompletionAwareInterface
 {
 
 	/**
@@ -66,6 +68,36 @@
 	}
 
 	/**
+	 * Return possible values for the named option
+	 *
+	 * @param string            $optionName Option name.
+	 * @param CompletionContext $context    Completion context.
+	 *
+	 * @return array
+	 */
+	public function completeOptionValues($optionName, CompletionContext $context)
+	{
+		$this->initDependencies();
+
+		return array();
+	}
+
+	/**
+	 * Return possible values for the named argument
+	 *
+	 * @param string            $argumentName Argument name.
+	 * @param CompletionContext $context      Completion context.
+	 *
+	 * @return array
+	 */
+	public function completeArgumentValues($argumentName, CompletionContext $context)
+	{
+		$this->initDependencies();
+
+		return array();
+	}
+
+	/**
 	 * Perform additional validation of the input.
 	 *
 	 * @param InputInterface  $input  An InputInterface instance.
@@ -85,6 +117,18 @@
 
 		// Don't use factory because of "classmap:rebuild" command.
 		$this->io = new ConsoleIO($input, $output, $this->getHelperSet());
+
+		$this->initDependencies();
 	}
 
+	/**
+	 * Initializes dependencies.
+	 *
+	 * @return void
+	 */
+	protected function initDependencies()
+	{
+
+	}
+
 }
Index: branches/5.3.x/core/kernel/Console/Command/RunEventCommand.php
===================================================================
diff -u -N -r16282 -r16283
--- branches/5.3.x/core/kernel/Console/Command/RunEventCommand.php	(.../RunEventCommand.php)	(revision 16282)
+++ branches/5.3.x/core/kernel/Console/Command/RunEventCommand.php	(.../RunEventCommand.php)	(revision 16283)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: RunEventCommand.php 16282 2015-09-27 11:12:52Z alex $
+* @version	$Id: RunEventCommand.php 16283 2015-09-27 11:22:39Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2015 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -15,15 +15,14 @@
 namespace InPortal\Core\kernel\Console\Command;
 
 
-use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 defined('FULL_PATH') or die('restricted access!');
 
-class RunEventCommand extends AbstractCommand implements CompletionAwareInterface
+class RunEventCommand extends AbstractCommand
 {
 
 	/**
@@ -62,19 +61,6 @@
 	}
 
 	/**
-	 * Return possible values for the named option
-	 *
-	 * @param string            $optionName Option name.
-	 * @param CompletionContext $context    Completion context.
-	 *
-	 * @return array
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context)
-	{
-		return array();
-	}
-
-	/**
 	 * Return possible values for the named argument.
 	 *
 	 * @param string            $argumentName Argument name.
@@ -84,6 +70,8 @@
 	 */
 	public function completeArgumentValues($argumentName, CompletionContext $context)
 	{
+		$suggestions = parent::completeArgumentValues($argumentName, $context);
+
 		if ( $argumentName === 'event_name' ) {
 			$event_name = $context->getCurrentWord();
 
@@ -120,7 +108,7 @@
 			return $suggestions;
 		}
 
-		return array();
+		return $suggestions;
 	}
 
 }
Index: branches/5.3.x/core/kernel/Console/Command/BuildClassMapCommand.php
===================================================================
diff -u -N -r16282 -r16283
--- branches/5.3.x/core/kernel/Console/Command/BuildClassMapCommand.php	(.../BuildClassMapCommand.php)	(revision 16282)
+++ branches/5.3.x/core/kernel/Console/Command/BuildClassMapCommand.php	(.../BuildClassMapCommand.php)	(revision 16283)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: BuildClassMapCommand.php 16282 2015-09-27 11:12:52Z alex $
+* @version	$Id: BuildClassMapCommand.php 16283 2015-09-27 11:22:39Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2015 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -16,15 +16,14 @@
 
 
 use InPortal\Core\kernel\utility\ClassDiscovery\ClassMapBuilder;
-use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 defined('FULL_PATH') or die('restricted access!');
 
-class BuildClassMapCommand extends AbstractCommand implements CompletionAwareInterface
+class BuildClassMapCommand extends AbstractCommand
 {
 
 	/**
@@ -101,11 +100,13 @@
 	 */
 	public function completeOptionValues($optionName, CompletionContext $context)
 	{
+		$suggestions = parent::completeOptionValues($optionName, $context);
+
 		if ( $optionName === 'module' ) {
 			return $this->getModules();
 		}
 
-		return array();
+		return $suggestions;
 	}
 
 	/**
@@ -120,17 +121,4 @@
 		return array_diff($modules, array('In-Portal'));
 	}
 
-	/**
-	 * Return possible values for the named argument.
-	 *
-	 * @param string            $argumentName Argument name.
-	 * @param CompletionContext $context      Completion context.
-	 *
-	 * @return array
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context)
-	{
-		return array();
-	}
-
 }
Index: branches/5.3.x/core/install/cache/class_structure.php
===================================================================
diff -u -N -r16282 -r16283
--- branches/5.3.x/core/install/cache/class_structure.php	(.../class_structure.php)	(revision 16282)
+++ branches/5.3.x/core/install/cache/class_structure.php	(.../class_structure.php)	(revision 16283)
@@ -846,14 +846,14 @@
 			'extends' => array(
 				0 => 'Symfony\\Component\\Console\\Command\\Command',
 				1 => 'InPortal\\Core\\kernel\\Console\\Command\\IConsoleCommand',
+				2 => 'Stecman\\Component\\Symfony\\Console\\BashCompletion\\Completion\\CompletionAwareInterface',
 			),
 		),
 		'InPortal\\Core\\kernel\\Console\\Command\\BuildClassMapCommand' => array(
 			'type' => 1,
 			'modifiers' => 0,
 			'extends' => array(
 				0 => 'InPortal\\Core\\kernel\\Console\\Command\\AbstractCommand',
-				1 => 'Stecman\\Component\\Symfony\\Console\\BashCompletion\\Completion\\CompletionAwareInterface',
 			),
 		),
 		'InPortal\\Core\\kernel\\Console\\Command\\CompletionCommand' => array(
@@ -879,15 +879,13 @@
 			'modifiers' => 0,
 			'extends' => array(
 				0 => 'InPortal\\Core\\kernel\\Console\\Command\\AbstractCommand',
-				1 => 'Stecman\\Component\\Symfony\\Console\\BashCompletion\\Completion\\CompletionAwareInterface',
 			),
 		),
 		'InPortal\\Core\\kernel\\Console\\Command\\RunScheduledTaskCommand' => array(
 			'type' => 1,
 			'modifiers' => 0,
 			'extends' => array(
 				0 => 'InPortal\\Core\\kernel\\Console\\Command\\AbstractCommand',
-				1 => 'Stecman\\Component\\Symfony\\Console\\BashCompletion\\Completion\\CompletionAwareInterface',
 			),
 		),
 		'InPortal\\Core\\kernel\\Console\\ConsoleApplication' => array(
Index: branches/5.3.x/core/kernel/Console/Command/RunScheduledTaskCommand.php
===================================================================
diff -u -N -r16282 -r16283
--- branches/5.3.x/core/kernel/Console/Command/RunScheduledTaskCommand.php	(.../RunScheduledTaskCommand.php)	(revision 16282)
+++ branches/5.3.x/core/kernel/Console/Command/RunScheduledTaskCommand.php	(.../RunScheduledTaskCommand.php)	(revision 16283)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: RunScheduledTaskCommand.php 16282 2015-09-27 11:12:52Z alex $
+* @version	$Id: RunScheduledTaskCommand.php 16283 2015-09-27 11:22:39Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2015 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -15,15 +15,14 @@
 namespace InPortal\Core\kernel\Console\Command;
 
 
-use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 defined('FULL_PATH') or die('restricted access!');
 
-class RunScheduledTaskCommand extends AbstractCommand implements CompletionAwareInterface
+class RunScheduledTaskCommand extends AbstractCommand
 {
 
 	/**
@@ -72,19 +71,6 @@
 	}
 
 	/**
-	 * Return possible values for the named option
-	 *
-	 * @param string            $optionName Option name.
-	 * @param CompletionContext $context    Completion context.
-	 *
-	 * @return array
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context)
-	{
-		return array();
-	}
-
-	/**
 	 * Return possible values for the named argument.
 	 *
 	 * @param string            $argumentName Argument name.
@@ -94,11 +80,13 @@
 	 */
 	public function completeArgumentValues($argumentName, CompletionContext $context)
 	{
+		$suggestions = parent::completeArgumentValues($argumentName, $context);
+
 		if ( $argumentName === 'scheduled_task_name' ) {
 			return $this->getScheduledTaskNames();
 		}
 
-		return array();
+		return $suggestions;
 	}
 
 	/**