added entity iterator
switch from tables to vectors for entity.find()