Replacing vector with map, known bug fixes