Better dependency resolution