Added scaffolds for facets and facetvalues