Use of SafeUnpickler, added battleCount checks