Added support for %u and %n