Full template enhancements