Moved Unit enum to Product class
Added preferred unit to product