Added class template