Rework Serializer/Deserializer