LDAP PLA overhaul