Minor refactoring
Update for nuget packages