Added support for Graph 2.1