modified ESRF data support