Add LDAP uri option and fix deficiencies