Moved setting of item.id to indexedMap add method