Added dependency resolution