Updated and nuget package consolidated