Simple fix to make templates configurable