Refactored to new facet concept.