CommandParser extended