Improve dependency definitions