Adding support for dependencies on generation...