[Change] BDBStorageIterator refactoring