ChangeTypeAdapter & re-packaging