PaymentCard with repository package refactoring