Refactored facet system