Add support for different cell types