Added Windows filesys compatibility