Changed to concurrent dictionary