Improvements to get to make templates more reusable (version 6)

Related with #1, #2, #3, #4 and #6