Added more template types (work in progress)