Adding Windows compatibility