Make graph creators use keyed graphs.
Move graph creators to their own package.