Flex command grouping moved into decorator