Added in the cell and cell group classes.