changed to use the new EntityIterator interface
6 files changed