FIXED: Add product type table and default values