Added xrc extension support