File driver changes for proper importing and combining