Modify to use NuGet