Modified the pickling to be backwards compatible.