Work in progress: support other filetypes