Added the new template and also a new datastructure