diff --git a/hl7apy/v2_5_1/fields.py b/hl7apy/v2_5_1/fields.py
index bd66ae5..f180a62 100644
--- a/hl7apy/v2_5_1/fields.py
+++ b/hl7apy/v2_5_1/fields.py
@@ -1037,9 +1037,12 @@
     'OBX_17': ('sequence', DATATYPES_STRUCTS['CE'], 'CE', 'OBSERVATION_METHOD', None, -1),
     'OBX_18': ('sequence', DATATYPES_STRUCTS['EI'], 'EI', 'EQUIPMENT_INSTANCE_IDENTIFIER', None, -1),
     'OBX_19': ('sequence', DATATYPES_STRUCTS['TS'], 'TS', 'DATE_TIME_OF_THE_ANALYSIS', None, -1),
-    'OBX_20': ('sequence', DATATYPES_STRUCTS['XON'], 'XON', 'PERFORMING_ORGANIZATION_NAME', None, -1),
-    'OBX_21': ('sequence', DATATYPES_STRUCTS['XAD'], 'XAD', 'PERFORMING_ORGANIZATION_ADDRESS', None, -1),
-    'OBX_22': ('sequence', DATATYPES_STRUCTS['XCN'], 'XCN', 'PERFORMING_ORGANIZATION_MEDICAL_DIRECTOR', None, -1),
+    'OBX_20': ('sequence', DATATYPES_STRUCTS['CWE'], 'CWE', 'OBSERVATION_SITE', 'HL70163', -1),
+    'OBX_21': ('sequence', DATATYPES_STRUCTS['EI'], 'EI', 'OBSERVATION_INSTANCE_IDENTIFIER', None, -1),
+    'OBX_22': ('sequence', DATATYPES_STRUCTS['CNE'], 'CNE', 'MOOD_CODE', 'HL70725', -1),
+    'OBX_23': ('sequence', DATATYPES_STRUCTS['XON'], 'XON', 'PERFORMING_ORGANIZATION_NAME', None, -1),
+    'OBX_24': ('sequence', DATATYPES_STRUCTS['XAD'], 'XAD', 'PERFORMING_ORGANIZATION_ADDRESS', None, -1),
+    'OBX_25': ('sequence', DATATYPES_STRUCTS['XCN'], 'XCN', 'PERFORMING_ORGANIZATION_MEDICAL_DIRECTOR', None, -1),
     'ODS_1': ('leaf', None, 'ID', 'TYPE', 'HL70159', -1),
     'ODS_2': ('sequence', DATATYPES_STRUCTS['CE'], 'CE', 'SERVICE_PERIOD', None, -1),
     'ODS_3': ('sequence', DATATYPES_STRUCTS['CE'], 'CE', 'DIET_SUPPLEMENT_OR_PREFERENCE_CODE', None, -1),
diff --git a/hl7apy/v2_5_1/segments.py b/hl7apy/v2_5_1/segments.py
index 5c296fd..5ca152a 100644
--- a/hl7apy/v2_5_1/segments.py
+++ b/hl7apy/v2_5_1/segments.py
@@ -1091,7 +1091,7 @@
              ('MSA_2', FIELDS['MSA_2'], (1, 1), 'FIE'),
              ('MSA_3', FIELDS['MSA_3'], (0, 1), 'FIE'),
              ('MSA_4', FIELDS['MSA_4'], (0, 1), 'FIE'),
-             
+
              ('MSA_6', FIELDS['MSA_6'], (0, 1), 'FIE'),)),
     'MSH': ('sequence',
             (('MSH_1', FIELDS['MSH_1'], (1, 1), 'FIE'),
@@ -1267,9 +1267,12 @@
              ('OBX_17', FIELDS['OBX_17'], (0, -1), 'FIE'),
              ('OBX_18', FIELDS['OBX_18'], (0, -1), 'FIE'),
              ('OBX_19', FIELDS['OBX_19'], (0, 1), 'FIE'),
-             ('OBX_20', FIELDS['OBX_20'], (0, 1), 'FIE'),
+             ('OBX_20', FIELDS['OBX_20'], (0, -1), 'FIE'),
              ('OBX_21', FIELDS['OBX_21'], (0, 1), 'FIE'),
              ('OBX_22', FIELDS['OBX_22'], (0, 1), 'FIE'),)),
+             ('OBX_23', FIELDS['OBX_23'], (0, -1), 'FIE'),)),
+             ('OBX_24', FIELDS['OBX_24'], (0, -1), 'FIE'),)),
+             ('OBX_25', FIELDS['OBX_25'], (0, -1), 'FIE'),)),
     'ODS': ('sequence',
             (('ODS_1', FIELDS['ODS_1'], (1, 1), 'FIE'),
              ('ODS_2', FIELDS['ODS_2'], (0, -1), 'FIE'),
@@ -2402,4 +2405,4 @@
              ('VTQ_3', FIELDS['VTQ_3'], (1, 1), 'FIE'),
              ('VTQ_4', FIELDS['VTQ_4'], (1, 1), 'FIE'),
              ('VTQ_5', FIELDS['VTQ_5'], (0, -1), 'FIE'),)),
-}
\ No newline at end of file
+}