Replaces old cell type enum