Serialization is finally functional
Slight code tweak