Refactoring of client complete: It now will make use of a list of AD/HIDs.