Add more format specifiers