Updated product type behavior