CellCollection changes, fixes issue #95