improve Command.class.php