Rework of ContributionSerializer