Rework send handler implementation
Merge branch 'refactor-send-handlers'