Updated FileMerger