[ADD] product: Re-fectoring previous code