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

Related with #1 and #2