Added TemplateBuilder and unnecessary changed in NN