Added ExpandableCell and ExpandableSpotCell