Refactor and introduce mandrill objects