Updates, add windows 10 mapping.