API Improvements
Make LDAP optional