Generated Product scaffold and made minor improvements