mapData now again returns only new instances