Added groups for commands and operators.