Update map and index