Now generating graphs for Entities and Plans too! Woohoo!