Added more formats allowed.