Improve dependency version restrictions