Refactored for sender converter and tests.