Move addYield to RenderFormat function