Added preliminary serialization/deserialization support