Modified SenderImpl