Update payment gems to use the contribution closes #541