Added key type on iterators