Added support to facets