Updated CMDS_COUNT constants