Updated to handle windows files