New entity (facet) + various code updates