Extending Windows support