Latest updates after review

Victorien want to test with latest version of graph library update.