Added  and (format) tokens support