Add ClassTemplate Support