Updated DataAnalysis

Now it Dictionary instead of List.