Update nuget references
Optimize references