Added some template classes