HV-646 Incorporating review remarks, creating dedicated "facets" package