- #IP-5 Extends templating system