Add more required fields to SenderInfo
Improve internal logging