PickleHelper refactor