Replaced map with vector of tuples.