More Advanced Battle/Replay Support