Updated product generator

#30