Nuget Updates and code refactoring