Updates for new NuGet package