Switched to concurrent Dictionay to aviod locking static resources