Refactored collaborators and Stripe