Fixed json compatability issue; detect PU_RD2; don't use _Disk anymore