Add NTFS and swap support