Adding more cell types