Merged separate classes for FieldValue objects