Improvement for ldap