Map indexes by name as well
0.3.0