major overhaul of ldap model