Further simplify FileType section