CellInfo refactor
CellInfo refactor