Add %d support