Improving dependency handling
7 files changed