Refactoring on the outbound adapter
Refactoring on the outbound adapter