Serialization Class Corrected