Added pickle support
Added pickle support