Added template comments