Fix Serialization code for Field types and field options