Add serialization/cloning to data