Added LDAP and Mail classes