Added support for new cell class.