Updates to parse Windows data