Fixes
Change CommandParsed layout