Added grouping for commands