Add support for %s and %@