Added facets back in. Made inheritance aware