serialization system improvements