Adding dependency resolution