Fix for getting dependencies by domain
changes from neurana, addition of diffusion
Merged changes between neurana and github