Added additional modules for Retrofit and Mandrill