Template enhancements