Better detection of dependencies