refact CommandItem to OldCommandItem.