Replace CellId by interface