Made the (de)serialization a little better