Refactor LDAP bundle