Improve dynamic load of templates