All graph generation now function wrapped