Added estemplate support.