Improve for filetypes