Added more Windows support