Move Sender XML builder to Sender object