Add support for more filetypes