Improve Nuget Integration