Updates to template class