Updated product class