Changed addDirectory(Directory) and addGroup(Group) to addAccountStore(String), addAccountStore(DirectoryCriteria) and addAccountStore(GroupCriteria)