Added additional filetype support