Performance fixes.  Moved Dictionary behind DictionaryFacade