Updated templates to support renderers