Add Windows 8 OS Type
code refactoring