Template Compatibility Updates