Add jst/est template support