Separated concerns in Graph a bit