Improve dependency chain