Completed and tested pickling support so runs can be restarted