Updated custom xrc handler