Add cell and core data handling