Updated rendering/generation and templates