Reworked facet support