Improve dependency