Added template class