Command group and parsing restructured