serialization improvments