DEPS: Cross module dependencies tunings