Upgraded FsPickler