Added support for image cell and code cell