Update CellObject to support diffing with annos