Dependency location improvement.