CellFragment refactoring