Fix serialization class