Update to handling facets