Mandrill Adapter updates