serialize/deserialize improved