Correcting serialize / unserialize support