Just in the Type classes, or within the serializer / unserializer too?