Add support for ExtraCells.