Updated Product & Variant models