Versioning pickles

Can avoid code duplication in this case.