Refactored  for Product Create/Edit