Updates for Mandrill integration