Make Analyzer work with Dictionary instead of Struct