Facet refactoring