Add BucketKeyMapper