Added updated map and updated index