diff --git a/doc/changelog.rst b/doc/changelog.rst
index 7b26bf7434dec1ef3ce5bf93663d1e25be0db8b2..13b8746efd18d822b71cc4c2862b5a7f2c3d450a 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -9,6 +9,7 @@ unreleased
     - fix :issue:`75` regarding pulse Id assignment when reading BAM data :mr:`272`
     - fix :issue:`80` regarding new bunch pattern table size when reading BAM data :mr:`279`
     - fix :issue:`84` regarding loading only a given amount of BOZ DSSC data in memory :mr:`288`
+    - fix :issue:`86` regarding loading XGM :mr:`291`
 
 - **Improvements**
 
@@ -16,6 +17,7 @@ unreleased
     - update scannerY mnemonics :mr:`281`
     - move loading logic to mnemonics :mr:`283`, :mr:`286`
     - adds MaranaX mnemonics :mr:`285`
+    - adds Chem diagnostics and Gotthard II mnemonics :mr:`292`
 
 
 - **New Features**
diff --git a/src/toolbox_scs/constants.py b/src/toolbox_scs/constants.py
index eada50db2ca76146775dfad2caed3992311c7067..f009c946d396ff363c3b739662bf67acabf1eff7 100644
--- a/src/toolbox_scs/constants.py
+++ b/src/toolbox_scs/constants.py
@@ -962,25 +962,25 @@ mnemonics = {
                        'dim': ['fadc2_samplesId'],
                        'extract': 'peaks'},),
     "FFT_PD2raw": ({'source': 'SCS_FFT_DIAG/ADC/PD2:output',
-                       'key': 'data.rawData',
-                       'dim': ['fftpd2_samplesId'],
-                       'extract': 'peaks'},),
+                    'key': 'data.rawData',
+                    'dim': ['fftpd2_samplesId'],
+                    'extract': 'peaks'},),
     "FFT_MCPraw": ({'source': 'SCS_FFT_MCP/ADC/MCP:output',
-                       'key': 'data.rawData',
-                       'dim': ['fftmcp_samplesId'],
-                       'extract': 'peaks'},),
+                    'key': 'data.rawData',
+                    'dim': ['fftmcp_samplesId'],
+                    'extract': 'peaks'},),
     "FFT_REFLraw": ({'source': 'SCS_FFT_REFL/ADC/DIODE_UP:output',
-                       'key': 'data.rawData',
-                       'dim': ['fftrefl_samplesId'],
-                       'extract': 'peaks'},),
+                     'key': 'data.rawData',
+                     'dim': ['fftrefl_samplesId'],
+                     'extract': 'peaks'},),
     "I0_ILHraw": ({'source': 'SCS_ILH_LAS/ADC/I0_ILH:output',
-                       'key': 'data.rawData',
-                       'dim': ['i0ilh_samplesId'],
-                       'extract': 'peaks'},),
+                   'key': 'data.rawData',
+                   'dim': ['i0ilh_samplesId'],
+                   'extract': 'peaks'},),
     "I0_LINraw": ({'source': 'SCS_LIN_LAS/ADC/I0:output',
-                       'key': 'data.rawData',
-                       'dim': ['i0lin_samplesId'],
-                       'extract': 'peaks'},),
+                   'key': 'data.rawData',
+                   'dim': ['i0lin_samplesId'],
+                   'extract': 'peaks'},),
     "REFLECTOMETERraw": ({'source': 'SCS_LIN_LAS/ADC/REFLECTOMETER:output',
                        'key': 'data.rawData',
                        'dim': ['linrefl_samplesId'],
@@ -989,6 +989,14 @@ mnemonics = {
                           'key': 'data.rawData',
                           'dim': ['chempdfilt_samplesId'],
                           'extract': 'peaks'},),
+    "CHEM_PDNOFILTERraw": ({'source': 'SCS_CHEM_DIAG/ADC/DIODE_NOFILTER:output',
+                            'key': 'data.rawData',
+                            'dim': ['chempdnofilt_samplesId'],
+                            'extract': 'peaks'},),
+    "CHEM_APDraw": ({'source': 'SCS_CHEM_DET/ADC/APD:output',
+                     'key': 'data.rawData',
+                     'dim': ['chemapd_samplesId'],
+                     'extract': 'peaks'},),
 
     # KARABACON
     "KARABACON": ({'source': 'SCS_DAQ_SCAN/MDL/KARABACON',
@@ -1002,6 +1010,12 @@ mnemonics = {
     "Gotthard2": ({'source': 'SCS_PAM_XOX/DET/GOTTHARD_RECEIVER2:daqOutput',
                    'key': 'data.adc',
                    'dim': ['gott_pId', 'pixelId']},),
+    "GH21": ({'source': 'SCS_XOX_GH21/DET/GOTTHARD2_RECEIVER1:daqOutput',
+              'key': 'data.adc',
+              'dim': ['gh2_pId', 'pixelId']},),
+    "GH22": ({'source': 'SCS_XOX_GH22/DET/GOTTHARD2_RECEIVER1:daqOutput',
+              'key': 'data.adc',
+              'dim': ['gh2_pId', 'pixelId']},),
 
     # BASLER RACER
     "Racer1": ({'source': 'SCS_PAM_XOX/CAM/RACER1:daqOutput',