Added some features to increase performance. PriorityDictionary and ContentHandler primarily.