Changes to db iterator