Added command group builder