Simplified the command categorization and improved their resolution.