ManagePaid Refactoring