Added a CommandGroup and comments