Prepared for Windows support