Make ldap better