Added more files with template parameters