Improve dependencies definitions