Simplified the graph related types.