Reworked some deprecated Facet methods