[4.1] Added Graph v2.2 support

This one was a tough one! :)