Add a bunch more options to support LDAP