Added support for ntfs and fat