Add support for composite and guide graph datapoints