Added stuff on template instantiation