Add graph support