Adding support for id and type templates directly