Serialize and deserialize added, not tested