Added template classes