More proper support of file type