Switch to SafeUnpickler, added more advanced data