Add fallback type deduction when fields.Raw is used