Added XA Recovery support