Added a template checker