Template structure updates