Added ConcurrentDictionary version; Optimizations