Fixed Serialization Problems