The current implementation does part of dependency computation when generating the graph - part of it is doing during incorporation. This should be changed to reflect the EDR - all bound dependencies should be set during incorporation.