Improved modularity of Diffraction Calibration table