Further refactoring on the outbound adapter