added entity iterator support