templates enhancements