Script template enhancements