Adapted for new "product_variant" naming