Changing to use unpickler class