Adjust to use AutoRenderTag correctly