Added C and S specifiers