template enhancements