updating BasicEntitySet for new iterator interface