diff --git a/lib/Doctrine/Cli.php b/lib/Doctrine/Cli.php
index b28f34837..fdff83cfd 100644
--- a/lib/Doctrine/Cli.php
+++ b/lib/Doctrine/Cli.php
@@ -32,8 +32,13 @@
  */
 class Doctrine_Cli
 {
+    protected $tasks = array();
+    protected $scriptName = null;
+    
     public function run($args)
     {
+        $this->scriptName = $args[0];
+        
         if (!isset($args[1])) {
             echo $this->printTasks();
             return;
@@ -64,25 +69,48 @@ class Doctrine_Cli
         
         echo "\nAvailable Doctrine Command Line Interface Tasks\n";
         echo str_repeat('-', 40)."\n\n";
+        
         foreach ($tasks as $taskName)
         {
             $className = 'Doctrine_Cli_Task_' . $taskName;
             $taskInstance = new $className();
             $taskInstance->taskName = str_replace('_', '-', Doctrine::tableize($taskName));
             
-            echo "Name: " . $taskInstance->getName() . "\n";
-            echo "Description: " . $taskInstance->getDescription() . "\n";
+            echo $taskInstance->getDescription() . "\n";            
             
-            if ($requiredArguments = $taskInstance->getRequiredArguments()) {
-                echo "Required Arguments: " . implode(', ', $requiredArguments) . "\n";
+            $syntax  = "Syntax: ";
+            
+            $syntax .= $this->scriptName . ' ' . $taskInstance->getTaskName();
+            
+            if ($required = $taskInstance->getRequiredArguments()) {
+                $syntax .= ' <' . implode('> <', $required) . '>';
+            }
+
+            if ($optional = $taskInstance->getOptionalArguments()) {
+                 $syntax .= ' <' . implode('> <', $optional) . '>';
             }
             
-            if ($optionalArguments = $taskInstance->getOptionalArguments()) {
-                echo "Optional Arguments: " . implode(', ', $taskInstance->getOptionalArguments()) . "\n";
+            echo $syntax."\n";
+            
+            $args = null;
+            if ($requiredArguments = $taskInstance->getRequiredArgumentsDescriptions()) {
+                foreach ($requiredArguments as $name => $description) {
+                    $args .= '*' . $name . ' - ' . $description."\n";
+                }
             }
             
-            echo "Syntax: " . $taskInstance->getSyntax() . "\n";
-            echo str_repeat('-', 40) . "\n\n";
+            if ($optionalArguments = $taskInstance->getOptionalArgumentsDescriptions()) {
+                foreach ($requiredArguments as $name => $description) {
+                    $args .= $name . ' - ' . $description."\n";
+                }
+            }
+            
+            if ($args) {
+                echo "\nArguments:\n";
+                echo $args;
+            }
+            
+            echo "\n".str_repeat("-", 40)."\n";
         }
     }
     
@@ -115,6 +143,8 @@ class Doctrine_Cli
             }
         }
         
-        return $tasks;
+        $this->tasks = array_merge($this->tasks, $tasks);
+        
+        return $this->tasks;
     }
 }
\ No newline at end of file
diff --git a/lib/Doctrine/Cli/Task.php b/lib/Doctrine/Cli/Task.php
index b75fb5478..8b567c3a2 100644
--- a/lib/Doctrine/Cli/Task.php
+++ b/lib/Doctrine/Cli/Task.php
@@ -32,13 +32,13 @@
  */
 abstract class Doctrine_Cli_Task
 {
-    public $name                 =   null,
-           $taskName             =   null,
+    public $taskName             =   null,
            $description          =   null,
+           $arguments            =   array(),
            $requiredArguments    =   array(),
            $optionalArguments    =   array();
     
-    abstract function execute($args);
+    abstract function execute();
     
     public function validate($args)
     {
@@ -81,12 +81,19 @@ abstract class Doctrine_Cli_Task
             $count++;
         }
         
+        $this->arguments = $prepared;
+        
         return $prepared;
     }
     
-    public function getName()
+    public function getArgument($name)
     {
-        return $this->name;
+        return $this->arguments[$name];
+    }
+    
+    public function getArguments()
+    {
+        return $this->arguments;
     }
     
     public function getTaskName()
@@ -101,28 +108,36 @@ abstract class Doctrine_Cli_Task
     
     public function getRequiredArguments()
     {
-        return $this->requiredArguments;
+        return array_keys($this->requiredArguments);
     }
     
     public function getOptionalArguments()
+    {
+        return array_keys($this->optionalArguments);
+    }
+    
+    public function getRequiredArgumentsDescriptions()
+    {
+        return $this->requiredArguments;
+    }
+    
+    public function getOptionalArgumentsDescriptions()
     {
         return $this->optionalArguments;
     }
     
     public function getSyntax()
-    {
-        $taskName = $this->getTaskName();
-        $requiredArguments = null;
-        $optionalArguments = null;
+    {    
+        $syntax = './cli ' . $this->getTaskName();
         
         if ($required = $this->getRequiredArguments()) {
-            $requiredArguments = '<' . implode('> <', $required) . '>';
+            $syntax .= ' <' . implode('> <', $required) . '>';
         }
         
         if ($optional = $this->getOptionalArguments()) {
-            $optionalArguments = '<' . implode('> <', $optional) . '>';
+             $syntax .= ' <' . implode('> <', $optional) . '>';
         }
         
-        return './cli ' . $taskName . ' ' . $requiredArguments . ' ' . $optionalArguments;
+        return $syntax;
     }
 }
\ No newline at end of file