Improved API compatibility with the MS nuget package.