DEVIDM-82: Refined dependency functionality.