Expansion to include Windows 10 and Windows Server 2016