Add DataGraph
Some cleaning with hlint