Improved depency checks