Updates on templating system
Brainstorming in this document