Refactorized: CellDE and related classes