Update FieldDefinition to BaseFieldDefinition