Updated: FieldDefinition* XML definitions