changed to use the new EntityIterator interface
3 files changed