Fixes #107. Change valid data types for non-PII fields: enum fields with options instead of valid_values