Added support for multiple expanded cells