IndexedMap performance improved