Hybrid template enhancements 2