Updated to new DotNetStandard module