Added some  template decoration