Render template dependent improvements