Updates for template parsing