Dependencies diagrams added.

+ minor improvements in generators.