Additional enhancements to improve identification of dependencies.