Improvements for the Serialization