XAResourceRecorder restructured