Added template rendering