Added windows specific code