Added proper dependency resolution.