Hybrid template enhancements 1