Improve dependencies declaration