Added support for pivot facet