DXR support
rebased