Updated to relfect LDAP changes