Fix adding of cells, still need to handle when using a loader