Added support for facets