Use iterators in entity instantiator where possible