Added more file extensions support