Debit refactored

Debit client refactoring