Updated product parser