Add subgrouping capabilities

Add subgrouping for group and timegroup commands