Adapted ContributionHandler