Adding Windows 8 support