Updated dependency resolution mechanism