Moved buildDictionary into separate dependency.