Faceting improvements