[LDAP-9] Adding provided class, with some rework, thanks! #resolve