Add CELL_TYPE, FCELL_TYPE and DCELL_TYPE